summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVictor Stinner <victor.stinner@haypocalc.com>2010-09-17 23:35:50 (GMT)
committerVictor Stinner <victor.stinner@haypocalc.com>2010-09-17 23:35:50 (GMT)
commit8fc843b38ea7ce00fc01dd97ded85b401e1db103 (patch)
tree78203038e313d864fee361168c017d4e355ef378
parent9c379bbadd7b7cb292fa8ae0a2ad22dd80518b27 (diff)
downloadcpython-8fc843b38ea7ce00fc01dd97ded85b401e1db103.zip
cpython-8fc843b38ea7ce00fc01dd97ded85b401e1db103.tar.gz
cpython-8fc843b38ea7ce00fc01dd97ded85b401e1db103.tar.bz2
Merged revisions 84866 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k ........ r84866 | victor.stinner | 2010-09-18 01:34:26 +0200 (sam., 18 sept. 2010) | 4 lines Issue #767645: Set os.path.supports_unicode_filenames to True in posixpath Previous commit changed macpath but macpath is not used anymore as os.path ........
-rw-r--r--Lib/posixpath.py2
-rw-r--r--Misc/NEWS3
2 files changed, 2 insertions, 3 deletions
diff --git a/Lib/posixpath.py b/Lib/posixpath.py
index b01c3cb..128a533 100644
--- a/Lib/posixpath.py
+++ b/Lib/posixpath.py
@@ -394,7 +394,7 @@ def _resolve_link(path):
path = normpath(resolved)
return path
-supports_unicode_filenames = False
+supports_unicode_filenames = (sys.platform == 'darwin')
def relpath(path, start=curdir):
"""Return a relative version of a path"""
diff --git a/Misc/NEWS b/Misc/NEWS
index 30f62c4..4c9631f 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -55,8 +55,7 @@ Library
- Issue #9826: OrderedDict.__repr__ can now handle self-referential
values: d['x'] = d.
-- Issue #767645: Set os.path.supports_unicode_filenames to True on Mac OS X
- (macpath module).
+- Issue #767645: Set os.path.supports_unicode_filenames to True on Mac OS X.
- Issue #9837: The read() method of ZipExtFile objects (as returned by
ZipFile.open()) could return more bytes than requested.