From: Victor Stinner <victor.stinner@haypocalc.com>
Date: Fri, 17 Sep 2010 23:35:50 +0000 (+0000)
Subject: Merged revisions 84866 via svnmerge from
X-Git-Tag: v2.7.1rc1~272
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8fc843b38ea7ce00fc01dd97ded85b401e1db103;p=python

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 b01c3cb908..128a533a21 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 30f62c4f5b..4c9631fa1d 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.