Merged revisions 84701,84784 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r84701 | victor.stinner | 2010-09-11 02:22:12 +0200 (sam., 11 sept. 2010) | 5 lines

  Issue #767645: fix os.path.supports_unicode_filenames definition

  os.listdir(str) always returns unicode and it can return non-ascii filenames
  even if supports_unicode_filenames is False.
........
  r84784 | victor.stinner | 2010-09-13 21:41:36 +0200 (lun., 13 sept. 2010) | 2 lines

  Issue #767645: Set os.path.supports_unicode_filenames to True on Mac OS X
  (macpath module).
........

diff --git a/Doc/library/os.path.rst b/Doc/library/os.path.rst
index ae55dd822dc1a373491688a2cafa883ed8e2fa7e..aebde0c9109d296f1ad96b895fe9ac4a8751fad8 100644 (file)
--- a/Doc/library/os.path.rst
+++ b/Doc/library/os.path.rst
@@ -337,8 +337,7 @@ write files see :func:`open`, and for accessing the filesystem see the
 .. data:: supports_unicode_filenames
 
    True if arbitrary Unicode strings can be used as file names (within limitations
-   imposed by the file system), and if :func:`os.listdir` returns Unicode strings
-   for a Unicode argument.
+   imposed by the file system).
 
    .. versionadded:: 2.3
 

diff --git a/Lib/macpath.py b/Lib/macpath.py
index b22759efc32b58b1fa3751841d8edd22e3250496..cd4cb8581af67e6e7d1bef020f71fb9bc750b470 100644 (file)
--- a/Lib/macpath.py
+++ b/Lib/macpath.py
@@ -212,4 +212,4 @@ def realpath(path):
             pass
     return path
 
-supports_unicode_filenames = False
+supports_unicode_filenames = True

diff --git a/Misc/NEWS b/Misc/NEWS
index 645f0e65dc96b42d51ae9897c932dd50fcef5758..0ee1605433ab27c9296a05d7ff50e6d8bca1e130 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -43,6 +43,9 @@ Core and Builtins
 Library
 -------
 
+- Issue #767645: Set os.path.supports_unicode_filenames to True on Mac OS X
+  (macpath module).
+
 - Issue #9837: The read() method of ZipExtFile objects (as returned by
   ZipFile.open()) could return more bytes than requested.