Commit9f12b26

authored

Merge pull requestgitpython-developers#736 from hugovk/fix-version-check

Allow mmap not just for py2.6, 2.7 and 3.6+ but also 3.0+

2 parents190c045 +693b171 commit9f12b26Copy full SHA for 9f12b26

File tree

-9

lines changed

-9

lines changed

Lines changed: 1 addition & 9 deletions

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,6 @@`
`8`	`8`	`importos`
`9`	`9`	`fromstatimportS_ISLNK`
`10`	`10`	`importsubprocess`
`11`		`-importsys`
`12`	`11`	`importtempfile`
`13`	`12`
`14`	`13`	`fromgit.compatimport (`
`@@ -18,7 +17,6 @@`
`18`	`17`	`force_bytes,`
`19`	`18`	`defenc,`
`20`	`19`	`mviter,`
`21`		`-is_win`
`22`	`20`	`)`
`23`	`21`	`fromgit.excimport (`
`24`	`22`	`GitCommandError,`
`@@ -128,13 +126,7 @@ def _set_cache_(self, attr):`
`128`	`126`	`lfd.rollback()`
`129`	`127`	`# END exception handling`
`130`	`128`
`131`		`-# Here it comes: on windows in python 2.5, memory maps aren't closed properly`
`132`		`-# Hence we are in trouble if we try to delete a file that is memory mapped,`
`133`		`-# which happens during read-tree.`
`134`		`-# In this case, we will just read the memory in directly.`
`135`		`-# Its insanely bad ... I am disappointed !`
`136`		`-allow_mmap= (is_winorsys.version_info[1]>5)`
`137`		`-stream=file_contents_ro(fd,stream=True,allow_mmap=allow_mmap)`
	`129`	`+stream=file_contents_ro(fd,stream=True,allow_mmap=True)`
`138`	`130`
`139`	`131`	`try:`
`140`	`132`	`self._deserialize(stream)`

Comments

(0)