Commitc34a466

committed

Have Repo.__init__ convert epath to str first instead

Ine133018 before this, I had noticed that Repo.__init__ implicitlyrelied on the implementation detail of cygpath that it converts itsargument to str immediately. That detail was not reflected in theparameter type annotation, which could've been broader, so I hadfixed the mypy error in Repo.__init__ by broadening cygpath'sparameter type annotation.This undoes that change, putting the cygpath annotations back asbefore, and fixes the mypy error in another way, by havingRepo.__init__ pass `str(epath)` instead of `epath` to cygpath.The reason is the concern noted in thee133018 commit message,that broadening the annotation made the way cygpath documents itsrelationshp to Git.polish_url no longer correct, and that it is notclear that the str(path) step in cygpath really ought to be mademore than an implementation detail (which if done may require somedocumentation to be changed).Instances of str are usually direct instances (rather than of asubclass of str), in which case an extra call to str will (at leastin CPython, and probably in all implementations) just return thesame str object that was passed in. The performance penalty of thisextra call to str should therefore be extremely small.

1 parente133018 commitc34a466Copy full SHA for c34a466

File tree

2 files changed

-7

lines changed

git
- repo
  - base.py
- util.py

2 files changed

-7

lines changed

`‎git/repo/base.py`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -218,7 +218,7 @@ def __init__(`
`218`	`218`	`# Given how the tests are written, this seems more likely to catch Cygwin`
`219`	`219`	`# git used from Windows than Windows git used from Cygwin. Therefore`
`220`	`220`	`# changing to Cygwin-style paths is the relevant operation.`
`221`		`-epath=cygpath(epath)`
	`221`	`+epath=cygpath(str(epath))`
`222`	`222`
`223`	`223`	`epath=epathorpathoros.getcwd()`
`224`	`224`	`ifnotisinstance(epath,str):`

`‎git/util.py`

Lines changed: 3 additions & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -404,7 +404,9 @@ def _cygexpath(drive: Optional[str], path: str) -> str:`
`404`	`404`	`)`
`405`	`405`
`406`	`406`
`407`		`-def_cygpath(path:str)->str:`
	`407`	`+defcygpath(path:str)->str:`
	`408`	+"""Use :meth:`git.cmd.Git.polish_url` instead, that works on any environment."""
	`409`	`+path=str(path)# Ensure is str and not AnyPath.`
`408`	`410`	`# Fix to use Paths when 3.5 dropped. Or to be just str if only for URLs?`
`409`	`411`	`ifnotpath.startswith(("/cygdrive","//","/proc/cygdrive")):`
`410`	`412`	`forregex,parser,recursein_cygpath_parsers:`
`@@ -420,11 +422,6 @@ def _cygpath(path: str) -> str:`
`420`	`422`	`returnpath`
`421`	`423`
`422`	`424`
`423`		`-defcygpath(path:PathLike)->str:`
`424`		-"""Use :meth:`git.cmd.Git.polish_url` instead, that works on any environment."""
`425`		`-return_cygpath(str(path))# Ensure is str and not AnyPath.`
`426`		`-`
`427`		`-`
`428`	`425`	`_decygpath_regex=re.compile(r"(?:/proc)?/cygdrive/(\w)(/.*)?")`
`429`	`426`
`430`	`427`

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!

Commitc34a466

File tree

2 files changed

2 files changed

`‎git/repo/base.py`

`‎git/util.py`

0 commit comments