Commit e45a7f6

pi-anldpgeorge

authored and

committed

fnmatch: Fix compatibility with ure -> re.

With the recent MicroPython change to remove the u prefix by default on builtins (micropython/micropython#11740) the format checker in fnmatch which was detecting ure no longer works. This commit updates the module to filter the regex automatically as needed. Signed-off-by: Andrew Leech <andrew.leech@planetinnovation.com.au>

1 parent 6103823 commit e45a7f6Copy full SHA for e45a7f6

File tree

2 files changed

-5

lines changed

python-stdlib/fnmatch
- fnmatch.py
- manifest.py

2 files changed

-5

lines changed

`‎python-stdlib/fnmatch/fnmatch.py‎`

Lines changed: 8 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -27,8 +27,6 @@ def normcase(s):`
`27`	`27`
`28`	`28`	`__all__ = ["filter", "fnmatch", "fnmatchcase", "translate"]`
`29`	`29`
`30`		`-COMPAT = re.__name__ == "ure"`
`31`		`-`
`32`	`30`
`33`	`31`	`def fnmatch(name, pat):`
`34`	`32`	`"""Test whether FILENAME matches PATTERN.`
`@@ -58,12 +56,18 @@ def _compile_pattern(pat):`
`58`	`56`	`res = bytes(res_str, "ISO-8859-1")`
`59`	`57`	`else:`
`60`	`58`	`res = translate(pat)`
`61`		`- if COMPAT:`
	`59`	`+`
	`60`	`+ try:`
	`61`	`+ ptn = re.compile(res)`
	`62`	`+ except ValueError:`
	`63`	`+ # re1.5 doesn't support all regex features`
`62`	`64`	`if res.startswith("(?ms)"):`
`63`	`65`	`res = res[5:]`
`64`	`66`	`if res.endswith("\\Z"):`
`65`	`67`	`res = res[:-2] + "$"`
`66`		`- return re.compile(res).match`
	`68`	`+ ptn = re.compile(res)`
	`69`	`+`
	`70`	`+ return ptn.match`
`67`	`71`
`68`	`72`
`69`	`73`	`def filter(names, pat):`

`‎python-stdlib/fnmatch/manifest.py‎`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,3 @@`
`1`		`-metadata(version="0.6.0")`
	`1`	`+metadata(version="0.6.1")`
`2`	`2`
`3`	`3`	`module("fnmatch.py")`

0 commit comments

Comments

(0)

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit e45a7f6

File tree

2 files changed

2 files changed

`‎python-stdlib/fnmatch/fnmatch.py‎`

`‎python-stdlib/fnmatch/manifest.py‎`

0 commit comments