[Python-checkins] r74494 - in python/branches/py3k: Lib/distutils/filelist.py Lib/distutils/tests/test_filelist.py

Mon Aug 17 23:35:46 CEST 2009

Author: tarek.ziade
Date: Mon Aug 17 23:35:46 2009
New Revision: 74494
Log:
Merged revisions 74493 via svnmerge from 
svn+ssh://pythondev@svn.python.org/python/trunk
........
 r74493 | tarek.ziade | 2009年08月17日 23:28:34 +0200 (2009年8月17日) | 1 line
 
 fixed how fnmatch.translate is used (since it has changed in r74475 for #6665). Now the code is not harcoding the usage of $ anymore
........
Modified:
 python/branches/py3k/ (props changed)
 python/branches/py3k/Lib/distutils/filelist.py
 python/branches/py3k/Lib/distutils/tests/test_filelist.py
Modified: python/branches/py3k/Lib/distutils/filelist.py
==============================================================================

--- python/branches/py3k/Lib/distutils/filelist.py	(original)
+++ python/branches/py3k/Lib/distutils/filelist.py	Mon Aug 17 23:35:46 2009
@@ -312,7 +312,9 @@
 pattern_re = ''
 
 if prefix is not None:
- prefix_re = (glob_to_re(prefix))[0:-1] # ditch trailing $
+ # ditch end of pattern character
+ empty_pattern = glob_to_re('')
+ prefix_re = (glob_to_re(prefix))[:-len(empty_pattern)]
 pattern_re = "^" + os.path.join(prefix_re, ".*" + pattern_re)
 else: # no prefix -- respect anchor flag
 if anchor:
Modified: python/branches/py3k/Lib/distutils/tests/test_filelist.py
==============================================================================
--- python/branches/py3k/Lib/distutils/tests/test_filelist.py	(original)
+++ python/branches/py3k/Lib/distutils/tests/test_filelist.py	Mon Aug 17 23:35:46 2009
@@ -6,15 +6,15 @@
 
 def test_glob_to_re(self):
 # simple cases
- self.assertEquals(glob_to_re('foo*'), 'foo[^/]*$')
- self.assertEquals(glob_to_re('foo?'), 'foo[^/]$')
- self.assertEquals(glob_to_re('foo??'), 'foo[^/][^/]$')
+ self.assertEquals(glob_to_re('foo*'), 'foo[^/]*\\Z(?ms)')
+ self.assertEquals(glob_to_re('foo?'), 'foo[^/]\\Z(?ms)')
+ self.assertEquals(glob_to_re('foo??'), 'foo[^/][^/]\\Z(?ms)')
 
 # special cases
- self.assertEquals(glob_to_re(r'foo\\*'), r'foo\\\\[^/]*$')
- self.assertEquals(glob_to_re(r'foo\\\*'), r'foo\\\\\\[^/]*$')
- self.assertEquals(glob_to_re('foo????'), r'foo[^/][^/][^/][^/]$')
- self.assertEquals(glob_to_re(r'foo\\??'), r'foo\\\\[^/][^/]$')
+ self.assertEquals(glob_to_re(r'foo\\*'), r'foo\\\\[^/]*\Z(?ms)')
+ self.assertEquals(glob_to_re(r'foo\\\*'), r'foo\\\\\\[^/]*\Z(?ms)')
+ self.assertEquals(glob_to_re('foo????'), r'foo[^/][^/][^/][^/]\Z(?ms)')
+ self.assertEquals(glob_to_re(r'foo\\??'), r'foo\\\\[^/][^/]\Z(?ms)')
 
 def test_suite():
 return unittest.makeSuite(FileListTestCase)
