summaryrefslogtreecommitdiffstats
path: root/Lib/distutils/tests
diff options
context:
space:
mode:
authorTarek Ziadé <ziade.tarek@gmail.com>2009-08-17 21:35:46 (GMT)
committerTarek Ziadé <ziade.tarek@gmail.com>2009-08-17 21:35:46 (GMT)
commit74c23ac08dda58f08b78f195151949525087f431 (patch)
tree372e4a64068ef5e5fd72fb561ffb624f6892a617 /Lib/distutils/tests
parent8c6b0a5bcb2cfb0cd9e67bcfca4ee23297cd75f9 (diff)
downloadcpython-74c23ac08dda58f08b78f195151949525087f431.zip
cpython-74c23ac08dda58f08b78f195151949525087f431.tar.gz
cpython-74c23ac08dda58f08b78f195151949525087f431.tar.bz2
Merged revisions 74493 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk ........ r74493 | tarek.ziade | 2009-08-17 23:28:34 +0200 (Mon, 17 Aug 2009) | 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 ........
Diffstat (limited to 'Lib/distutils/tests')
-rw-r--r--Lib/distutils/tests/test_filelist.py14
1 files changed, 7 insertions, 7 deletions
diff --git a/Lib/distutils/tests/test_filelist.py b/Lib/distutils/tests/test_filelist.py
index 86db557..1faccfa 100644
--- 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)