[Python-checkins] r84702 - in python/branches/release31-maint: Doc/library/os.path.rst

[victor.stinner]

Author: victor.stinner
Date: Sat Sep 11 02:23:53 2010
New Revision: 84702

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


Modified:
   python/branches/release31-maint/   (props changed)
   python/branches/release31-maint/Doc/library/os.path.rst

Modified: python/branches/release31-maint/Doc/library/os.path.rst
==============================================================================
--- python/branches/release31-maint/Doc/library/os.path.rst	(original)
+++ python/branches/release31-maint/Doc/library/os.path.rst	Sat Sep 11 02:23:53 2010
@@ -308,5 +308,4 @@
 .. 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).