Merged revisions 78101 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/trunk

........
  r78101 | georg.brandl | 2010-02-08 02:04:54 +0200 (Mon, 08 Feb 2010) | 1 line

  Fix test_fnmatch.
........

diff --git a/Lib/test/test_fnmatch.py b/Lib/test/test_fnmatch.py
index 3777098fa84e41912756349d252c128386460732..3a55b85f6232bca61eb0b44af20c481fcb3efd42 100644 (file)
--- a/Lib/test/test_fnmatch.py
+++ b/Lib/test/test_fnmatch.py
@@ -7,15 +7,15 @@ from fnmatch import fnmatch, fnmatchcase
 
 
 class FnmatchTestCase(unittest.TestCase):
-    def check_match(self, filename, pattern, should_match=1):
+    def check_match(self, filename, pattern, should_match=1, fn=fnmatch):
         if should_match:
-            self.assert_(fnmatch(filename, pattern),
-                         "expected %r to match pattern %r"
-                         % (filename, pattern))
+            self.assertTrue(fn(filename, pattern),
+                            "expected %r to match pattern %r"
+                            % (filename, pattern))
         else:
-            self.assert_(not fnmatch(filename, pattern),
-                         "expected %r not to match pattern %r"
-                         % (filename, pattern))
+            self.assertTrue(not fn(filename, pattern),
+                            "expected %r not to match pattern %r"
+                            % (filename, pattern))
 
     def test_fnmatch(self):
         check = self.check_match
@@ -46,8 +46,8 @@ class FnmatchTestCase(unittest.TestCase):
 
     def test_fnmatchcase(self):
         check = self.check_match
-        check('AbC', 'abc', 0)
-        check('abc', 'AbC', 0)
+        check('AbC', 'abc', 0, fnmatchcase)
+        check('abc', 'AbC', 0, fnmatchcase)
 
 
 def test_main():