Commitceae5e9

committed

Merge pull request#391 from pendragon-/parser_context_reenter

config parsers as context mangers can now be reentered for locks

2 parents0f4d5ce +d97a8bb commitceae5e9Copy full SHA for ceae5e9

File tree

2 files changed

+38

-15

lines changed

git
- config.py
- test
  - test_config.py

2 files changed

+38

-15

lines changed

`‎git/config.py`

Lines changed: 21 additions & 15 deletions

Original file line number	Diff line number	Diff line change
`@@ -133,10 +133,11 @@ def release(self):`
`133`	`133`	`returnself._config.release()`
`134`	`134`
`135`	`135`	`def__enter__(self):`
	`136`	`+self._config.__enter__()`
`136`	`137`	`returnself`
`137`	`138`
`138`	`139`	`def__exit__(self,exception_type,exception_value,traceback):`
`139`		`-self.release()`
	`140`	`+self._config.__exit__(exception_type,exception_value,traceback)`
`140`	`141`
`141`	`142`
`142`	`143`	`classGitConfigParser(with_metaclass(MetaParserBuilder,cp.RawConfigParser,object)):`
`@@ -155,8 +156,7 @@ class GitConfigParser(with_metaclass(MetaParserBuilder, cp.RawConfigParser, obje`
`155`	`156`	`:note:`
`156`	`157`	`The config is case-sensitive even when queried, hence section and option names`
`157`	`158`	`must match perfectly.`
`158`		`- If used as a context manager, will release the locked file. This parser cannot`
`159`		`- be used afterwards."""`
	`159`	`+ If used as a context manager, will release the locked file."""`
`160`	`160`
`161`	`161`	`#{ Configuration`
`162`	`162`	`# The lock type determines the type of lock to use in new configuration readers.`
`@@ -206,18 +206,23 @@ def __init__(self, file_or_files, read_only=True, merge_includes=True):`
`206`	`206`	`self._is_initialized=False`
`207`	`207`	`self._merge_includes=merge_includes`
`208`	`208`	`self._lock=None`
`209`		`-`
`210`		`-ifnotread_only:`
`211`		`-ifisinstance(file_or_files, (tuple,list)):`
`212`		`-raiseValueError(`
`213`		`-"Write-ConfigParsers can operate on a single file only, multiple files have been passed")`
`214`		`-# END single file check`
`215`		`-`
`216`		`-ifnotisinstance(file_or_files,string_types):`
`217`		`-file_or_files=file_or_files.name`
`218`		`-# END get filename from handle/stream`
`219`		`-# initialize lock base - we want to write`
`220`		`-self._lock=self.t_lock(file_or_files)`
	`209`	`+self._aquire_lock()`
	`210`	`+`
	`211`	`+def_aquire_lock(self):`
	`212`	`+ifnotself._read_only:`
	`213`	`+ifnotself._lock:`
	`214`	`+ifisinstance(self._file_or_files, (tuple,list)):`
	`215`	`+raiseValueError(`
	`216`	`+"Write-ConfigParsers can operate on a single file only, multiple files have been passed")`
	`217`	`+# END single file check`
	`218`	`+`
	`219`	`+file_or_files=self._file_or_files`
	`220`	`+ifnotisinstance(self._file_or_files,string_types):`
	`221`	`+file_or_files=self._file_or_files.name`
	`222`	`+# END get filename from handle/stream`
	`223`	`+# initialize lock base - we want to write`
	`224`	`+self._lock=self.t_lock(file_or_files)`
	`225`	`+# END lock check`
`221`	`226`
`222`	`227`	`self._lock._obtain_lock()`
`223`	`228`	`# END read-only check`
`@@ -228,6 +233,7 @@ def __del__(self):`
`228`	`233`	`self.release()`
`229`	`234`
`230`	`235`	`def__enter__(self):`
	`236`	`+self._aquire_lock()`
`231`	`237`	`returnself`
`232`	`238`
`233`	`239`	`def__exit__(self,exception_type,exception_value,traceback):`

`‎git/test/test_config.py`

Lines changed: 17 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -72,6 +72,23 @@ def test_read_write(self):`
`72`	`72`	`w_config.release()`
`73`	`73`	`# END for each filename`
`74`	`74`
	`75`	`+@with_rw_directory`
	`76`	`+deftest_lock_reentry(self,rw_dir):`
	`77`	`+fpl=os.path.join(rw_dir,'l')`
	`78`	`+gcp=GitConfigParser(fpl,read_only=False)`
	`79`	`+withgcpascw:`
	`80`	`+cw.set_value('include','some_value','a')`
	`81`	`+# entering again locks the file again...`
	`82`	`+withgcpascw:`
	`83`	`+cw.set_value('include','some_other_value','b')`
	`84`	`+# ...so creating an additional config writer must fail due to exclusive access`
	`85`	`+self.failUnlessRaises(IOError,GitConfigParser,fpl,read_only=False)`
	`86`	`+# but work when the lock is removed`
	`87`	`+withGitConfigParser(fpl,read_only=False):`
	`88`	`+assertos.path.exists(fpl)`
	`89`	`+# reentering with an existing lock must fail due to exclusive access`
	`90`	`+self.failUnlessRaises(IOError,gcp.__enter__)`
	`91`	`+`
`75`	`92`	`deftest_multi_line_config(self):`
`76`	`93`	`file_obj=self._to_memcache(fixture_path("git_config_with_comments"))`
`77`	`94`	`config=GitConfigParser(file_obj,read_only=False)`

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!

Uh oh!

Commitceae5e9

File tree

2 files changed

2 files changed

`‎git/config.py`

`‎git/test/test_config.py`

0 commit comments