Merged revisions 84701 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.
........

diff --git a/Doc/library/os.path.rst b/Doc/library/os.path.rst
index d63946ecb85eb4d96ca51906073a1f189159bce8..9f71de66855e164ed972b4fe1f495af9df4e8718 100644 (file)
--- a/Doc/library/os.path.rst
+++ b/Doc/library/os.path.rst
@@ -308,5 +308,4 @@ applications should use string objects to access all files.
 .. 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 strings that
-   contain characters that cannot be represented by ASCII.
+   imposed by the file system).