From 4a46412bf6007356775657e4f0bc452564dec2d1 Mon Sep 17 00:00:00 2001 From: Ian Cordasco Date: Fri, 22 Jul 2016 17:12:49 -0500 Subject: [PATCH] Check for alternate_separator only when truthy In the case where alternate separator is None, we use '' which will always be in any string. We want to skip that case. Also we only run our tests on AppVeyor, not all of our testenvs. --- .appveyor.yml | 2 +- src/flake8/utils.py | 3 ++- 2 files changed, 3 insertions(+), 2 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 f432dac..1e1eaa0 100644 --- a/src/flake8/utils.py +++ b/src/flake8/utils.py @@ -59,7 +59,8 @@ def normalize_path(path, parent=os.curdir): separator = os.path.sep # NOTE(sigmavirus24): os.path.altsep may be None alternate_separator = os.path.altsep or '' - if separator in path or alternate_separator in path: + 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 + alternate_separator)