[Python-checkins] cpython (merge 3.6 -> default): Issue #28324: Merge from 3.6

[ned.deily]

https://hg.python.org/cpython/rev/d55fd379b994
changeset:   104221:d55fd379b994
parent:      104219:2c7034d59c7b
parent:      104220:dbdcedf3583e
user:        Ned Deily <nad at python.org>
date:        Sat Oct 01 21:33:34 2016 -0400
summary:
  Issue #28324: Merge from 3.6

files:
  Lib/os.py |  6 +++---
  1 files changed, 3 insertions(+), 3 deletions(-)


diff --git a/Lib/os.py b/Lib/os.py
--- a/Lib/os.py
+++ b/Lib/os.py
@@ -4,9 +4,9 @@
   - all functions from posix or nt, e.g. unlink, stat, etc.
   - os.path is either posixpath or ntpath
   - os.name is either 'posix' or 'nt'
-  - os.curdir is a string representing the current directory ('.' or ':')
-  - os.pardir is a string representing the parent directory ('..' or '::')
-  - os.sep is the (or a most common) pathname separator ('/' or ':' or '\\')
+  - os.curdir is a string representing the current directory (always '.')
+  - os.pardir is a string representing the parent directory (always '..')
+  - os.sep is the (or a most common) pathname separator ('/' or '\\')
   - os.extsep is the extension separator (always '.')
   - os.altsep is the alternate pathname separator (None or '/')
   - os.pathsep is the component separator used in $PATH etc

-- 
Repository URL: https://hg.python.org/cpython