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
........

diff --git a/Lib/posixpath.py b/Lib/posixpath.py
index b01c3cb90850cb3fe1461409f3260d2f08a9ab51..128a533a213b23f00765db02b5933ef0e0bd7f71 100644 (file)
--- 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 30f62c4f5babf80f0eb15f5a8c9bda1034410ccb..4c9631fa1df55cb24041191e785613ce72c0df77 100644 (file)
--- 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.