fixed how fnmatch.translate is used (since it has changed in r74475 for #6665). Now...

diff --git a/Lib/distutils/filelist.py b/Lib/distutils/filelist.py
index 3ba5720ca94f15743a8c72c77d0936e7ed767df0..5a88fd4e21b9f86576cbabc3a7648504089e1123 100644 (file)
--- a/Lib/distutils/filelist.py
+++ b/Lib/distutils/filelist.py
@@ -342,12 +342,13 @@ def translate_pattern (pattern, anchor=1, prefix=None, is_regex=0):
         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:
             pattern_re = "^" + pattern_re
 
     return re.compile(pattern_re)
-
 # translate_pattern ()

diff --git a/Lib/distutils/tests/test_filelist.py b/Lib/distutils/tests/test_filelist.py
index 86db55744106df725c997e1bfadd8506f95433fd..1faccfae7e51642da7f23c752b7d26ee46fb41b6 100644 (file)
--- a/Lib/distutils/tests/test_filelist.py
+++ b/Lib/distutils/tests/test_filelist.py
@@ -6,15 +6,15 @@ class FileListTestCase(unittest.TestCase):
 
     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)