combined patches from http://bugs.python.org/issue3187

Lib/test/test_fnmatch.py

 """Test cases for the fnmatch module."""
 
 from test import support
 import unittest
-import sys
 
-from fnmatch import fnmatch, fnmatchcase, filter
+from fnmatch import fnmatch, fnmatchcase
 
 
 class FnmatchTestCase(unittest.TestCase):
     def check_match(self, filename, pattern, should_match=1):
         if should_match:
             self.assert_(fnmatch(filename, pattern),
                          "expected %r to match pattern %r"
                          % (filename, pattern))
         else:
             self.assert_(not fnmatch(filename, pattern),
@@ skipping 13 matching lines @@
         check('abc', 'ab[de]', 0)
         check('a', '??', 0)
         check('a', 'b', 0)
 
         # these test that '\' is handled correctly in character sets;
         # see SF bug #???
         check('\\', r'[\]')
         check('a', r'[!\]')
         check('\\', r'[!\]', 0)
 
-    def test_filter_bytes(self):
-        charset = sys.getfilesystemencoding()
-        abc = "abc".encode(charset)
-        names = ["abc", abc]
-        self.assertEqual(filter(names, "*"), names)
+    def test_mix_bytes_str(self):
+        self.assertRaises(TypeError, fnmatch, 'test', b'*')
+        self.assertRaises(TypeError, fnmatch, b'test', '*')
+        self.assertRaises(TypeError, fnmatchcase, 'test', b'*')
+        self.assertRaises(TypeError, fnmatchcase, b'test', '*')
+
+    def test_bytes(self):
+        self.check_match(b'test', b'te*')
+        self.check_match(b'test\xff', b'te*\xff')
 
 def test_main():
     support.run_unittest(FnmatchTestCase)
 
 
 if __name__ == "__main__":
     test_main()