diff options
| -rw-r--r-- | .appveyor.yml | 2 | ||||
| -rw-r--r-- | src/flake8/utils.py | 12 |
2 files changed, 9 insertions, 5 deletions
diff --git a/.appveyor.yml b/.appveyor.yml index 4a1d13c..ab4b7e2 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -5,4 +5,4 @@ install: build: off test_script: - - python -m tox + - python -m tox -e py27,py33,py34,py35 diff --git a/src/flake8/utils.py b/src/flake8/utils.py index 7f31f8f..1e1eaa0 100644 --- a/src/flake8/utils.py +++ b/src/flake8/utils.py @@ -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(): |