diff options
| author | Serhiy Storchaka <storchaka@gmail.com> | 2015-02-13 12:02:05 +0200 |
|---|---|---|
| committer | Serhiy Storchaka <storchaka@gmail.com> | 2015-02-13 12:02:05 +0200 |
| commit | 2bd8b22b6de76851a7e36dc4a92d20930335ff57 (patch) | |
| tree | 648a3e23f9a7d001b061930d3d07ef772de5477f /Lib/macpath.py | |
| parent | 4068b01cb55a66efca605d64b6e27d9fd7cebd3e (diff) | |
| download | cpython-git-2bd8b22b6de76851a7e36dc4a92d20930335ff57.tar.gz | |
Issue #21840: Fixed expanding unicode variables of form $var in
posixpath.expandvars(). Fixed all os.path implementations on
unicode-disabled builds.
Diffstat (limited to 'Lib/macpath.py')
| -rw-r--r-- | Lib/macpath.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Lib/macpath.py b/Lib/macpath.py index c31bdaade1..9ebd83cf90 100644 --- a/Lib/macpath.py +++ b/Lib/macpath.py @@ -5,6 +5,7 @@ import warnings from stat import * import genericpath from genericpath import * +from genericpath import _unicode __all__ = ["normcase","isabs","join","splitdrive","split","splitext", "basename","dirname","commonprefix","getsize","getmtime", @@ -186,7 +187,7 @@ def walk(top, func, arg): def abspath(path): """Return an absolute path.""" if not isabs(path): - if isinstance(path, unicode): + if isinstance(path, _unicode): cwd = os.getcwdu() else: cwd = os.getcwd() |