config: fixed incorrect handling of default value in get_value

remote.config: SectionConstraint now knows about set_value and get_value which are new to the GitConfigParser

2 files changed, 6 insertions, 4 deletions

diff --git a/lib/git/config.py b/lib/git/config.py
index e8bdfc75..7a09a63c 100644
--- a/lib/git/config.py
+++ b/lib/git/config.py
@@ -360,7 +360,9 @@ class GitConfigParser(cp.RawConfigParser, LockFile):
 		try:
 			valuestr = self.get(section, option)
 		except Exception:
-			return default
+			if default is not None:
+				return default
+			raise
 		
 		types = ( long, float )
 		for numtype in types:
diff --git a/lib/git/remote.py b/lib/git/remote.py
index e1d0d743..1e2e42fa 100644
--- a/lib/git/remote.py
+++ b/lib/git/remote.py
@@ -21,7 +21,7 @@ class _SectionConstraint(object):
 	It supports all ConfigParser methods that operate on an option
 	"""
 	__slots__ = ("_config", "_section_name")
-	_valid_attrs_ = ("get", "set", "getint", "getfloat", "getboolean", "has_option")
+	_valid_attrs_ = ("get_value", "set_value", "get", "set", "getint", "getfloat", "getboolean", "has_option")
 	
 	def __init__(self, config, section):
 		self._config = config
@@ -32,10 +32,10 @@ class _SectionConstraint(object):
 			return lambda *args: self._call_config(attr, *args)
 		return super(_SectionConstraint,self).__getattribute__(attr)
 		
-	def _call_config(self, method, *args):
+	def _call_config(self, method, *args, **kwargs):
 		"""Call the configuration at the given method which must take a section name 
 		as first argument"""
-		return getattr(self._config, method)(self._section_name, *args)
+		return getattr(self._config, method)(self._section_name, *args, **kwargs)
 		
 		
 class PushProgress(object):