From 64332d88e2d14386df7002b5a9d7207da5fdf7ed Mon Sep 17 00:00:00 2001 From: jnmclarty Date: Thu, 2 Jun 2016 19:01:48 -0400 Subject: [PATCH] Make file normalization test work on windows --- pycodestyle.py | 4 ++-- testsuite/test_util.py | 16 +++++++++++----- 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/pycodestyle.py b/pycodestyle.py index 70263968..75c9469e 100755 --- a/pycodestyle.py +++ b/pycodestyle.py @@ -1317,9 +1317,9 @@ def normalize_paths(value, parent=os.curdir): paths = [] for path in value.split(','): path = path.strip() - if '/' in path: + if os.path.sep in path: path = os.path.abspath(os.path.join(parent, path)) - paths.append(path.rstrip('/')) + paths.append(path.rstrip(os.path.sep)) return paths diff --git a/testsuite/test_util.py b/testsuite/test_util.py index 8eaba7ef..12f67dd9 100644 --- a/testsuite/test_util.py +++ b/testsuite/test_util.py @@ -2,7 +2,7 @@ # -*- coding: utf-8 -*- import os import unittest - +import sys from pycodestyle import normalize_paths @@ -17,7 +17,13 @@ def test_normalize_paths(self): self.assertEqual(normalize_paths('foo'), ['foo']) self.assertEqual(normalize_paths('foo,bar'), ['foo', 'bar']) self.assertEqual(normalize_paths('foo, bar '), ['foo', 'bar']) - self.assertEqual(normalize_paths('/foo/bar,baz/../bat'), - ['/foo/bar', cwd + '/bat']) - self.assertEqual(normalize_paths(".pyc,\n build/*"), - ['.pyc', cwd + '/build/*']) + + if 'win' in sys.platform: + self.assertEqual(normalize_paths(r'C:\foo\bar,baz\..\bat'), + [r'C:\foo\bar', cwd + r'\bat']) + self.assertEqual(normalize_paths(".pyc"), ['.pyc']) + else: + self.assertEqual(normalize_paths('/foo/bar,baz/../bat'), + ['/foo/bar', cwd + '/bat']) + self.assertEqual(normalize_paths(".pyc,\n build/*"), + ['.pyc', cwd + '/build/*'])