Skip to content

Commit 64332d8

Browse files
committed
Make file normalization test work on windows
1 parent fd4f1c2 commit 64332d8

File tree

2 files changed

+13
-7
lines changed

2 files changed

+13
-7
lines changed

pycodestyle.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -1317,9 +1317,9 @@ def normalize_paths(value, parent=os.curdir):
13171317
paths = []
13181318
for path in value.split(','):
13191319
path = path.strip()
1320-
if '/' in path:
1320+
if os.path.sep in path:
13211321
path = os.path.abspath(os.path.join(parent, path))
1322-
paths.append(path.rstrip('/'))
1322+
paths.append(path.rstrip(os.path.sep))
13231323
return paths
13241324

13251325

testsuite/test_util.py

+11-5
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# -*- coding: utf-8 -*-
33
import os
44
import unittest
5-
5+
import sys
66
from pycodestyle import normalize_paths
77

88

@@ -17,7 +17,13 @@ def test_normalize_paths(self):
1717
self.assertEqual(normalize_paths('foo'), ['foo'])
1818
self.assertEqual(normalize_paths('foo,bar'), ['foo', 'bar'])
1919
self.assertEqual(normalize_paths('foo, bar '), ['foo', 'bar'])
20-
self.assertEqual(normalize_paths('/foo/bar,baz/../bat'),
21-
['/foo/bar', cwd + '/bat'])
22-
self.assertEqual(normalize_paths(".pyc,\n build/*"),
23-
['.pyc', cwd + '/build/*'])
20+
21+
if 'win' in sys.platform:
22+
self.assertEqual(normalize_paths(r'C:\foo\bar,baz\..\bat'),
23+
[r'C:\foo\bar', cwd + r'\bat'])
24+
self.assertEqual(normalize_paths(".pyc"), ['.pyc'])
25+
else:
26+
self.assertEqual(normalize_paths('/foo/bar,baz/../bat'),
27+
['/foo/bar', cwd + '/bat'])
28+
self.assertEqual(normalize_paths(".pyc,\n build/*"),
29+
['.pyc', cwd + '/build/*'])

0 commit comments

Comments
 (0)