Commitdcf2c3b

committed

config: GitConfigReader now allows to override its lock-type. By default it uses a 'failing' lock file, but now its possible to easily put a blocking lock file in its place

1 parenta38a005 commitdcf2c3bCopy full SHA for dcf2c3b

File tree

3 files changed

+26

-10

lines changed

lib/git
- config.py
- utils.py
test/git
- test_config.py

3 files changed

+26

-10

lines changed

`‎lib/git/config.py`

Lines changed: 17 additions & 8 deletions

Original file line number	Diff line number	Diff line change
`@@ -72,7 +72,7 @@ def flush_changes(self, args, *kwargs):`
`72`	`72`
`73`	`73`
`74`	`74`
`75`		`-classGitConfigParser(cp.RawConfigParser,LockFile):`
	`75`	`+classGitConfigParser(cp.RawConfigParser,object):`
`76`	`76`	`"""`
`77`	`77`	`Implements specifics required to read git style configuration files.`
`78`	`78`
`@@ -91,6 +91,15 @@ class GitConfigParser(cp.RawConfigParser, LockFile):`
`91`	`91`	`"""`
`92`	`92`	`__metaclass__=_MetaParserBuilder`
`93`	`93`
	`94`	`+`
	`95`	`+#{ Configuration`
	`96`	`+# The lock type determines the type of lock to use in new configuration readers.`
	`97`	`+# They must be compatible to the LockFile interface.`
	`98`	`+# A suitable alternative would be the BlockingLockFile`
	`99`	`+t_lock=LockFile`
	`100`	`+`
	`101`	`+#} END configuration`
	`102`	`+`
`94`	`103`	`OPTCRE=re.compile(`
`95`	`104`	`r'\s?(?P<option>[^:=\s][^:=]*)'# very permissive, incuding leading whitespace`
`96`	`105`	`r'\s(?P<vi>[:=])\s'# any number of space/tab,`
`@@ -102,7 +111,7 @@ class GitConfigParser(cp.RawConfigParser, LockFile):`
`102`	`111`
`103`	`112`	`# list of RawConfigParser methods able to change the instance`
`104`	`113`	`_mutating_methods_= ("add_section","remove_section","remove_option","set")`
`105`		`-__slots__= ("_sections","_defaults","_file_or_files","_read_only","_is_initialized")`
	`114`	`+__slots__= ("_sections","_defaults","_file_or_files","_read_only","_is_initialized",'_lock')`
`106`	`115`
`107`	`116`	`def__init__(self,file_or_files,read_only=True):`
`108`	`117`	`"""`
`@@ -125,7 +134,7 @@ def __init__(self, file_or_files, read_only=True):`
`125`	`134`	`self._file_or_files=file_or_files`
`126`	`135`	`self._read_only=read_only`
`127`	`136`	`self._is_initialized=False`
`128`		`-`
	`137`	`+self._lock=None`
`129`	`138`
`130`	`139`	`ifnotread_only:`
`131`	`140`	`ifisinstance(file_or_files, (tuple,list)):`
`@@ -136,9 +145,9 @@ def __init__(self, file_or_files, read_only=True):`
`136`	`145`	`file_or_files=file_or_files.name`
`137`	`146`	`# END get filename from handle/stream`
`138`	`147`	`# initialize lock base - we want to write`
`139`		`-LockFile.__init__(self,file_or_files)`
	`148`	`+self._lock=self.t_lock(file_or_files)`
`140`	`149`
`141`		`-self._obtain_lock_or_raise()`
	`150`	`+self._lock._obtain_lock()`
`142`	`151`	`# END read-only check`
`143`	`152`
`144`	`153`
`@@ -148,7 +157,7 @@ def __del__(self):`
`148`	`157`	`"""`
`149`	`158`	`# checking for the lock here makes sure we do not raise during write()`
`150`	`159`	`# in case an invalid parser was created who could not get a lock`
`151`		`-ifself.read_onlyornotself._has_lock():`
	`160`	`+ifself.read_onlyornotself._lock._has_lock():`
`152`	`161`	`return`
`153`	`162`
`154`	`163`	`try:`
`@@ -157,7 +166,7 @@ def __del__(self):`
`157`	`166`	`exceptIOError,e:`
`158`	`167`	`print"Exception during destruction of GitConfigParser: %s"%str(e)`
`159`	`168`	`finally:`
`160`		`-self._release_lock()`
	`169`	`+self._lock._release_lock()`
`161`	`170`
`162`	`171`	`defoptionxform(self,optionstr):`
`163`	`172`	`"""`
`@@ -303,7 +312,7 @@ def write(self):`
`303`	`312`	`a file lock`
`304`	`313`	`"""`
`305`	`314`	`self._assure_writable("write")`
`306`		`-self._obtain_lock_or_raise()`
	`315`	`+self._lock._obtain_lock()`
`307`	`316`
`308`	`317`
`309`	`318`	`fp=self._file_or_files`

`‎lib/git/utils.py`

Lines changed: 8 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -163,13 +163,20 @@ def _obtain_lock_or_raise(self):`
`163`	`163`
`164`	`164`	`self._owns_lock=True`
`165`	`165`
	`166`	`+def_obtain_lock(self):`
	`167`	`+"""`
	`168`	`+The default implementation will raise if a lock cannot be obtained.`
	`169`	`+Subclasses may override this method to provide a different implementation`
	`170`	`+"""`
	`171`	`+returnself._obtain_lock_or_raise()`
	`172`	`+`
`166`	`173`	`def_release_lock(self):`
`167`	`174`	`"""`
`168`	`175`	`Release our lock if we have one`
`169`	`176`	`"""`
`170`	`177`	`ifnotself._has_lock():`
`171`	`178`	`return`
`172`		`-`
	`179`	`+`
`173`	`180`	`os.remove(self._lock_file_path())`
`174`	`181`	`self._owns_lock=False`
`175`	`182`

`‎test/git/test_config.py`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,7 @@ def test_read_write(self):`
`38`	`38`	`self.failUnlessRaises(IOError,GitConfigParser,file_obj,read_only=False)`
`39`	`39`
`40`	`40`	`# should still have a lock and be able to make changes`
`41`		`-assertw_config._has_lock()`
	`41`	`+assertw_config._lock._has_lock()`
`42`	`42`
`43`	`43`	`# changes should be written right away`
`44`	`44`	`sname="my_section"`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commitdcf2c3b

File tree

3 files changed

3 files changed

`‎lib/git/config.py`

`‎lib/git/utils.py`

`‎test/git/test_config.py`

0 commit comments