diff -r ab6ab44921b2 Lib/test/test_glob.py
--- a/Lib/test/test_glob.py	Thu Aug 30 14:52:38 2012 +0000
+++ b/Lib/test/test_glob.py	Fri Aug 31 03:46:08 2012 +0100
@@ -10,6 +10,11 @@
     def norm(self, *parts):
         return os.path.normpath(os.path.join(self.tempdir, *parts))
 
+    # same as norm above, but converts the path to bytes, so that we
+    # test that glob.glob deals with bytes correctly
+    def bytesNorm(self, *parts):
+        return bytes(self.norm(*parts), 'ASCII')
+
     def mktemp(self, *parts):
         filename = self.norm(*parts)
         base, file = os.path.split(filename)
@@ -42,6 +47,18 @@
         self.assertEqual(list(glob.iglob(p)), res)
         return res
 
+    # same as self.glob above, but converts the path to bytes, so that we
+    # test that glob.glob deals with bytes correctly.
+    def bytesGlob(self, *parts):
+        if len(parts) == 1:
+            pattern = parts[0]
+        else:
+            pattern = os.path.join(*parts)
+        p = bytes(os.path.join(self.tempdir, pattern), 'ASCII')
+        res = glob.glob(p)
+        self.assertEqual(list(glob.iglob(p)), res)
+        return res
+
     def assertSequencesEqual_noorder(self, l1, l2):
         self.assertEqual(set(l1), set(l2))
 
@@ -51,6 +68,10 @@
         eq(self.glob('a', 'D'), [self.norm('a', 'D')])
         eq(self.glob('aab'), [self.norm('aab')])
         eq(self.glob('zymurgy'), [])
+        eq(self.bytesGlob('a'), [self.bytesNorm('a')])
+        eq(self.bytesGlob('a', 'D'), [self.bytesNorm('a', 'D')])
+        eq(self.bytesGlob('aab'), [self.bytesNorm('aab')])
+        eq(self.bytesGlob('zymurgy'), [])
 
         # test return types are unicode, but only if os.listdir
         # returns unicode filenames
@@ -69,17 +90,26 @@
         eq(self.glob('aa?'), map(self.norm, ['aaa', 'aab']))
         eq(self.glob('aa[ab]'), map(self.norm, ['aaa', 'aab']))
         eq(self.glob('*q'), [])
+        eq(self.bytesGlob('a*'), map(self.bytesNorm, ['a', 'aab', 'aaa']))
+        eq(self.bytesGlob('*a'), map(self.bytesNorm, ['a', 'aaa']))
+        eq(self.bytesGlob('aa?'), map(self.bytesNorm, ['aaa', 'aab']))
+        eq(self.bytesGlob('aa[ab]'), map(self.bytesNorm, ['aaa', 'aab']))
+        eq(self.bytesGlob('*q'), [])
 
     def test_glob_nested_directory(self):
         eq = self.assertSequencesEqual_noorder
         if os.path.normcase("abCD") == "abCD":
             # case-sensitive filesystem
             eq(self.glob('a', 'bcd', 'E*'), [self.norm('a', 'bcd', 'EF')])
+            eq(self.bytesGlob('a', 'bcd', 'E*'), [self.bytesNorm('a', 'bcd', 'EF')])
         else:
             # case insensitive filesystem
             eq(self.glob('a', 'bcd', 'E*'), [self.norm('a', 'bcd', 'EF'),
                                              self.norm('a', 'bcd', 'efg')])
+            eq(self.bytesGlob('a', 'bcd', 'E*'), [self.bytesNorm('a', 'bcd', 'EF'),
+                                             self.bytesNorm('a', 'bcd', 'efg')])
         eq(self.glob('a', 'bcd', '*g'), [self.norm('a', 'bcd', 'efg')])
+        eq(self.bytesGlob('a', 'bcd', '*g'), [self.bytesNorm('a', 'bcd', 'efg')])
 
     def test_glob_directory_names(self):
         eq = self.assertSequencesEqual_noorder
@@ -89,12 +119,20 @@
            [self.norm('a', 'bcd', 'efg', 'ha')])
         eq(self.glob('?a?', '*F'), map(self.norm, [os.path.join('aaa', 'zzzF'),
                                                    os.path.join('aab', 'F')]))
+        eq(self.bytesGlob('*', 'D'), [self.bytesNorm('a', 'D')])
+        eq(self.bytesGlob('*', '*a'), [])
+        eq(self.bytesGlob('a', '*', '*', '*a'),
+           [self.bytesNorm('a', 'bcd', 'efg', 'ha')])
+        eq(self.bytesGlob('?a?', '*F'), map(self.bytesNorm, [os.path.join('aaa', 'zzzF'),
+                                                             os.path.join('aab', 'F')]))
 
     def test_glob_directory_with_trailing_slash(self):
         # We are verifying that when there is wildcard pattern which
         # ends with os.sep doesn't blow up.
         res = glob.glob(self.tempdir + '*' + os.sep)
+        resBytes = glob.glob(bytes(self.tempdir + '*' + os.sep, 'ASCII'))
         self.assertEqual(len(res), 1)
+        self.assertEqual(len(resBytes), 1)
         # either of these results are reasonable
         self.assertIn(res[0], [self.tempdir, self.tempdir + os.sep])
 
@@ -104,6 +142,9 @@
         eq(self.glob('sym*'), [self.norm('sym1'), self.norm('sym2')])
         eq(self.glob('sym1'), [self.norm('sym1')])
         eq(self.glob('sym2'), [self.norm('sym2')])
+        eq(self.bytesGlob('sym*'), [self.bytesNorm('sym1'), self.bytesNorm('sym2')])
+        eq(self.bytesGlob('sym1'), [self.bytesNorm('sym1')])
+        eq(self.bytesGlob('sym2'), [self.bytesNorm('sym2')])
 
 
 def test_main():