Index: Lib/glob.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/glob.py,v
retrieving revision 1.10
diff -u -w -r1.10 glob.py
--- Lib/glob.py	6 Jun 2001 06:24:38 -0000	1.10
+++ Lib/glob.py	1 Aug 2004 22:30:25 -0000
@@ -41,6 +41,7 @@
 
 def glob1(dirname, pattern):
     if not dirname: dirname = os.curdir
+    if isinstance(pattern, unicode): dirname = unicode(dirname)
     try:
         names = os.listdir(dirname)
     except os.error:
Index: Lib/test/test_glob.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/test/test_glob.py,v
retrieving revision 1.7
diff -u -w -r1.7 test_glob.py
--- Lib/test/test_glob.py	16 Nov 2003 16:17:48 -0000	1.7
+++ Lib/test/test_glob.py	1 Aug 2004 22:30:25 -0000
@@ -70,6 +70,16 @@
         eq(self.glob('aab'), [self.norm('aab')])
         eq(self.glob('zymurgy'), [])
 
+        # test return types are unicode
+        u1 = glob.glob(u'*')
+        s1 = glob.glob('*')
+        u2 = glob.glob(u'./*')
+        s2 = glob.glob('./*')
+        eq(u1, s1)
+        eq(u2, s2)
+        self.assertEquals([type(r) for r in u1], [unicode] * len(u1))
+        self.assertEquals([type(r) for r in u2], [unicode] * len(u2))
+
     def test_glob_one_directory(self):
         eq = self.assertSequencesEqual_noorder
         eq(self.glob('a*'), map(self.norm, ['a', 'aab', 'aaa']))