Revert rev. 54198, it's not really backwards compatible.

diff --git a/Lib/glob.py b/Lib/glob.py
index a92b11f431bd88a20cbec5239bf22aae0e75bba0..95656cc1a6dd3657de543d6ec5c479b2d4e10370 100644 (file)
--- a/Lib/glob.py
+++ b/Lib/glob.py
@@ -1,9 +1,8 @@
 """Filename globbing utility."""
 
-import sys
 import os
-import re
 import fnmatch
+import re
 
 __all__ = ["glob", "iglob"]
 
@@ -49,15 +48,13 @@ def iglob(pathname):
 def glob1(dirname, pattern):
     if not dirname:
         dirname = os.curdir
-    if isinstance(pattern, unicode) and not isinstance(dirname, unicode):
-        dirname = unicode(dirname, sys.getfilesystemencoding())
     try:
         names = os.listdir(dirname)
     except os.error:
         return []
-    if pattern[0] != '.':
-        names = filter(lambda x: x[0] != '.', names)
-    return fnmatch.filter(names, pattern)
+    if pattern[0]!='.':
+        names=filter(lambda x: x[0]!='.',names)
+    return fnmatch.filter(names,pattern)
 
 def glob0(dirname, basename):
     if basename == '':

diff --git a/Lib/test/test_glob.py b/Lib/test/test_glob.py
index f1993aba311ccd3228b5bf022340877b272a2d3d..5ce09f9d10d3390f25d15dba7f5542b398e38653 100644 (file)
--- a/Lib/test/test_glob.py
+++ b/Lib/test/test_glob.py
@@ -52,16 +52,6 @@ class GlobTests(unittest.TestCase):
         eq(self.glob('aab'), [self.norm('aab')])
         eq(self.glob('zymurgy'), [])
 
-        # test return types are unicode, but only if os.listdir
-        # returns unicode filenames
-        uniset = set([unicode])
-        tmp = os.listdir(u'.')
-        if set(type(x) for x in tmp) == uniset:
-            u1 = glob.glob(u'*')
-            u2 = glob.glob(u'./*')
-            self.assertEquals(set(type(r) for r in u1), uniset)
-            self.assertEquals(set(type(r) for r in u2), uniset)
-
     def test_glob_one_directory(self):
         eq = self.assertSequencesEqual_noorder
         eq(self.glob('a*'), map(self.norm, ['a', 'aab', 'aaa']))

diff --git a/Misc/NEWS b/Misc/NEWS
index 156c03ccdf4f0c745f1a22290413fbccfe31fdc3..7080ff7998a7b07e8a4259a2f5aa81565f57521f 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -217,9 +217,6 @@ Library
   never made sense with ordinary subclasses -- the failure just occurred
   later, with a more cumbersome exception.
 
-- Patch #1001604: glob.glob() now returns unicode filenames if it was
-  given a unicode argument and os.listdir() returns unicode filenames.
-
 - Patch #685268: Consider a package's __path__ in imputil.
 
 - Patch 1463026: Support default namespace in XMLGenerator.