Commit0b88012

committed

Use onexc callback where supported

The shutil.rmtree callback defined as a local function ingit.util.rmtree was already capable of being used as both the oldonerror parameter and the new onexc parameter--introduced in Python3.12, which also deprecates onerror--because they differ only inthe meaning of their third parameter (excinfo), which the callbackdefined in git.util.rmtree does not use.This modifies git.util.rmtree to pass it as onexc on 3.12 andlater, while still passing it as onerror on 3.11 and earlier.Because the default value of ignore_errors is False, this makes thevarying logic clearer by omitting that argument and using a keywordargument both when passing onexc (which is keyword-only) and whenpassing onerror (which is not keyword-only but can only be passedpositionally if ignore_errors is passed explicitly).

1 parentccbb273 commit0b88012Copy full SHA for 0b88012

File tree

1 file changed

+12

-16

lines changed

git
- util.py

1 file changed

+12

-16

lines changed

`‎git/util.py`

Lines changed: 12 additions & 16 deletions

Original file line number	Diff line number	Diff line change
`@@ -5,24 +5,24 @@`
`5`	`5`	`# the BSD License: https://opensource.org/license/bsd-3-clause/`
`6`	`6`
`7`	`7`	`fromabcimportabstractmethod`
`8`		`-importos.pathasosp`
`9`		`-from .compatimportis_win`
`10`	`8`	`importcontextlib`
`11`	`9`	`fromfunctoolsimportwraps`
`12`	`10`	`importgetpass`
`13`	`11`	`importlogging`
`14`	`12`	`importos`
	`13`	`+importos.pathasosp`
	`14`	`+importpathlib`
`15`	`15`	`importplatform`
`16`		`-importsubprocess`
`17`	`16`	`importre`
`18`	`17`	`importshutil`
`19`	`18`	`importstat`
`20`		`-fromsysimportmaxsize`
	`19`	`+importsubprocess`
	`20`	`+importsys`
`21`	`21`	`importtime`
`22`	`22`	`fromurllib.parseimporturlsplit,urlunsplit`
`23`	`23`	`importwarnings`
`24`	`24`
`25`		`-#fromgit.objects.util importTraversable`
	`25`	`+from.compatimportis_win`
`26`	`26`
`27`	`27`	`# typing ---------------------------------------------------------`
`28`	`28`
`@@ -42,22 +42,17 @@`
`42`	`42`	`Tuple,`
`43`	`43`	`TypeVar,`
`44`	`44`	`Union,`
`45`		`-cast,`
`46`	`45`	`TYPE_CHECKING,`
	`46`	`+cast,`
`47`	`47`	`overload,`
`48`	`48`	`)`
`49`	`49`
`50`		`-importpathlib`
`51`		`-`
`52`	`50`	`ifTYPE_CHECKING:`
`53`	`51`	`fromgit.remoteimportRemote`
`54`	`52`	`fromgit.repo.baseimportRepo`
`55`	`53`	`fromgit.configimportGitConfigParser,SectionConstraint`
`56`	`54`	`fromgitimportGit`
`57`	`55`
`58`		`-# from git.objects.base import IndexObject`
`59`		`-`
`60`		`-`
`61`	`56`	`from .typesimport (`
`62`	`57`	`Literal,`
`63`	`58`	`SupportsIndex,`
`@@ -75,7 +70,6 @@`
`75`	`70`
`76`	`71`	`# ---------------------------------------------------------------------`
`77`	`72`
`78`		`-`
`79`	`73`	`fromgitdb.utilimport (# NOQA @IgnorePep8`
`80`	`74`	`make_sha,`
`81`	`75`	`LockedFD,# @UnusedImport`
`@@ -88,7 +82,6 @@`
`88`	`82`	`hex_to_bin,# @UnusedImport`
`89`	`83`	`)`
`90`	`84`
`91`		`-`
`92`	`85`	`# NOTE: Some of the unused imports might be used/imported by others.`
`93`	`86`	`# Handle once test-cases are back up and running.`
`94`	`87`	`# Most of these are unused here, but are for use by git-python modules so these`
`@@ -182,7 +175,7 @@ def rmtree(path: PathLike) -> None:`
`182`	`175`	`:note: we use shutil rmtree but adjust its behaviour to see whether files that`
`183`	`176`	`couldn't be deleted are read-only. Windows will not remove them in that case"""`
`184`	`177`
`185`		`-defonerror(function:Callable,path:PathLike,_excinfo:Any)->None:`
	`178`	`+defhandler(function:Callable,path:PathLike,_excinfo:Any)->None:`
`186`	`179`	`# Is the error an access error ?`
`187`	`180`	`os.chmod(path,stat.S_IWUSR)`
`188`	`181`
`@@ -195,7 +188,10 @@ def onerror(function: Callable, path: PathLike, _excinfo: Any) -> None:`
`195`	`188`	`raiseSkipTest(f"FIXME: fails with: PermissionError\n{ex}")fromex`
`196`	`189`	`raise`
`197`	`190`
`198`		`-shutil.rmtree(path,False,onerror)`
	`191`	`+ifsys.version_info>= (3,12):`
	`192`	`+shutil.rmtree(path,onexc=handler)`
	`193`	`+else:`
	`194`	`+shutil.rmtree(path,onerror=handler)`
`199`	`195`
`200`	`196`
`201`	`197`	`defrmfile(path:PathLike)->None:`
`@@ -995,7 +991,7 @@ def __init__(`
`995`	`991`	`self,`
`996`	`992`	`file_path:PathLike,`
`997`	`993`	`check_interval_s:float=0.3,`
`998`		`-max_block_time_s:int=maxsize,`
	`994`	`+max_block_time_s:int=sys.maxsize,`
`999`	`995`	`)->None:`
`1000`	`996`	`"""Configure the instance`
`1001`	`997`

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!

Commit0b88012

File tree

1 file changed

1 file changed

`‎git/util.py`

0 commit comments