diff options
Diffstat (limited to 'Lib/glob.py')
| -rw-r--r-- | Lib/glob.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Lib/glob.py b/Lib/glob.py index 75d7bf9..0e2bc1e 100644 --- a/Lib/glob.py +++ b/Lib/glob.py @@ -49,8 +49,8 @@ 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() or + if isinstance(pattern, str) and not isinstance(dirname, str): + dirname = str(dirname, sys.getfilesystemencoding() or sys.getdefaultencoding()) try: names = os.listdir(dirname) |