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

Lib/glob.py

 """Filename globbing utility."""
 
 import sys
 import os
 import re
 import fnmatch
 
 __all__ = ["glob", "iglob"]
 
 def glob(pathname):
@@ skipping 30 matching lines @@
     for dirname in dirs:
         for name in glob_in_dir(dirname, basename):
             yield os.path.join(dirname, name)
 
 # These 2 helper functions non-recursively glob inside a literal directory.
 # They return a list of basenames. `glob1` accepts a pattern while `glob0`
 # takes a literal basename (so it only has to check for its existence).
 
 def glob1(dirname, pattern):
     if not dirname:
-        dirname = os.curdir
-        if isinstance(pattern, (bytes, bytearray)):
-            dirname = dirname.encode('ASCII')

[GvR, 2008/10/01 00:00:31]

It might be more readable to write

  dirname = bytes(os.curdir, 'ASCII')

here.

+        if isinstance(pattern, bytes):
+            dirname = bytes(os.curdir, 'ASCII')
+        else:
+            dirname = os.curdir
     try:
         names = os.listdir(dirname)
     except os.error:
         return []
     if pattern[0] != '.':
         names = [x for x in names if x[0] != '.']
     return fnmatch.filter(names, pattern)
 
 def glob0(dirname, basename):
     if basename == '':
         # `os.path.split()` returns an empty basename for paths ending with a
         # directory separator.  'q*x/' should match only directories.
         if os.path.isdir(dirname):
             return [basename]
     else:
         if os.path.lexists(os.path.join(dirname, basename)):
             return [basename]
     return []
 
 
 magic_check = re.compile('[*?[]')
 magic_check_bytes = re.compile(b'[*?[]')
 
 def has_magic(s):
-    if isinstance(s, (bytes, bytearray)):
+    if isinstance(s, bytes):
         match = magic_check_bytes.search(s)
     else:
         match = magic_check.search(s)
     return match is not None