NotificationsYou must be signed in to change notification settings
Fork32k
Star67.3k

Commit655fc8a

authored

pathlib ABCs: remove caching of path parser case sensitivity (#130194)

Remove the caching `_is_case_sensitive()` function. The cache used to speed up `PurePath.[full_]match()` and `Path.[r]glob()`,but that's no longer the case - these methods use`self.parser is posixpath` to determine case sensitivity.This makes the `pathlib._abc` module a little easier to backport to Python3.8, where `functools.cache()` is unavailable.

1 parente7f00cd commit655fc8aCopy full SHA for 655fc8a

File tree

1 file changed

-11

lines changed

Lib/pathlib
- _abc.py

1 file changed

-11

lines changed

`‎Lib/pathlib/_abc.py`

Lines changed: 4 additions & 11 deletions

Original file line number	Diff line number	Diff line change
`@@ -11,18 +11,12 @@`
`11`	`11`	`WritablePath.`
`12`	`12`	`"""`
`13`	`13`
`14`		`-importfunctools`
`15`	`14`	`fromabcimportABC,abstractmethod`
`16`	`15`	`fromglobimport_PathGlobber,_no_recurse_symlinks`
`17`	`16`	`frompathlibimportPurePath,Path`
`18`	`17`	`frompathlib._osimportmagic_open,CopyReader,CopyWriter`
`19`	`18`
`20`	`19`
`21`		`-@functools.cache`
`22`		`-def_is_case_sensitive(parser):`
`23`		`-returnparser.normcase('Aa')=='Aa'`
`24`		`-`
`25`		`-`
`26`	`20`	`def_explode_path(path):`
`27`	`21`	`"""`
`28`	`22`	`Split the path into a 2-tuple (anchor, parts), where anchor is the`
`@@ -201,7 +195,7 @@ def full_match(self, pattern, *, case_sensitive=None):`
`201`	`195`	`ifnotisinstance(pattern,JoinablePath):`
`202`	`196`	`pattern=self.with_segments(pattern)`
`203`	`197`	`ifcase_sensitiveisNone:`
`204`		`-case_sensitive=_is_case_sensitive(self.parser)`
	`198`	`+case_sensitive=self.parser.normcase('Aa')=='Aa'`
`205`	`199`	`globber=_PathGlobber(pattern.parser.sep,case_sensitive,recursive=True)`
`206`	`200`	`match=globber.compile(str(pattern))`
`207`	`201`	`returnmatch(str(self))isnotNone`
`@@ -297,13 +291,12 @@ def glob(self, pattern, *, case_sensitive=None, recurse_symlinks=True):`
`297`	`291`	`anchor,parts=_explode_path(pattern)`
`298`	`292`	`ifanchor:`
`299`	`293`	`raiseNotImplementedError("Non-relative patterns are unsupported")`
	`294`	`+case_sensitive_default=self.parser.normcase('Aa')=='Aa'`
`300`	`295`	`ifcase_sensitiveisNone:`
`301`		`-case_sensitive=_is_case_sensitive(self.parser)`
`302`		`-case_pedantic=False`
`303`		`-elifcase_sensitive==_is_case_sensitive(self.parser):`
	`296`	`+case_sensitive=case_sensitive_default`
`304`	`297`	`case_pedantic=False`
`305`	`298`	`else:`
`306`		`-case_pedantic=True`
	`299`	`+case_pedantic=case_sensitive_default!=case_sensitive`
`307`	`300`	`recursive=Trueifrecurse_symlinkselse_no_recurse_symlinks`
`308`	`301`	`globber=_PathGlobber(self.parser.sep,case_sensitive,case_pedantic,recursive)`
`309`	`302`	`select=globber.selector(parts)`

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!

Commit655fc8a

File tree

1 file changed

1 file changed

`‎Lib/pathlib/_abc.py`

0 commit comments