diff options
author | Serhiy Storchaka <storchaka@gmail.com> | 2018-01-07 15:54:31 (GMT) |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-01-07 15:54:31 (GMT) |
commit | 3460198f6ba40a839f105c381f07179aba1e8c61 (patch) | |
tree | 1b43b27d96931ebfd4c7f23758da932d42c0940e /Lib/ntpath.py | |
parent | e46a8af450210ee5c7f0459ad6beddbc626ae60f (diff) | |
download | cpython-3460198f6ba40a839f105c381f07179aba1e8c61.zip cpython-3460198f6ba40a839f105c381f07179aba1e8c61.tar.gz cpython-3460198f6ba40a839f105c381f07179aba1e8c61.tar.bz2 |
bpo-31802: Fix importing native path module before importing os. (#4017)
Diffstat (limited to 'Lib/ntpath.py')
-rw-r--r-- | Lib/ntpath.py | 23 |
1 files changed, 12 insertions, 11 deletions
diff --git a/Lib/ntpath.py b/Lib/ntpath.py index 10d3f2d..2182ec7 100644 --- a/Lib/ntpath.py +++ b/Lib/ntpath.py @@ -5,6 +5,18 @@ Instead of importing this module directly, import os and refer to this module as os.path. """ +# strings representing various path-related bits and pieces +# These are primarily for export; internally, they are hardcoded. +# Should be set before imports for resolving cyclic dependency. +curdir = '.' +pardir = '..' +extsep = '.' +sep = '\\' +pathsep = ';' +altsep = '/' +defpath = '.;C:\\bin' +devnull = 'nul' + import os import sys import stat @@ -19,17 +31,6 @@ __all__ = ["normcase","isabs","join","splitdrive","split","splitext", "extsep","devnull","realpath","supports_unicode_filenames","relpath", "samefile", "sameopenfile", "samestat", "commonpath"] -# strings representing various path-related bits and pieces -# These are primarily for export; internally, they are hardcoded. -curdir = '.' -pardir = '..' -extsep = '.' -sep = '\\' -pathsep = ';' -altsep = '/' -defpath = '.;C:\\bin' -devnull = 'nul' - def _get_bothseps(path): if isinstance(path, bytes): return b'\\/' |