summaryrefslogtreecommitdiffstats
path: root/Lib/posixpath.py
diff options
context:
space:
mode:
authorMartin v. Löwis <martin@v.loewis.de>2012-05-20 08:42:17 (GMT)
committerMartin v. Löwis <martin@v.loewis.de>2012-05-20 08:42:17 (GMT)
commited11a5d018e3fc234d7126832756a15c1af67d22 (patch)
tree4f5ee76e85299c314f1e923db480f3733bf48313 /Lib/posixpath.py
parent77e77a12731ad937e6567a2c0dea7dc51c80c69a (diff)
downloadcpython-ed11a5d018e3fc234d7126832756a15c1af67d22.zip
cpython-ed11a5d018e3fc234d7126832756a15c1af67d22.tar.gz
cpython-ed11a5d018e3fc234d7126832756a15c1af67d22.tar.bz2
Issue #8767: Restore building with --disable-unicode.
Original patch by Stefano Taschini.
Diffstat (limited to 'Lib/posixpath.py')
-rw-r--r--Lib/posixpath.py12
1 files changed, 10 insertions, 2 deletions
diff --git a/Lib/posixpath.py b/Lib/posixpath.py
index 163c00c..690c70d 100644
--- a/Lib/posixpath.py
+++ b/Lib/posixpath.py
@@ -17,6 +17,14 @@ import genericpath
import warnings
from genericpath import *
+try:
+ _unicode = unicode
+except NameError:
+ # If Python is built without Unicode support, the unicode type
+ # will not exist. Fake one.
+ class _unicode(object):
+ pass
+
__all__ = ["normcase","isabs","join","splitdrive","split","splitext",
"basename","dirname","commonprefix","getsize","getmtime",
"getatime","getctime","islink","exists","lexists","isdir","isfile",
@@ -312,7 +320,7 @@ def expandvars(path):
def normpath(path):
"""Normalize path, eliminating double slashes, etc."""
# Preserve unicode (if path is unicode)
- slash, dot = (u'/', u'.') if isinstance(path, unicode) else ('/', '.')
+ slash, dot = (u'/', u'.') if isinstance(path, _unicode) else ('/', '.')
if path == '':
return dot
initial_slashes = path.startswith('/')
@@ -341,7 +349,7 @@ def normpath(path):
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()