summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVictor Stinner <victor.stinner@haypocalc.com>2010-09-13 20:31:34 +0000
committerVictor Stinner <victor.stinner@haypocalc.com>2010-09-13 20:31:34 +0000
commit46287f551ba1add60dba03fc1ad67a51165ed0f6 (patch)
tree322874b03b5e330fc0724103df69340a06df8a9d
parent93ae8a613001f15004429936174245fc455138f3 (diff)
downloadcpython-git-46287f551ba1add60dba03fc1ad67a51165ed0f6.tar.gz
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). ........
-rw-r--r--Doc/library/os.path.rst3
-rw-r--r--Lib/macpath.py2
-rw-r--r--Misc/NEWS3
3 files changed, 5 insertions, 3 deletions
diff --git a/Doc/library/os.path.rst b/Doc/library/os.path.rst
index ae55dd822d..aebde0c910 100644
--- 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 b22759efc3..cd4cb8581a 100644
--- 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 645f0e65dc..0ee1605433 100644
--- 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.