summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorIan Cordasco <graffatcolmingov@gmail.com>2016-07-22 17:02:12 -0500
committerIan Cordasco <graffatcolmingov@gmail.com>2016-07-22 17:07:52 -0500
commit473106fee1ec4fcc9e2dde55c821effcd34e8a97 (patch)
treef58d046692aa34c6a898db317613da60b7694205 /src
parenta8753b3ff94bac4adb5763abb7f7f2d2fbc20b19 (diff)
downloadflake8-473106fee1ec4fcc9e2dde55c821effcd34e8a97.tar.gz
Check for both os.path.sep and os.path.altsep
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
Diffstat (limited to 'src')
-rw-r--r--src/flake8/utils.py11
1 files changed, 7 insertions, 4 deletions
diff --git a/src/flake8/utils.py b/src/flake8/utils.py
index 7f31f8f..f432dac 100644
--- a/src/flake8/utils.py
+++ b/src/flake8/utils.py
@@ -53,12 +53,15 @@ 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 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():