Commit90c81a5

authored

Merge pull request#1532 from marlamb/feature/reduce-resource-leaks

Fix some resource leaks by open file handles

2 parents27a283b +e500466 commit90c81a5Copy full SHA for 90c81a5

File tree

-3

lines changed

-3

lines changed

Lines changed: 7 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -9,6 +9,9 @@`
`9`	`9`	`importre`
`10`	`10`	`importshlex`
`11`	`11`	`importwarnings`
	`12`	`+`
	`13`	`+frompathlibimportPath`
	`14`	`+`
`12`	`15`	`fromgitdb.db.looseimportLooseObjectDB`
`13`	`16`
`14`	`17`	`fromgitdb.excimportBadObject`
`@@ -268,7 +271,7 @@ def __init__(`
`268`	`271`	`pass`
`269`	`272`
`270`	`273`	`try:`
`271`		`-common_dir=open(osp.join(self.git_dir,"commondir"),"rt").readlines()[0].strip()`
	`274`	`+common_dir=(Path(self.git_dir)/"commondir").read_text().splitlines()[0].strip()`
`272`	`275`	`self._common_dir=osp.join(self.git_dir,common_dir)`
`273`	`276`	`exceptOSError:`
`274`	`277`	`self._common_dir=""`
`@@ -1385,4 +1388,6 @@ def currently_rebasing_on(self) -> Commit \| None:`
`1385`	`1388`	`rebase_head_file=osp.join(self.git_dir,"REBASE_HEAD")`
`1386`	`1389`	`ifnotosp.isfile(rebase_head_file):`
`1387`	`1390`	`returnNone`
`1388`		`-returnself.commit(open(rebase_head_file,"rt").readline().strip())`
	`1391`	`+withopen(rebase_head_file,"rt")asf:`
	`1392`	`+content=f.readline().strip()`
	`1393`	`+returnself.commit(content)`

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,7 @@`
`2`	`2`	`from __future__importannotations`
`3`	`3`	`importos`
`4`	`4`	`importstat`
	`5`	`+frompathlibimportPath`
`5`	`6`	`fromstringimportdigits`
`6`	`7`
`7`	`8`	`fromgit.excimportWorkTreeRepositoryUnsupported`
`@@ -83,7 +84,7 @@ def find_worktree_git_dir(dotgit: "PathLike") -> Optional[str]:`
`83`	`84`	`returnNone`
`84`	`85`
`85`	`86`	`try:`
`86`		`-lines=open(dotgit,"r").readlines()`
	`87`	`+lines=Path(dotgit).read_text().splitlines()`
`87`	`88`	`forkey,valuein [line.strip().split(": ")forlineinlines]:`
`88`	`89`	`ifkey=="gitdir":`
`89`	`90`	`returnvalue`

Comments

(0)