Skip to content

Commit 8086522

Browse files
committed
Windows test fixes python#1
1 parent fb92f42 commit 8086522

File tree

2 files changed

+14
-14
lines changed

2 files changed

+14
-14
lines changed

Lib/test/test_nturl2path.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ def test_pathname2url(self):
7373
for url in urls:
7474
self.assertEqual(fn(nturl2path.url2pathname(url)), url)
7575

76-
def test_url2pathname_win(self):
76+
def test_url2pathname(self):
7777
fn = nturl2path.url2pathname
7878
self.assertEqual(fn('/C:/'), 'C:\\')
7979
self.assertEqual(fn("///C|"), 'C:')

Lib/test/test_urllib.py

+13-13
Original file line numberDiff line numberDiff line change
@@ -1523,26 +1523,26 @@ def test_quoting(self):
15231523
def test_pathname2url_win(self):
15241524
# Test special prefixes are correctly handled in pathname2url()
15251525
fn = urllib.request.pathname2url
1526-
self.assertEqual(fn('\\\\?\\C:\\dir'), '///C:/dir')
1527-
self.assertEqual(fn('\\\\?\\unc\\server\\share\\dir'), '/server/share/dir')
1526+
self.assertEqual(fn('\\\\?\\C:\\dir'), '//?/C:/dir')
1527+
self.assertEqual(fn('\\\\?\\unc\\server\\share\\dir'), '//?/unc/server/share/dir')
15281528
self.assertEqual(fn("C:"), '///C:')
1529-
self.assertEqual(fn("C:\\"), '///C:')
1529+
self.assertEqual(fn("C:\\"), '///C:/')
15301530
self.assertEqual(fn('C:\\a\\b.c'), '///C:/a/b.c')
15311531
self.assertEqual(fn('C:\\a\\b%#c'), '///C:/a/b%25%23c')
15321532
self.assertEqual(fn('C:\\a\\b\xe9'), '///C:/a/b%C3%A9')
15331533
self.assertEqual(fn('C:\\foo\\bar\\spam.foo'), "///C:/foo/bar/spam.foo")
15341534
# Long drive letter
1535-
self.assertRaises(IOError, fn, "XX:\\")
1535+
self.assertEqual(fn("XX:\\"), "file:XX:/")
15361536
# No drive letter
15371537
self.assertEqual(fn("\\folder\\test\\"), '/folder/test/')
1538-
self.assertEqual(fn("\\\\folder\\test\\"), '////folder/test/')
1539-
self.assertEqual(fn("\\\\\\folder\\test\\"), '/////folder/test/')
1540-
self.assertEqual(fn('\\\\some\\share\\'), '////some/share/')
1541-
self.assertEqual(fn('\\\\some\\share\\a\\b.c'), '////some/share/a/b.c')
1542-
self.assertEqual(fn('\\\\some\\share\\a\\b%#c\xe9'), '////some/share/a/b%25%23c%C3%A9')
1538+
self.assertEqual(fn("\\\\folder\\test\\"), '//folder/test/')
1539+
self.assertEqual(fn("\\\\\\folder\\test\\"), '///folder/test/')
1540+
self.assertEqual(fn('\\\\some\\share\\'), '//some/share/')
1541+
self.assertEqual(fn('\\\\some\\share\\a\\b.c'), '//some/share/a/b.c')
1542+
self.assertEqual(fn('\\\\some\\share\\a\\b%#c\xe9'), '//some/share/a/b%25%23c%C3%A9')
15431543
# Round-tripping
15441544
urls = ['///C:',
1545-
'/////folder/test/',
1545+
'//folder/test/',
15461546
'///C:/foo/bar/spam.foo']
15471547
for url in urls:
15481548
self.assertEqual(fn(urllib.request.url2pathname(url)), url)
@@ -1563,7 +1563,7 @@ def test_url2pathname_win(self):
15631563
self.assertEqual(fn("///C|"), 'C:')
15641564
self.assertEqual(fn("///C:"), 'C:')
15651565
self.assertEqual(fn('///C:/'), 'C:\\')
1566-
self.assertEqual(fn('/C|//'), 'C:\\')
1566+
self.assertEqual(fn('/C|//'), 'C:\\\\')
15671567
self.assertEqual(fn('///C|/path'), 'C:\\path')
15681568
# No DOS drive
15691569
self.assertEqual(fn("///C/test/"), '\\\\\\C\\test\\')
@@ -1575,7 +1575,7 @@ def test_url2pathname_win(self):
15751575
self.assertEqual(fn('///C|/path/to/file'), 'C:\\path\\to\\file')
15761576
self.assertEqual(fn("///C|/foo/bar/spam.foo"), 'C:\\foo\\bar\\spam.foo')
15771577
# Non-ASCII drive letter
1578-
self.assertRaises(IOError, fn, "///\u00e8|/")
1578+
self.assertEqual(fn("///\u00e8|/"), "\\\u00e8|\\")
15791579
# UNC paths
15801580
self.assertEqual(fn('//server/path/to/file'), '\\\\server\\path\\to\\file')
15811581
self.assertEqual(fn('////server/path/to/file'), '\\\\server\\path\\to\\file')
@@ -1585,7 +1585,7 @@ def test_url2pathname_win(self):
15851585
self.assertEqual(fn('//localhost/C|/path/to/file'), 'C:\\path\\to\\file')
15861586
# Round-tripping
15871587
paths = ['C:',
1588-
r'\\\C\test\\',
1588+
r'\C\test\\',
15891589
r'C:\foo\bar\spam.foo']
15901590
for path in paths:
15911591
self.assertEqual(fn(urllib.request.pathname2url(path)), path)

0 commit comments

Comments
 (0)