[Python-checkins] r54468 - python/trunk/Lib/glob.py

Wed Mar 21 00:05:21 CET 2007

Author: georg.brandl
Date: Wed Mar 21 00:05:14 2007
New Revision: 54468
Modified:
 python/trunk/Lib/glob.py
Log:
Fix for glob.py if filesystem encoding is None.
Modified: python/trunk/Lib/glob.py
==============================================================================

--- python/trunk/Lib/glob.py	(original)
+++ python/trunk/Lib/glob.py	Wed Mar 21 00:05:14 2007
@@ -50,7 +50,8 @@
 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:
