diff options
| author | Guido van Rossum <guido@python.org> | 2007-05-02 19:09:54 (GMT) |
|---|---|---|
| committer | Guido van Rossum <guido@python.org> | 2007-05-02 19:09:54 (GMT) |
| commit | ef87d6ed94780fe00250a551031023aeb2898365 (patch) | |
| tree | 1f8989aaaec7ec5f8b2f26498317f2022bf85531 /Lib/glob.py | |
| parent | 572dbf8f1320c0b34b9c786e5c30ba4a4b61b292 (diff) | |
| download | cpython-ef87d6ed94780fe00250a551031023aeb2898365.zip cpython-ef87d6ed94780fe00250a551031023aeb2898365.tar.gz cpython-ef87d6ed94780fe00250a551031023aeb2898365.tar.bz2 | |
Rip out all the u"..." literals and calls to unicode().
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) |