summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNed Deily <nad@python.org>2016-10-02 01:33:34 (GMT)
committerNed Deily <nad@python.org>2016-10-02 01:33:34 (GMT)
commit5dc2efda1511a70950aef90c2f8aa8776800ce80 (patch)
tree3670fff2837d775c077fe7ce5cad15d3931bc227
parent13cfae7c1aacbf3ffddbe30ab2b32aad34535ed3 (diff)
parentbf090e31ad702c8f4f5c4e9f9574d37f287421cc (diff)
downloadcpython-5dc2efda1511a70950aef90c2f8aa8776800ce80.zip
cpython-5dc2efda1511a70950aef90c2f8aa8776800ce80.tar.gz
cpython-5dc2efda1511a70950aef90c2f8aa8776800ce80.tar.bz2
Issue #28324: Merge from 3.6
-rw-r--r--Lib/os.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/Lib/os.py b/Lib/os.py
index 7379dad..3e5f8cf 100644
--- a/Lib/os.py
+++ b/Lib/os.py
@@ -4,9 +4,9 @@ This exports:
- 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