mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-14 04:37:29 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

Issue #8767: Restore building with --disable-unicode.

Browse source 
Original patch by Stefano Taschini.
This commit is contained in:
Martin v. Löwis 2012-05-20 10:42:17 +02:00
parent 77e77a1273
commit ed11a5d018
14 changed files with 63 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

12
Lib/posixpath.py
View file

@ -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()