diff options
| author | Tarek Ziadé <ziade.tarek@gmail.com> | 2009-04-05 21:49:36 (GMT) |
|---|---|---|
| committer | Tarek Ziadé <ziade.tarek@gmail.com> | 2009-04-05 21:49:36 (GMT) |
| commit | 889b0aa4506d5ea43985865a44562ebd39b3bf00 (patch) | |
| tree | 301ad6342823c02e8ddbff55a0c3b0dbf9159067 /Lib/distutils/filelist.py | |
| parent | 965ce8799190b7017a41cd00eede083b342a15fb (diff) | |
| download | cpython-889b0aa4506d5ea43985865a44562ebd39b3bf00.zip cpython-889b0aa4506d5ea43985865a44562ebd39b3bf00.tar.gz cpython-889b0aa4506d5ea43985865a44562ebd39b3bf00.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 | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Lib/distutils/filelist.py b/Lib/distutils/filelist.py index a80c71e..58a2bfb 100644 --- a/Lib/distutils/filelist.py +++ b/Lib/distutils/filelist.py @@ -289,7 +289,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 |