diff options
| author | Tarek Ziadé <ziade.tarek@gmail.com> | 2009-04-05 21:47:02 (GMT) |
|---|---|---|
| committer | Tarek Ziadé <ziade.tarek@gmail.com> | 2009-04-05 21:47:02 (GMT) |
| commit | 0daf2f38cba2276c9a25613b47c46a17db614d6c (patch) | |
| tree | 5606053ff1dcfc3531f8b2e7152301081b20cbfe /Lib/distutils/filelist.py | |
| parent | a65e33089c0e3f753b7ca3101b4fddc3dd0d82d8 (diff) | |
| download | cpython-0daf2f38cba2276c9a25613b47c46a17db614d6c.zip cpython-0daf2f38cba2276c9a25613b47c46a17db614d6c.tar.gz cpython-0daf2f38cba2276c9a25613b47c46a17db614d6c.tar.bz2 | |
Merged revisions 71280 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r71280 | tarek.ziade | 2009-04-05 23:44:08 +0200 (Sun, 05 Apr 2009) | 1 line
Fixed #1491431: distutils.filelist.glob_to_re was broken for some edge cases (detailed in the test
........
Diffstat (limited to 'Lib/distutils/filelist.py')
| -rw-r--r-- | Lib/distutils/filelist.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/Lib/distutils/filelist.py b/Lib/distutils/filelist.py index 6d27cce..3ce5635 100644 --- a/Lib/distutils/filelist.py +++ b/Lib/distutils/filelist.py @@ -304,7 +304,7 @@ def findall (dir = os.curdir): return list -def glob_to_re (pattern): +def glob_to_re(pattern): """Translate a shell-like glob pattern to a regular expression; return a string containing the regex. Differs from 'fnmatch.translate()' in that '*' does not match "special characters" (which are @@ -319,7 +319,8 @@ def glob_to_re (pattern): # character except the special characters. # XXX currently the "special characters" are just slash -- i.e. this is # Unix-only. - pattern_re = re.sub(r'(^|[^\\])\.', r'\1[^/]', pattern_re) + pattern_re = re.sub(r'((?<!\\)(\\\\)*)\.', r'\1[^/]', pattern_re) + return pattern_re # glob_to_re () |