[Python-checkins] r76045 - in python/branches/release31-maint: Lib/distutils/filelist.py Lib/distutils/tests/test_build_py.py Lib/distutils/tests/test_filelist.py

[tarek.ziade]

Author: tarek.ziade
Date: Mon Nov  2 00:11:55 2009
New Revision: 76045

Log:
reapplied r74493 (after #6665 fix has been backported)

Modified:
   python/branches/release31-maint/   (props changed)
   python/branches/release31-maint/Lib/distutils/filelist.py
   python/branches/release31-maint/Lib/distutils/tests/test_build_py.py
   python/branches/release31-maint/Lib/distutils/tests/test_filelist.py

Modified: python/branches/release31-maint/Lib/distutils/filelist.py
==============================================================================
--- python/branches/release31-maint/Lib/distutils/filelist.py	(original)
+++ python/branches/release31-maint/Lib/distutils/filelist.py	Mon Nov  2 00:11:55 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/release31-maint/Lib/distutils/tests/test_build_py.py
==============================================================================
--- python/branches/release31-maint/Lib/distutils/tests/test_build_py.py	(original)
+++ python/branches/release31-maint/Lib/distutils/tests/test_build_py.py	Mon Nov  2 00:11:55 2009
@@ -69,6 +69,7 @@
         open(os.path.join(testdir, "testfile"), "w").close()
 
         os.chdir(sources)
+        old_stdout = sys.stdout
         sys.stdout = io.StringIO()
 
         try:
@@ -87,7 +88,7 @@
         finally:
             # Restore state.
             os.chdir(cwd)
-            sys.stdout = sys.__stdout__
+            sys.stdout = old_stdout
 
     def test_dont_write_bytecode(self):
         # makes sure byte_compile is not used

Modified: python/branches/release31-maint/Lib/distutils/tests/test_filelist.py
==============================================================================
--- python/branches/release31-maint/Lib/distutils/tests/test_filelist.py	(original)
+++ python/branches/release31-maint/Lib/distutils/tests/test_filelist.py	Mon Nov  2 00:11:55 2009
@@ -9,15 +9,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_debug_print(self):
         file_list = FileList()