summaryrefslogtreecommitdiffstats
path: root/Lib/os2emxpath.py
diff options
context:
space:
mode:
authorEzio Melotti <ezio.melotti@gmail.com>2010-02-20 08:09:39 (GMT)
committerEzio Melotti <ezio.melotti@gmail.com>2010-02-20 08:09:39 (GMT)
commit4cc80ca921b4f6bce11bd7eec8bc6b561aa9f524 (patch)
tree9951e02d8dec6e305ab5fa184b93c9d0e534eea5 /Lib/os2emxpath.py
parent61afd2694bf6bff8c65a392aaf27c575d92b7eb9 (diff)
downloadcpython-4cc80ca921b4f6bce11bd7eec8bc6b561aa9f524.zip
cpython-4cc80ca921b4f6bce11bd7eec8bc6b561aa9f524.tar.gz
cpython-4cc80ca921b4f6bce11bd7eec8bc6b561aa9f524.tar.bz2
#3426: os.path.abspath now returns unicode when its arg is unicode.
Diffstat (limited to 'Lib/os2emxpath.py')
-rw-r--r--Lib/os2emxpath.py6
1 files changed, 5 insertions, 1 deletions
diff --git a/Lib/os2emxpath.py b/Lib/os2emxpath.py
index 4e85c4d..1bed51d 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