diff options
| author | Ezio Melotti <ezio.melotti@gmail.com> | 2010-02-20 09:16:04 +0000 |
|---|---|---|
| committer | Ezio Melotti <ezio.melotti@gmail.com> | 2010-02-20 09:16:04 +0000 |
| commit | 502f8eb50b2e2968534da6cdfafb563615cc5798 (patch) | |
| tree | beed6f693b70137cd08d3f5e05d0d0532a8051f0 /Lib/os2emxpath.py | |
| parent | aaa210e2fdc96030439bf694fae1994cac495565 (diff) | |
| download | cpython-git-502f8eb50b2e2968534da6cdfafb563615cc5798.tar.gz | |
Merged revisions 78247 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r78247 | ezio.melotti | 2010-02-20 10:09:39 +0200 (Sat, 20 Feb 2010) | 1 line
#3426: os.path.abspath now returns unicode when its arg is unicode.
........
Diffstat (limited to 'Lib/os2emxpath.py')
| -rw-r--r-- | Lib/os2emxpath.py | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/Lib/os2emxpath.py b/Lib/os2emxpath.py index 4e85c4d48d..1bed51d4fa 100644 --- a/Lib/os2emxpath.py +++ b/Lib/os2emxpath.py @@ -146,7 +146,11 @@ def normpath(path): def abspath(path): """Return the absolute version of a path""" if not isabs(path): - path = join(os.getcwd(), path) + if isinstance(path, unicode): + cwd = os.getcwdu() + else: + cwd = os.getcwd() + path = join(cwd, path) return normpath(path) # realpath is a no-op on systems without islink support |