Merge pull request #183 from kmosher/master

Update the config parser using code from python2.7

Author: Byron

git/config.py

@@ -131,19 +131,20 @@ class GitConfigParser(cp.RawConfigParser, object):
 
 OPTCRE=re.compile(
 r'\s*(?P<option>[^:=\s][^:=]*)'# very permissive, incuding leading whitespace
-r'\s*(?P<vi>[:=])\s*'# any number of space/tab,
-# followed by separator
-# (either : or =), followed
-# by any # space/tab
-r'(?P<value>.*)$'# everything up to eol
- )
+r'\s*(?:'# any number of space/tab,
+r'(?P<vi>[:=])\s*'# optionally followed by
+# separator (either : or
+# =), followed by any #
+# space/tab
+r'(?P<value>.*))?$'# everything up to eol
+ )
 
 # list of RawConfigParser methods able to change the instance
 _mutating_methods_= ("add_section", "remove_section", "remove_option", "set")
 __slots__= ("_sections", "_defaults", "_file_or_files", "_read_only", "_is_initialized", '_lock')
 
 def__init__(self, file_or_files, read_only=True):
-"""Initialize a configuration reader to read the given file_or_files and to
+"""Initialize a configuration reader to read the given file_or_files and to
  possibly allow changes to it by setting read_only False
 
  :param file_or_files:
@@ -198,10 +199,10 @@ def optionxform(self, optionstr):
 returnoptionstr
 
 def_read(self, fp, fpname):
-"""A direct copy of the py2.4 version of the super class's _read method
+"""A direct copy of the py2.7 version of the super class's _read method
  to assure it uses ordered dicts. Had to change one line to make it work.
 
- Future versions have this fixed, but in fact its quite embarassing for the
+ Future versions have this fixed, but in fact its quite embarassing for the
  guys not to have done it right in the first place !
 
  Removed big comments to make it more compact.
@@ -222,6 +223,7 @@ def _read(self, fp, fpname):
 ifline.split(None, 1)[0].lower() =='rem'andline[0] in"rR":
 # no leading whitespace
 continue
+# a section header or option header?
 else:
 # is it a section header?
 mo=self.SECTCRE.match(line.strip())
@@ -245,43 +247,48 @@ def _read(self, fp, fpname):
 mo=self.OPTCRE.match(line)
 ifmo:
 optname, vi, optval=mo.group('option', 'vi', 'value')
-ifviin ('=', ':') and''inoptval:
-pos=optval.find('')
-ifpos!=-1andoptval[pos-1].isspace():
-optval=optval[:pos]
-optval=optval.strip()
-
-# Remove paired unescaped-quotes
-unquoted_optval=''
-escaped=False
-in_quote=False
-forcinoptval:
-ifnotescapedandc=='"':
-in_quote=notin_quote
-else:
-escaped= (c=='\\') andnotescaped
-unquoted_optval+=c
-
-ifin_quote:
-ifnote:
-e=cp.ParsingError(fpname)
-e.append(lineno, repr(line))
-
-optval=unquoted_optval
-
-optval=optval.replace('\\\\', '\\') # Unescape backslashes
-optval=optval.replace(r'\"', '"') # Unescape quotes
-
 optname=self.optionxform(optname.rstrip())
-cursect[optname] =optval
+ifoptvalisnotNone:
+ifviin ('=', ':') and''inoptval:
+# '' is a comment delimiter only if it follows
+# a spacing character
+pos=optval.find('')
+ifpos!=-1andoptval[pos-1].isspace():
+optval=optval[:pos]
+optval=optval.strip()
+# allow empty values
+ifoptval=='""':
+optval=''
+# Remove paired unescaped-quotes
+unquoted_optval=''
+escaped=False
+in_quote=False
+forcinoptval:
+ifnotescapedandc=='"':
+in_quote=notin_quote
+else:
+escaped= (c=='\\') andnotescaped
+unquoted_optval+=c
+ifin_quote:
+ifnote:
+e=cp.ParsingError(fpname)
+e.append(lineno, repr(line))
+
+optval=unquoted_optval
+optval=optval.replace('\\\\', '\\') # Unescape backslashes
+optval=optval.replace(r'\"', '"') # Unescape quotes
+cursect[optname] =optval
+else:
+# valueless option handling
+cursect[optname] =optval
 else:
+# a non-fatal parsing error occurred. set up the
+# exception but keep going. the exception will be
+# raised at the end of the file and will contain a
+# list of all bogus lines
 ifnote:
 e=cp.ParsingError(fpname)
 e.append(lineno, repr(line))
-# END
-# END ?
-# END ?
-# END while reading
 # if any parsing errors occurred, raise an exception
 ife:
 raisee
@@ -398,7 +405,7 @@ def get_value(self, section, option, default=None):
  :param default:
  If not None, the given default value will be returned in case 
  the option did not exist
- :return: a properly typed value, either int, floator string
+ :return: a properly typed value, either int, bool, float, string or None
 
  :raise TypeError: in case the value could not be understood
  Otherwise the exceptions known to the ConfigParser will be raised."""
@@ -409,6 +416,9 @@ def get_value(self, section, option, default=None):
 returndefault
 raise
 
+ifvaluestrisNone:
+returnvaluestr
+
 types= (long, float)
 fornumtypeintypes:
 try:

git/test/fixtures/git_config

@@ -27,3 +27,8 @@
 [branch "mainline_performance"]
  remote = mainline
  merge = refs/heads/master
+[filter "indent"]
+ clean = indent
+ smudge = cat
+ # A vauleless option
+ required

git/test/test_config.py

@@ -77,18 +77,22 @@ def test_base(self):
 assertr_config._is_initialized==False
 forsectioninr_config.sections():
 num_sections+=1
-foroptioninr_config.options(section):
-num_options+=1
-val=r_config.get(section, option)
-val_typed=r_config.get_value(section, option)
-assertisinstance(val_typed, (bool, long, float, basestring))
-assertval
-assert"\n"notinoption
-assert"\n"notinval
-
-# writing must fail
-self.failUnlessRaises(IOError, r_config.set, section, option, None)
-self.failUnlessRaises(IOError, r_config.remove_option, section, option)
+ifsection!='filter "indent"':
+foroptioninr_config.options(section):
+num_options+=1
+val=r_config.get(section, option)
+val_typed=r_config.get_value(section, option)
+assertisinstance(val_typed, (bool, long, float, basestring))
+assertval
+assert"\n"notinoption
+assert"\n"notinval
+
+# writing must fail
+self.failUnlessRaises(IOError, r_config.set, section, option, None)
+self.failUnlessRaises(IOError, r_config.remove_option, section, option)
+else:
+val=r_config.get(section, 'required')
+assertvalisNone
 # END for each option
 self.failUnlessRaises(IOError, r_config.remove_section, section)
 # END for each section