Commit91d4cc5

committed

Use os.fspath instead of __fspath__ for reading paths

1 parent59c3c80 commit91d4cc5Copy full SHA for 91d4cc5

File tree

-10

lines changed

-10

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -634,7 +634,7 @@ def read(self) -> None: # type: ignore[override]`
`634`	`634`	`self._read(file_path,file_path.name)`
`635`	`635`	`else:`
`636`	`636`	`# Assume a path if it is not a file-object.`
`637`		`-file_path=cast(PathLike,file_path)`
	`637`	`+file_path=os.fspath(file_path)`
`638`	`638`	`try:`
`639`	`639`	`withopen(file_path,"rb")asfp:`
`640`	`640`	`file_ok=True`

Lines changed: 4 additions & 9 deletions

Original file line number	Diff line number	Diff line change
`@@ -219,11 +219,9 @@ def __init__(`
`219`	`219`	`# Given how the tests are written, this seems more likely to catch Cygwin`
`220`	`220`	`# git used from Windows than Windows git used from Cygwin. Therefore`
`221`	`221`	`# changing to Cygwin-style paths is the relevant operation.`
`222`		`-epath=cygpath(epathifisinstance(epath,str)elseepath.__fspath__())`
	`222`	`+epath=cygpath(os.fspath(epath))`
`223`	`223`
`224`		`-epath=epathorpathoros.getcwd()`
`225`		`-ifnotisinstance(epath,str):`
`226`		`-epath=epath.__fspath__()`
	`224`	`+epath=os.fspath(epath)`
`227`	`225`	`ifexpand_varsandre.search(self.re_envvars,epath):`
`228`	`226`	`warnings.warn(`
`229`	`227`	`"The use of environment variables in paths is deprecated"`
`@@ -1361,11 +1359,8 @@ def _clone(`
`1361`	`1359`	`)->"Repo":`
`1362`	`1360`	`odbt=kwargs.pop("odbt",odb_default_type)`
`1363`	`1361`
`1364`		`-# When pathlib.Path or other class-based path is passed`
`1365`		`-ifnotisinstance(url,str):`
`1366`		`-url=url.__fspath__()`
`1367`		`-ifnotisinstance(path,str):`
`1368`		`-path=path.__fspath__()`
	`1362`	`+url=os.fspath(url)`
	`1363`	`+path=os.fspath(path)`
`1369`	`1364`
`1370`	`1365`	## A bug win cygwin's Git, when `--bare` or `--separate-git-dir`
`1371`	`1366`	# it prepends the cwd or(?) the `url` into the `path, so::

Comments

(0)