mirror of
https://github.com/PyCQA/flake8.git
synced 2026-03-30 10:46:54 +00:00
Merge branch 'windows-bugs' into 'master'
Check for both os.path.sep and os.path.altsep *Description of changes* When normalizing paths, we want to handle the following cases: - Someone is using a Windows-style path on Windows - Someone is using a Unix style path on Unix - Someone is using a Unix style path on Windows os.path.sep will handle the native directory separator character while os.path.altsep (when set) will handle alternate separators. Further, os.path.abspath does the right thing on Windows when handed a Unix-style path. *Related to:* #175 See merge request !81
This commit is contained in:
commit
698079f87a
2 changed files with 9 additions and 5 deletions
|
|
@ -5,4 +5,4 @@ install:
|
|||
build: off
|
||||
|
||||
test_script:
|
||||
- python -m tox
|
||||
- python -m tox -e py27,py33,py34,py35
|
||||
|
|
|
|||
|
|
@ -53,12 +53,16 @@ def normalize_path(path, parent=os.curdir):
|
|||
:rtype:
|
||||
str
|
||||
"""
|
||||
# NOTE(sigmavirus24): Using os.path.sep allows for Windows paths to
|
||||
# be specified and work appropriately.
|
||||
# NOTE(sigmavirus24): Using os.path.sep and os.path.altsep allow for
|
||||
# Windows compatibility with both Windows-style paths (c:\\foo\bar) and
|
||||
# Unix style paths (/foo/bar).
|
||||
separator = os.path.sep
|
||||
if separator in path:
|
||||
# NOTE(sigmavirus24): os.path.altsep may be None
|
||||
alternate_separator = os.path.altsep or ''
|
||||
if separator in path or (alternate_separator and
|
||||
alternate_separator in path):
|
||||
path = os.path.abspath(os.path.join(parent, path))
|
||||
return path.rstrip(separator)
|
||||
return path.rstrip(separator + alternate_separator)
|
||||
|
||||
|
||||
def stdin_get_value():
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue