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

Lib/test/test_fnmatch.py

Index: Lib/test/test_fnmatch.py
===================================================================
--- Lib/test/test_fnmatch.py	(revision 66736)
+++ Lib/test/test_fnmatch.py	(working copy)
@@ -37,6 +37,15 @@
         check('a', r'[!\]')
         check('\\', r'[!\]', 0)
 
+    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)