From: Georg Brandl <georg@python.org>
Date: Tue, 20 Mar 2007 23:05:14 +0000 (+0000)
Subject: Fix for glob.py if filesystem encoding is None.
X-Git-Tag: v2.6a1~1960
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b54a809825ca010bdf3d4902fa8c8a4870c5baf1;p=thirdparty%2FPython%2Fcpython.git

Fix for glob.py if filesystem encoding is None.
---

diff --git a/Lib/glob.py b/Lib/glob.py
index a92b11f431bd..75d7bf94e5b2 100644
--- a/Lib/glob.py
+++ b/Lib/glob.py
@@ -50,7 +50,8 @@ def glob1(dirname, pattern):
     if not dirname:
         dirname = os.curdir
     if isinstance(pattern, unicode) and not isinstance(dirname, unicode):
-        dirname = unicode(dirname, sys.getfilesystemencoding())
+        dirname = unicode(dirname, sys.getfilesystemencoding() or
+                                   sys.getdefaultencoding())
     try:
         names = os.listdir(dirname)
     except os.error: