[Python-checkins] r71285 - in python/branches/release30-maint: Lib/distutils/filelist.py Lib/distutils/tests/test_filelist.py Misc/NEWS

Sun Apr 5 23:52:04 CEST 2009

Author: tarek.ziade
Date: Sun Apr 5 23:52:04 2009
New Revision: 71285
Log:
Merged revisions 71284 via svnmerge from 
svn+ssh://pythondev@svn.python.org/python/branches/py3k
................
 r71284 | tarek.ziade | 2009年04月05日 23:49:36 +0200 (2009年4月05日) | 9 lines
 
 Merged revisions 71280 via svnmerge from 
 svn+ssh://pythondev@svn.python.org/python/trunk
 
 ........
 r71280 | tarek.ziade | 2009年04月05日 23:44:08 +0200 (2009年4月05日) | 1 line
 
 Fixed #1491431: distutils.filelist.glob_to_re was broken for some edge cases (detailed in the test
 ........
................
Added:
 python/branches/release30-maint/Lib/distutils/tests/test_filelist.py
 - copied unchanged from r71284, /python/branches/py3k/Lib/distutils/tests/test_filelist.py
Modified:
 python/branches/release30-maint/ (props changed)
 python/branches/release30-maint/Lib/distutils/filelist.py
 python/branches/release30-maint/Misc/NEWS
Modified: python/branches/release30-maint/Lib/distutils/filelist.py
==============================================================================

--- python/branches/release30-maint/Lib/distutils/filelist.py	(original)
+++ python/branches/release30-maint/Lib/distutils/filelist.py	Sun Apr 5 23:52:04 2009
@@ -289,7 +289,8 @@
 # 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
 
 
Modified: python/branches/release30-maint/Misc/NEWS
==============================================================================
--- python/branches/release30-maint/Misc/NEWS	(original)
+++ python/branches/release30-maint/Misc/NEWS	Sun Apr 5 23:52:04 2009
@@ -187,6 +187,9 @@
 Library
 -------
 
+- Issue #1491431: Fixed distutils.filelist.glob_to_re for edge cases.
+ Initial fix by Wayne Davison.
+
 - Issue #4792: Prevent a segfault in _tkinter by using the
 guaranteed to be safe interp argument given to the PythonCmd in place of
 the Tcl interpreter taken from a PythonCmd_ClientData.
