Mercurial > cpython-lru_cache-weakref
annotate Lib/test/test_ntpath.py @ 78069:a8aa77458e12 3.2
Add c_size_t and c_ssize_t to the ctypes summary table.
| author | Antoine Pitrou <solipsis@pitrou.net> |
|---|---|
| date | Thu, 12 Jul 2012 20:31:50 +0200 |
| parents | 3c9232a684ae |
| children | d42811b93357 |
| rev | line source |
|---|---|
| 10094 | 1 import ntpath |
|
13965
560175800a07
Test for fix to bug #110673: os.abspatth() now always returns os.getcwd() on Windows, if an empty path is specified. It previously did not if an empty path was delegated to win32api.GetFullPathName())
Mark Hammond <mhammond@skippinet.com.au>
parents:
10524
diff
changeset
|
2 import os |
|
64498
541338795950
Fix some errors that #7566 introduced on non-Windows platforms due to
Brian Curtin <brian.curtin@gmail.com>
parents:
64495
diff
changeset
|
3 import sys |
|
59615
b93cfafcdcad
Merged revisions 78093 via svnmerge from
Georg Brandl <georg@python.org>
parents:
59466
diff
changeset
|
4 from test.support import TestFailed |
|
59466
a2f1c15cae6c
Merged revisions 78734-78735 via svnmerge from
Florent Xicluna <florent.xicluna@gmail.com>
parents:
58473
diff
changeset
|
5 from test import support, test_genericpath |
|
64495
f6dfd6c563e1
Implement #7566 - os.path.sameopenfile for Windows.
Brian Curtin <brian.curtin@gmail.com>
parents:
63385
diff
changeset
|
6 from tempfile import TemporaryFile |
|
46115
1b6c0ff134fa
Merged revisions 61913,61915-61916,61918-61919,61922-61926,61928-61929,61931,61935,61938,61943 via svnmerge from
Christian Heimes <christian@cheimes.de>
parents:
44535
diff
changeset
|
7 import unittest |
| 10094 | 8 |
| 9 | |
| 10 def tester(fn, wantResult): | |
|
16517
eee67a84e5fa
String method conversion.
Eric S. Raymond <esr@thyrsus.com>
parents:
15305
diff
changeset
|
11 fn = fn.replace("\\", "\\\\") |
|
15305
07f24261c6e6
Make reindent.py happy (convert everything to 4-space indents!).
Fred Drake <fdrake@acm.org>
parents:
14132
diff
changeset
|
12 gotResult = eval(fn) |
|
07f24261c6e6
Make reindent.py happy (convert everything to 4-space indents!).
Fred Drake <fdrake@acm.org>
parents:
14132
diff
changeset
|
13 if wantResult != gotResult: |
|
46115
1b6c0ff134fa
Merged revisions 61913,61915-61916,61918-61919,61922-61926,61928-61929,61931,61935,61938,61943 via svnmerge from
Christian Heimes <christian@cheimes.de>
parents:
44535
diff
changeset
|
14 raise TestFailed("%s should return: %s but returned: %s" \ |
|
1b6c0ff134fa
Merged revisions 61913,61915-61916,61918-61919,61922-61926,61928-61929,61931,61935,61938,61943 via svnmerge from
Christian Heimes <christian@cheimes.de>
parents:
44535
diff
changeset
|
15 %(str(fn), str(wantResult), str(gotResult))) |
|
1b6c0ff134fa
Merged revisions 61913,61915-61916,61918-61919,61922-61926,61928-61929,61931,61935,61938,61943 via svnmerge from
Christian Heimes <christian@cheimes.de>
parents:
44535
diff
changeset
|
16 |
|
49410
ef4bb4d5dfde
Second part of #3187, for windows:
Amaury Forgeot d'Arc <amauryfa@gmail.com>
parents:
47201
diff
changeset
|
17 # then with bytes |
|
ef4bb4d5dfde
Second part of #3187, for windows:
Amaury Forgeot d'Arc <amauryfa@gmail.com>
parents:
47201
diff
changeset
|
18 fn = fn.replace("('", "(b'") |
|
ef4bb4d5dfde
Second part of #3187, for windows:
Amaury Forgeot d'Arc <amauryfa@gmail.com>
parents:
47201
diff
changeset
|
19 fn = fn.replace('("', '(b"') |
|
ef4bb4d5dfde
Second part of #3187, for windows:
Amaury Forgeot d'Arc <amauryfa@gmail.com>
parents:
47201
diff
changeset
|
20 fn = fn.replace("['", "[b'") |
|
ef4bb4d5dfde
Second part of #3187, for windows:
Amaury Forgeot d'Arc <amauryfa@gmail.com>
parents:
47201
diff
changeset
|
21 fn = fn.replace('["', '[b"') |
|
ef4bb4d5dfde
Second part of #3187, for windows:
Amaury Forgeot d'Arc <amauryfa@gmail.com>
parents:
47201
diff
changeset
|
22 fn = fn.replace(", '", ", b'") |
|
ef4bb4d5dfde
Second part of #3187, for windows:
Amaury Forgeot d'Arc <amauryfa@gmail.com>
parents:
47201
diff
changeset
|
23 fn = fn.replace(', "', ', b"') |
|
ef4bb4d5dfde
Second part of #3187, for windows:
Amaury Forgeot d'Arc <amauryfa@gmail.com>
parents:
47201
diff
changeset
|
24 gotResult = eval(fn) |
|
ef4bb4d5dfde
Second part of #3187, for windows:
Amaury Forgeot d'Arc <amauryfa@gmail.com>
parents:
47201
diff
changeset
|
25 if isinstance(wantResult, str): |
|
ef4bb4d5dfde
Second part of #3187, for windows:
Amaury Forgeot d'Arc <amauryfa@gmail.com>
parents:
47201
diff
changeset
|
26 wantResult = wantResult.encode('ascii') |
|
ef4bb4d5dfde
Second part of #3187, for windows:
Amaury Forgeot d'Arc <amauryfa@gmail.com>
parents:
47201
diff
changeset
|
27 elif isinstance(wantResult, tuple): |
|
ef4bb4d5dfde
Second part of #3187, for windows:
Amaury Forgeot d'Arc <amauryfa@gmail.com>
parents:
47201
diff
changeset
|
28 wantResult = tuple(r.encode('ascii') for r in wantResult) |
|
ef4bb4d5dfde
Second part of #3187, for windows:
Amaury Forgeot d'Arc <amauryfa@gmail.com>
parents:
47201
diff
changeset
|
29 |
|
ef4bb4d5dfde
Second part of #3187, for windows:
Amaury Forgeot d'Arc <amauryfa@gmail.com>
parents:
47201
diff
changeset
|
30 gotResult = eval(fn) |
|
ef4bb4d5dfde
Second part of #3187, for windows:
Amaury Forgeot d'Arc <amauryfa@gmail.com>
parents:
47201
diff
changeset
|
31 if wantResult != gotResult: |
|
ef4bb4d5dfde
Second part of #3187, for windows:
Amaury Forgeot d'Arc <amauryfa@gmail.com>
parents:
47201
diff
changeset
|
32 raise TestFailed("%s should return: %s but returned: %s" \ |
|
ef4bb4d5dfde
Second part of #3187, for windows:
Amaury Forgeot d'Arc <amauryfa@gmail.com>
parents:
47201
diff
changeset
|
33 %(str(fn), str(wantResult), repr(gotResult))) |
|
46115
1b6c0ff134fa
Merged revisions 61913,61915-61916,61918-61919,61922-61926,61928-61929,61931,61935,61938,61943 via svnmerge from
Christian Heimes <christian@cheimes.de>
parents:
44535
diff
changeset
|
34 |
|
53838
29025b530046
Issue #5799: ntpath (ie, os.path on Windows) fully supports UNC pathnames.
Mark Hammond <mhammond@skippinet.com.au>
parents:
53646
diff
changeset
|
35 |
|
46115
1b6c0ff134fa
Merged revisions 61913,61915-61916,61918-61919,61922-61926,61928-61929,61931,61935,61938,61943 via svnmerge from
Christian Heimes <christian@cheimes.de>
parents:
44535
diff
changeset
|
36 class TestNtpath(unittest.TestCase): |
|
1b6c0ff134fa
Merged revisions 61913,61915-61916,61918-61919,61922-61926,61928-61929,61931,61935,61938,61943 via svnmerge from
Christian Heimes <christian@cheimes.de>
parents:
44535
diff
changeset
|
37 def test_splitext(self): |
|
1b6c0ff134fa
Merged revisions 61913,61915-61916,61918-61919,61922-61926,61928-61929,61931,61935,61938,61943 via svnmerge from
Christian Heimes <christian@cheimes.de>
parents:
44535
diff
changeset
|
38 tester('ntpath.splitext("foo.ext")', ('foo', '.ext')) |
|
1b6c0ff134fa
Merged revisions 61913,61915-61916,61918-61919,61922-61926,61928-61929,61931,61935,61938,61943 via svnmerge from
Christian Heimes <christian@cheimes.de>
parents:
44535
diff
changeset
|
39 tester('ntpath.splitext("/foo/foo.ext")', ('/foo/foo', '.ext')) |
|
1b6c0ff134fa
Merged revisions 61913,61915-61916,61918-61919,61922-61926,61928-61929,61931,61935,61938,61943 via svnmerge from
Christian Heimes <christian@cheimes.de>
parents:
44535
diff
changeset
|
40 tester('ntpath.splitext(".ext")', ('.ext', '')) |
|
1b6c0ff134fa
Merged revisions 61913,61915-61916,61918-61919,61922-61926,61928-61929,61931,61935,61938,61943 via svnmerge from
Christian Heimes <christian@cheimes.de>
parents:
44535
diff
changeset
|
41 tester('ntpath.splitext("\\foo.ext\\foo")', ('\\foo.ext\\foo', '')) |
|
1b6c0ff134fa
Merged revisions 61913,61915-61916,61918-61919,61922-61926,61928-61929,61931,61935,61938,61943 via svnmerge from
Christian Heimes <christian@cheimes.de>
parents:
44535
diff
changeset
|
42 tester('ntpath.splitext("foo.ext\\")', ('foo.ext\\', '')) |
|
1b6c0ff134fa
Merged revisions 61913,61915-61916,61918-61919,61922-61926,61928-61929,61931,61935,61938,61943 via svnmerge from
Christian Heimes <christian@cheimes.de>
parents:
44535
diff
changeset
|
43 tester('ntpath.splitext("")', ('', '')) |
|
1b6c0ff134fa
Merged revisions 61913,61915-61916,61918-61919,61922-61926,61928-61929,61931,61935,61938,61943 via svnmerge from
Christian Heimes <christian@cheimes.de>
parents:
44535
diff
changeset
|
44 tester('ntpath.splitext("foo.bar.ext")', ('foo.bar', '.ext')) |
|
1b6c0ff134fa
Merged revisions 61913,61915-61916,61918-61919,61922-61926,61928-61929,61931,61935,61938,61943 via svnmerge from
Christian Heimes <christian@cheimes.de>
parents:
44535
diff
changeset
|
45 tester('ntpath.splitext("xx/foo.bar.ext")', ('xx/foo.bar', '.ext')) |
|
1b6c0ff134fa
Merged revisions 61913,61915-61916,61918-61919,61922-61926,61928-61929,61931,61935,61938,61943 via svnmerge from
Christian Heimes <christian@cheimes.de>
parents:
44535
diff
changeset
|
46 tester('ntpath.splitext("xx\\foo.bar.ext")', ('xx\\foo.bar', '.ext')) |
|
1b6c0ff134fa
Merged revisions 61913,61915-61916,61918-61919,61922-61926,61928-61929,61931,61935,61938,61943 via svnmerge from
Christian Heimes <christian@cheimes.de>
parents:
44535
diff
changeset
|
47 tester('ntpath.splitext("c:a/b\\c.d")', ('c:a/b\\c', '.d')) |
|
26791
58bd7100ee15
Whitespace normalization.
Tim Peters <tim.peters@gmail.com>
parents:
26627
diff
changeset
|
48 |
|
46115
1b6c0ff134fa
Merged revisions 61913,61915-61916,61918-61919,61922-61926,61928-61929,61931,61935,61938,61943 via svnmerge from
Christian Heimes <christian@cheimes.de>
parents:
44535
diff
changeset
|
49 def test_splitdrive(self): |
|
1b6c0ff134fa
Merged revisions 61913,61915-61916,61918-61919,61922-61926,61928-61929,61931,61935,61938,61943 via svnmerge from
Christian Heimes <christian@cheimes.de>
parents:
44535
diff
changeset
|
50 tester('ntpath.splitdrive("c:\\foo\\bar")', |
|
1b6c0ff134fa
Merged revisions 61913,61915-61916,61918-61919,61922-61926,61928-61929,61931,61935,61938,61943 via svnmerge from
Christian Heimes <christian@cheimes.de>
parents:
44535
diff
changeset
|
51 ('c:', '\\foo\\bar')) |
|
1b6c0ff134fa
Merged revisions 61913,61915-61916,61918-61919,61922-61926,61928-61929,61931,61935,61938,61943 via svnmerge from
Christian Heimes <christian@cheimes.de>
parents:
44535
diff
changeset
|
52 tester('ntpath.splitdrive("c:/foo/bar")', |
|
1b6c0ff134fa
Merged revisions 61913,61915-61916,61918-61919,61922-61926,61928-61929,61931,61935,61938,61943 via svnmerge from
Christian Heimes <christian@cheimes.de>
parents:
44535
diff
changeset
|
53 ('c:', '/foo/bar')) |
|
53838
29025b530046
Issue #5799: ntpath (ie, os.path on Windows) fully supports UNC pathnames.
Mark Hammond <mhammond@skippinet.com.au>
parents:
53646
diff
changeset
|
54 tester('ntpath.splitdrive("\\\\conky\\mountpoint\\foo\\bar")', |
|
46115
1b6c0ff134fa
Merged revisions 61913,61915-61916,61918-61919,61922-61926,61928-61929,61931,61935,61938,61943 via svnmerge from
Christian Heimes <christian@cheimes.de>
parents:
44535
diff
changeset
|
55 ('\\\\conky\\mountpoint', '\\foo\\bar')) |
|
53838
29025b530046
Issue #5799: ntpath (ie, os.path on Windows) fully supports UNC pathnames.
Mark Hammond <mhammond@skippinet.com.au>
parents:
53646
diff
changeset
|
56 tester('ntpath.splitdrive("//conky/mountpoint/foo/bar")', |
|
46115
1b6c0ff134fa
Merged revisions 61913,61915-61916,61918-61919,61922-61926,61928-61929,61931,61935,61938,61943 via svnmerge from
Christian Heimes <christian@cheimes.de>
parents:
44535
diff
changeset
|
57 ('//conky/mountpoint', '/foo/bar')) |
|
53838
29025b530046
Issue #5799: ntpath (ie, os.path on Windows) fully supports UNC pathnames.
Mark Hammond <mhammond@skippinet.com.au>
parents:
53646
diff
changeset
|
58 tester('ntpath.splitdrive("\\\\\\conky\\mountpoint\\foo\\bar")', |
|
29025b530046
Issue #5799: ntpath (ie, os.path on Windows) fully supports UNC pathnames.
Mark Hammond <mhammond@skippinet.com.au>
parents:
53646
diff
changeset
|
59 ('', '\\\\\\conky\\mountpoint\\foo\\bar')) |
|
29025b530046
Issue #5799: ntpath (ie, os.path on Windows) fully supports UNC pathnames.
Mark Hammond <mhammond@skippinet.com.au>
parents:
53646
diff
changeset
|
60 tester('ntpath.splitdrive("///conky/mountpoint/foo/bar")', |
|
29025b530046
Issue #5799: ntpath (ie, os.path on Windows) fully supports UNC pathnames.
Mark Hammond <mhammond@skippinet.com.au>
parents:
53646
diff
changeset
|
61 ('', '///conky/mountpoint/foo/bar')) |
|
29025b530046
Issue #5799: ntpath (ie, os.path on Windows) fully supports UNC pathnames.
Mark Hammond <mhammond@skippinet.com.au>
parents:
53646
diff
changeset
|
62 tester('ntpath.splitdrive("\\\\conky\\\\mountpoint\\foo\\bar")', |
|
29025b530046
Issue #5799: ntpath (ie, os.path on Windows) fully supports UNC pathnames.
Mark Hammond <mhammond@skippinet.com.au>
parents:
53646
diff
changeset
|
63 ('', '\\\\conky\\\\mountpoint\\foo\\bar')) |
|
29025b530046
Issue #5799: ntpath (ie, os.path on Windows) fully supports UNC pathnames.
Mark Hammond <mhammond@skippinet.com.au>
parents:
53646
diff
changeset
|
64 tester('ntpath.splitdrive("//conky//mountpoint/foo/bar")', |
|
29025b530046
Issue #5799: ntpath (ie, os.path on Windows) fully supports UNC pathnames.
Mark Hammond <mhammond@skippinet.com.au>
parents:
53646
diff
changeset
|
65 ('', '//conky//mountpoint/foo/bar')) |
| 10094 | 66 |
|
46115
1b6c0ff134fa
Merged revisions 61913,61915-61916,61918-61919,61922-61926,61928-61929,61931,61935,61938,61943 via svnmerge from
Christian Heimes <christian@cheimes.de>
parents:
44535
diff
changeset
|
67 def test_split(self): |
|
1b6c0ff134fa
Merged revisions 61913,61915-61916,61918-61919,61922-61926,61928-61929,61931,61935,61938,61943 via svnmerge from
Christian Heimes <christian@cheimes.de>
parents:
44535
diff
changeset
|
68 tester('ntpath.split("c:\\foo\\bar")', ('c:\\foo', 'bar')) |
|
1b6c0ff134fa
Merged revisions 61913,61915-61916,61918-61919,61922-61926,61928-61929,61931,61935,61938,61943 via svnmerge from
Christian Heimes <christian@cheimes.de>
parents:
44535
diff
changeset
|
69 tester('ntpath.split("\\\\conky\\mountpoint\\foo\\bar")', |
|
1b6c0ff134fa
Merged revisions 61913,61915-61916,61918-61919,61922-61926,61928-61929,61931,61935,61938,61943 via svnmerge from
Christian Heimes <christian@cheimes.de>
parents:
44535
diff
changeset
|
70 ('\\\\conky\\mountpoint\\foo', 'bar')) |
| 10094 | 71 |
|
46115
1b6c0ff134fa
Merged revisions 61913,61915-61916,61918-61919,61922-61926,61928-61929,61931,61935,61938,61943 via svnmerge from
Christian Heimes <christian@cheimes.de>
parents:
44535
diff
changeset
|
72 tester('ntpath.split("c:\\")', ('c:\\', '')) |
|
1b6c0ff134fa
Merged revisions 61913,61915-61916,61918-61919,61922-61926,61928-61929,61931,61935,61938,61943 via svnmerge from
Christian Heimes <christian@cheimes.de>
parents:
44535
diff
changeset
|
73 tester('ntpath.split("\\\\conky\\mountpoint\\")', |
|
53838
29025b530046
Issue #5799: ntpath (ie, os.path on Windows) fully supports UNC pathnames.
Mark Hammond <mhammond@skippinet.com.au>
parents:
53646
diff
changeset
|
74 ('\\\\conky\\mountpoint\\', '')) |
| 10094 | 75 |
|
46115
1b6c0ff134fa
Merged revisions 61913,61915-61916,61918-61919,61922-61926,61928-61929,61931,61935,61938,61943 via svnmerge from
Christian Heimes <christian@cheimes.de>
parents:
44535
diff
changeset
|
76 tester('ntpath.split("c:/")', ('c:/', '')) |
|
53838
29025b530046
Issue #5799: ntpath (ie, os.path on Windows) fully supports UNC pathnames.
Mark Hammond <mhammond@skippinet.com.au>
parents:
53646
diff
changeset
|
77 tester('ntpath.split("//conky/mountpoint/")', ('//conky/mountpoint/', '')) |
| 10094 | 78 |
|
46115
1b6c0ff134fa
Merged revisions 61913,61915-61916,61918-61919,61922-61926,61928-61929,61931,61935,61938,61943 via svnmerge from
Christian Heimes <christian@cheimes.de>
parents:
44535
diff
changeset
|
79 def test_isabs(self): |
|
1b6c0ff134fa
Merged revisions 61913,61915-61916,61918-61919,61922-61926,61928-61929,61931,61935,61938,61943 via svnmerge from
Christian Heimes <christian@cheimes.de>
parents:
44535
diff
changeset
|
80 tester('ntpath.isabs("c:\\")', 1) |
|
1b6c0ff134fa
Merged revisions 61913,61915-61916,61918-61919,61922-61926,61928-61929,61931,61935,61938,61943 via svnmerge from
Christian Heimes <christian@cheimes.de>
parents:
44535
diff
changeset
|
81 tester('ntpath.isabs("\\\\conky\\mountpoint\\")', 1) |
|
1b6c0ff134fa
Merged revisions 61913,61915-61916,61918-61919,61922-61926,61928-61929,61931,61935,61938,61943 via svnmerge from
Christian Heimes <christian@cheimes.de>
parents:
44535
diff
changeset
|
82 tester('ntpath.isabs("\\foo")', 1) |
|
1b6c0ff134fa
Merged revisions 61913,61915-61916,61918-61919,61922-61926,61928-61929,61931,61935,61938,61943 via svnmerge from
Christian Heimes <christian@cheimes.de>
parents:
44535
diff
changeset
|
83 tester('ntpath.isabs("\\foo\\bar")', 1) |
| 10094 | 84 |
|
46115
1b6c0ff134fa
Merged revisions 61913,61915-61916,61918-61919,61922-61926,61928-61929,61931,61935,61938,61943 via svnmerge from
Christian Heimes <christian@cheimes.de>
parents:
44535
diff
changeset
|
85 def test_commonprefix(self): |
|
1b6c0ff134fa
Merged revisions 61913,61915-61916,61918-61919,61922-61926,61928-61929,61931,61935,61938,61943 via svnmerge from
Christian Heimes <christian@cheimes.de>
parents:
44535
diff
changeset
|
86 tester('ntpath.commonprefix(["/home/swenson/spam", "/home/swen/spam"])', |
|
1b6c0ff134fa
Merged revisions 61913,61915-61916,61918-61919,61922-61926,61928-61929,61931,61935,61938,61943 via svnmerge from
Christian Heimes <christian@cheimes.de>
parents:
44535
diff
changeset
|
87 "/home/swen") |
|
1b6c0ff134fa
Merged revisions 61913,61915-61916,61918-61919,61922-61926,61928-61929,61931,61935,61938,61943 via svnmerge from
Christian Heimes <christian@cheimes.de>
parents:
44535
diff
changeset
|
88 tester('ntpath.commonprefix(["\\home\\swen\\spam", "\\home\\swen\\eggs"])', |
|
1b6c0ff134fa
Merged revisions 61913,61915-61916,61918-61919,61922-61926,61928-61929,61931,61935,61938,61943 via svnmerge from
Christian Heimes <christian@cheimes.de>
parents:
44535
diff
changeset
|
89 "\\home\\swen\\") |
|
1b6c0ff134fa
Merged revisions 61913,61915-61916,61918-61919,61922-61926,61928-61929,61931,61935,61938,61943 via svnmerge from
Christian Heimes <christian@cheimes.de>
parents:
44535
diff
changeset
|
90 tester('ntpath.commonprefix(["/home/swen/spam", "/home/swen/spam"])', |
|
1b6c0ff134fa
Merged revisions 61913,61915-61916,61918-61919,61922-61926,61928-61929,61931,61935,61938,61943 via svnmerge from
Christian Heimes <christian@cheimes.de>
parents:
44535
diff
changeset
|
91 "/home/swen/spam") |
|
13965
560175800a07
Test for fix to bug #110673: os.abspatth() now always returns os.getcwd() on Windows, if an empty path is specified. It previously did not if an empty path was delegated to win32api.GetFullPathName())
Mark Hammond <mhammond@skippinet.com.au>
parents:
10524
diff
changeset
|
92 |
|
46115
1b6c0ff134fa
Merged revisions 61913,61915-61916,61918-61919,61922-61926,61928-61929,61931,61935,61938,61943 via svnmerge from
Christian Heimes <christian@cheimes.de>
parents:
44535
diff
changeset
|
93 def test_join(self): |
|
1b6c0ff134fa
Merged revisions 61913,61915-61916,61918-61919,61922-61926,61928-61929,61931,61935,61938,61943 via svnmerge from
Christian Heimes <christian@cheimes.de>
parents:
44535
diff
changeset
|
94 tester('ntpath.join("")', '') |
|
1b6c0ff134fa
Merged revisions 61913,61915-61916,61918-61919,61922-61926,61928-61929,61931,61935,61938,61943 via svnmerge from
Christian Heimes <christian@cheimes.de>
parents:
44535
diff
changeset
|
95 tester('ntpath.join("", "", "")', '') |
|
1b6c0ff134fa
Merged revisions 61913,61915-61916,61918-61919,61922-61926,61928-61929,61931,61935,61938,61943 via svnmerge from
Christian Heimes <christian@cheimes.de>
parents:
44535
diff
changeset
|
96 tester('ntpath.join("a")', 'a') |
|
1b6c0ff134fa
Merged revisions 61913,61915-61916,61918-61919,61922-61926,61928-61929,61931,61935,61938,61943 via svnmerge from
Christian Heimes <christian@cheimes.de>
parents:
44535
diff
changeset
|
97 tester('ntpath.join("/a")', '/a') |
|
1b6c0ff134fa
Merged revisions 61913,61915-61916,61918-61919,61922-61926,61928-61929,61931,61935,61938,61943 via svnmerge from
Christian Heimes <christian@cheimes.de>
parents:
44535
diff
changeset
|
98 tester('ntpath.join("\\a")', '\\a') |
|
1b6c0ff134fa
Merged revisions 61913,61915-61916,61918-61919,61922-61926,61928-61929,61931,61935,61938,61943 via svnmerge from
Christian Heimes <christian@cheimes.de>
parents:
44535
diff
changeset
|
99 tester('ntpath.join("a:")', 'a:') |
|
1b6c0ff134fa
Merged revisions 61913,61915-61916,61918-61919,61922-61926,61928-61929,61931,61935,61938,61943 via svnmerge from
Christian Heimes <christian@cheimes.de>
parents:
44535
diff
changeset
|
100 tester('ntpath.join("a:", "b")', 'a:b') |
|
1b6c0ff134fa
Merged revisions 61913,61915-61916,61918-61919,61922-61926,61928-61929,61931,61935,61938,61943 via svnmerge from
Christian Heimes <christian@cheimes.de>
parents:
44535
diff
changeset
|
101 tester('ntpath.join("a:", "/b")', 'a:/b') |
|
1b6c0ff134fa
Merged revisions 61913,61915-61916,61918-61919,61922-61926,61928-61929,61931,61935,61938,61943 via svnmerge from
Christian Heimes <christian@cheimes.de>
parents:
44535
diff
changeset
|
102 tester('ntpath.join("a:", "\\b")', 'a:\\b') |
|
1b6c0ff134fa
Merged revisions 61913,61915-61916,61918-61919,61922-61926,61928-61929,61931,61935,61938,61943 via svnmerge from
Christian Heimes <christian@cheimes.de>
parents:
44535
diff
changeset
|
103 tester('ntpath.join("a", "/b")', '/b') |
|
1b6c0ff134fa
Merged revisions 61913,61915-61916,61918-61919,61922-61926,61928-61929,61931,61935,61938,61943 via svnmerge from
Christian Heimes <christian@cheimes.de>
parents:
44535
diff
changeset
|
104 tester('ntpath.join("a", "\\b")', '\\b') |
|
1b6c0ff134fa
Merged revisions 61913,61915-61916,61918-61919,61922-61926,61928-61929,61931,61935,61938,61943 via svnmerge from
Christian Heimes <christian@cheimes.de>
parents:
44535
diff
changeset
|
105 tester('ntpath.join("a", "b", "c")', 'a\\b\\c') |
|
1b6c0ff134fa
Merged revisions 61913,61915-61916,61918-61919,61922-61926,61928-61929,61931,61935,61938,61943 via svnmerge from
Christian Heimes <christian@cheimes.de>
parents:
44535
diff
changeset
|
106 tester('ntpath.join("a\\", "b", "c")', 'a\\b\\c') |
|
1b6c0ff134fa
Merged revisions 61913,61915-61916,61918-61919,61922-61926,61928-61929,61931,61935,61938,61943 via svnmerge from
Christian Heimes <christian@cheimes.de>
parents:
44535
diff
changeset
|
107 tester('ntpath.join("a", "b\\", "c")', 'a\\b\\c') |
|
1b6c0ff134fa
Merged revisions 61913,61915-61916,61918-61919,61922-61926,61928-61929,61931,61935,61938,61943 via svnmerge from
Christian Heimes <christian@cheimes.de>
parents:
44535
diff
changeset
|
108 tester('ntpath.join("a", "b", "\\c")', '\\c') |
|
1b6c0ff134fa
Merged revisions 61913,61915-61916,61918-61919,61922-61926,61928-61929,61931,61935,61938,61943 via svnmerge from
Christian Heimes <christian@cheimes.de>
parents:
44535
diff
changeset
|
109 tester('ntpath.join("d:\\", "\\pleep")', 'd:\\pleep') |
|
1b6c0ff134fa
Merged revisions 61913,61915-61916,61918-61919,61922-61926,61928-61929,61931,61935,61938,61943 via svnmerge from
Christian Heimes <christian@cheimes.de>
parents:
44535
diff
changeset
|
110 tester('ntpath.join("d:\\", "a", "b")', 'd:\\a\\b') |
|
1b6c0ff134fa
Merged revisions 61913,61915-61916,61918-61919,61922-61926,61928-61929,61931,61935,61938,61943 via svnmerge from
Christian Heimes <christian@cheimes.de>
parents:
44535
diff
changeset
|
111 tester("ntpath.join('c:', '/a')", 'c:/a') |
|
1b6c0ff134fa
Merged revisions 61913,61915-61916,61918-61919,61922-61926,61928-61929,61931,61935,61938,61943 via svnmerge from
Christian Heimes <christian@cheimes.de>
parents:
44535
diff
changeset
|
112 tester("ntpath.join('c:/', '/a')", 'c:/a') |
|
1b6c0ff134fa
Merged revisions 61913,61915-61916,61918-61919,61922-61926,61928-61929,61931,61935,61938,61943 via svnmerge from
Christian Heimes <christian@cheimes.de>
parents:
44535
diff
changeset
|
113 tester("ntpath.join('c:/a', '/b')", '/b') |
|
1b6c0ff134fa
Merged revisions 61913,61915-61916,61918-61919,61922-61926,61928-61929,61931,61935,61938,61943 via svnmerge from
Christian Heimes <christian@cheimes.de>
parents:
44535
diff
changeset
|
114 tester("ntpath.join('c:', 'd:/')", 'd:/') |
|
1b6c0ff134fa
Merged revisions 61913,61915-61916,61918-61919,61922-61926,61928-61929,61931,61935,61938,61943 via svnmerge from
Christian Heimes <christian@cheimes.de>
parents:
44535
diff
changeset
|
115 tester("ntpath.join('c:/', 'd:/')", 'd:/') |
|
1b6c0ff134fa
Merged revisions 61913,61915-61916,61918-61919,61922-61926,61928-61929,61931,61935,61938,61943 via svnmerge from
Christian Heimes <christian@cheimes.de>
parents:
44535
diff
changeset
|
116 tester("ntpath.join('c:/', 'd:/a/b')", 'd:/a/b') |
|
18745
276bf596e8d1
Add some test cases for ntpath.join().
Tim Peters <tim.peters@gmail.com>
parents:
18744
diff
changeset
|
117 |
|
46115
1b6c0ff134fa
Merged revisions 61913,61915-61916,61918-61919,61922-61926,61928-61929,61931,61935,61938,61943 via svnmerge from
Christian Heimes <christian@cheimes.de>
parents:
44535
diff
changeset
|
118 tester("ntpath.join('')", '') |
|
1b6c0ff134fa
Merged revisions 61913,61915-61916,61918-61919,61922-61926,61928-61929,61931,61935,61938,61943 via svnmerge from
Christian Heimes <christian@cheimes.de>
parents:
44535
diff
changeset
|
119 tester("ntpath.join('', '', '', '', '')", '') |
|
1b6c0ff134fa
Merged revisions 61913,61915-61916,61918-61919,61922-61926,61928-61929,61931,61935,61938,61943 via svnmerge from
Christian Heimes <christian@cheimes.de>
parents:
44535
diff
changeset
|
120 tester("ntpath.join('a')", 'a') |
|
1b6c0ff134fa
Merged revisions 61913,61915-61916,61918-61919,61922-61926,61928-61929,61931,61935,61938,61943 via svnmerge from
Christian Heimes <christian@cheimes.de>
parents:
44535
diff
changeset
|
121 tester("ntpath.join('', 'a')", 'a') |
|
1b6c0ff134fa
Merged revisions 61913,61915-61916,61918-61919,61922-61926,61928-61929,61931,61935,61938,61943 via svnmerge from
Christian Heimes <christian@cheimes.de>
parents:
44535
diff
changeset
|
122 tester("ntpath.join('', '', '', '', 'a')", 'a') |
|
1b6c0ff134fa
Merged revisions 61913,61915-61916,61918-61919,61922-61926,61928-61929,61931,61935,61938,61943 via svnmerge from
Christian Heimes <christian@cheimes.de>
parents:
44535
diff
changeset
|
123 tester("ntpath.join('a', '')", 'a\\') |
|
1b6c0ff134fa
Merged revisions 61913,61915-61916,61918-61919,61922-61926,61928-61929,61931,61935,61938,61943 via svnmerge from
Christian Heimes <christian@cheimes.de>
parents:
44535
diff
changeset
|
124 tester("ntpath.join('a', '', '', '', '')", 'a\\') |
|
1b6c0ff134fa
Merged revisions 61913,61915-61916,61918-61919,61922-61926,61928-61929,61931,61935,61938,61943 via svnmerge from
Christian Heimes <christian@cheimes.de>
parents:
44535
diff
changeset
|
125 tester("ntpath.join('a\\', '')", 'a\\') |
|
1b6c0ff134fa
Merged revisions 61913,61915-61916,61918-61919,61922-61926,61928-61929,61931,61935,61938,61943 via svnmerge from
Christian Heimes <christian@cheimes.de>
parents:
44535
diff
changeset
|
126 tester("ntpath.join('a\\', '', '', '', '')", 'a\\') |
|
20887
0c17515b05db
SF bug 478425: Change in os.path.join (ntpath.py)
Tim Peters <tim.peters@gmail.com>
parents:
19628
diff
changeset
|
127 |
|
53838
29025b530046
Issue #5799: ntpath (ie, os.path on Windows) fully supports UNC pathnames.
Mark Hammond <mhammond@skippinet.com.au>
parents:
53646
diff
changeset
|
128 # from comment in ntpath.join |
|
29025b530046
Issue #5799: ntpath (ie, os.path on Windows) fully supports UNC pathnames.
Mark Hammond <mhammond@skippinet.com.au>
parents:
53646
diff
changeset
|
129 tester("ntpath.join('c:', '/a')", 'c:/a') |
|
29025b530046
Issue #5799: ntpath (ie, os.path on Windows) fully supports UNC pathnames.
Mark Hammond <mhammond@skippinet.com.au>
parents:
53646
diff
changeset
|
130 tester("ntpath.join('//computer/share', '/a')", '//computer/share/a') |
|
29025b530046
Issue #5799: ntpath (ie, os.path on Windows) fully supports UNC pathnames.
Mark Hammond <mhammond@skippinet.com.au>
parents:
53646
diff
changeset
|
131 tester("ntpath.join('c:/', '/a')", 'c:/a') |
|
29025b530046
Issue #5799: ntpath (ie, os.path on Windows) fully supports UNC pathnames.
Mark Hammond <mhammond@skippinet.com.au>
parents:
53646
diff
changeset
|
132 tester("ntpath.join('//computer/share/', '/a')", '//computer/share/a') |
|
29025b530046
Issue #5799: ntpath (ie, os.path on Windows) fully supports UNC pathnames.
Mark Hammond <mhammond@skippinet.com.au>
parents:
53646
diff
changeset
|
133 tester("ntpath.join('c:/a', '/b')", '/b') |
|
29025b530046
Issue #5799: ntpath (ie, os.path on Windows) fully supports UNC pathnames.
Mark Hammond <mhammond@skippinet.com.au>
parents:
53646
diff
changeset
|
134 tester("ntpath.join('//computer/share/a', '/b')", '/b') |
|
29025b530046
Issue #5799: ntpath (ie, os.path on Windows) fully supports UNC pathnames.
Mark Hammond <mhammond@skippinet.com.au>
parents:
53646
diff
changeset
|
135 tester("ntpath.join('c:', 'd:/')", 'd:/') |
|
29025b530046
Issue #5799: ntpath (ie, os.path on Windows) fully supports UNC pathnames.
Mark Hammond <mhammond@skippinet.com.au>
parents:
53646
diff
changeset
|
136 tester("ntpath.join('c:', '//computer/share/')", '//computer/share/') |
|
29025b530046
Issue #5799: ntpath (ie, os.path on Windows) fully supports UNC pathnames.
Mark Hammond <mhammond@skippinet.com.au>
parents:
53646
diff
changeset
|
137 tester("ntpath.join('//computer/share', 'd:/')", 'd:/') |
|
29025b530046
Issue #5799: ntpath (ie, os.path on Windows) fully supports UNC pathnames.
Mark Hammond <mhammond@skippinet.com.au>
parents:
53646
diff
changeset
|
138 tester("ntpath.join('//computer/share', '//computer/share/')", '//computer/share/') |
|
29025b530046
Issue #5799: ntpath (ie, os.path on Windows) fully supports UNC pathnames.
Mark Hammond <mhammond@skippinet.com.au>
parents:
53646
diff
changeset
|
139 tester("ntpath.join('c:/', 'd:/')", 'd:/') |
|
29025b530046
Issue #5799: ntpath (ie, os.path on Windows) fully supports UNC pathnames.
Mark Hammond <mhammond@skippinet.com.au>
parents:
53646
diff
changeset
|
140 tester("ntpath.join('c:/', '//computer/share/')", '//computer/share/') |
|
29025b530046
Issue #5799: ntpath (ie, os.path on Windows) fully supports UNC pathnames.
Mark Hammond <mhammond@skippinet.com.au>
parents:
53646
diff
changeset
|
141 tester("ntpath.join('//computer/share/', 'd:/')", 'd:/') |
|
29025b530046
Issue #5799: ntpath (ie, os.path on Windows) fully supports UNC pathnames.
Mark Hammond <mhammond@skippinet.com.au>
parents:
53646
diff
changeset
|
142 tester("ntpath.join('//computer/share/', '//computer/share/')", '//computer/share/') |
|
29025b530046
Issue #5799: ntpath (ie, os.path on Windows) fully supports UNC pathnames.
Mark Hammond <mhammond@skippinet.com.au>
parents:
53646
diff
changeset
|
143 |
|
29025b530046
Issue #5799: ntpath (ie, os.path on Windows) fully supports UNC pathnames.
Mark Hammond <mhammond@skippinet.com.au>
parents:
53646
diff
changeset
|
144 tester("ntpath.join('c:', '//computer/share/')", '//computer/share/') |
|
29025b530046
Issue #5799: ntpath (ie, os.path on Windows) fully supports UNC pathnames.
Mark Hammond <mhammond@skippinet.com.au>
parents:
53646
diff
changeset
|
145 tester("ntpath.join('c:/', '//computer/share/')", '//computer/share/') |
|
29025b530046
Issue #5799: ntpath (ie, os.path on Windows) fully supports UNC pathnames.
Mark Hammond <mhammond@skippinet.com.au>
parents:
53646
diff
changeset
|
146 tester("ntpath.join('c:/', '//computer/share/a/b')", '//computer/share/a/b') |
|
29025b530046
Issue #5799: ntpath (ie, os.path on Windows) fully supports UNC pathnames.
Mark Hammond <mhammond@skippinet.com.au>
parents:
53646
diff
changeset
|
147 |
|
29025b530046
Issue #5799: ntpath (ie, os.path on Windows) fully supports UNC pathnames.
Mark Hammond <mhammond@skippinet.com.au>
parents:
53646
diff
changeset
|
148 tester("ntpath.join('\\\\computer\\share\\', 'a', 'b')", '\\\\computer\\share\\a\\b') |
|
29025b530046
Issue #5799: ntpath (ie, os.path on Windows) fully supports UNC pathnames.
Mark Hammond <mhammond@skippinet.com.au>
parents:
53646
diff
changeset
|
149 tester("ntpath.join('\\\\computer\\share', 'a', 'b')", '\\\\computer\\share\\a\\b') |
|
29025b530046
Issue #5799: ntpath (ie, os.path on Windows) fully supports UNC pathnames.
Mark Hammond <mhammond@skippinet.com.au>
parents:
53646
diff
changeset
|
150 tester("ntpath.join('\\\\computer\\share', 'a\\b')", '\\\\computer\\share\\a\\b') |
|
29025b530046
Issue #5799: ntpath (ie, os.path on Windows) fully supports UNC pathnames.
Mark Hammond <mhammond@skippinet.com.au>
parents:
53646
diff
changeset
|
151 tester("ntpath.join('//computer/share/', 'a', 'b')", '//computer/share/a\\b') |
|
29025b530046
Issue #5799: ntpath (ie, os.path on Windows) fully supports UNC pathnames.
Mark Hammond <mhammond@skippinet.com.au>
parents:
53646
diff
changeset
|
152 tester("ntpath.join('//computer/share', 'a', 'b')", '//computer/share\\a\\b') |
|
29025b530046
Issue #5799: ntpath (ie, os.path on Windows) fully supports UNC pathnames.
Mark Hammond <mhammond@skippinet.com.au>
parents:
53646
diff
changeset
|
153 tester("ntpath.join('//computer/share', 'a/b')", '//computer/share\\a/b') |
|
29025b530046
Issue #5799: ntpath (ie, os.path on Windows) fully supports UNC pathnames.
Mark Hammond <mhammond@skippinet.com.au>
parents:
53646
diff
changeset
|
154 |
|
46115
1b6c0ff134fa
Merged revisions 61913,61915-61916,61918-61919,61922-61926,61928-61929,61931,61935,61938,61943 via svnmerge from
Christian Heimes <christian@cheimes.de>
parents:
44535
diff
changeset
|
155 def test_normpath(self): |
|
1b6c0ff134fa
Merged revisions 61913,61915-61916,61918-61919,61922-61926,61928-61929,61931,61935,61938,61943 via svnmerge from
Christian Heimes <christian@cheimes.de>
parents:
44535
diff
changeset
|
156 tester("ntpath.normpath('A//////././//.//B')", r'A\B') |
|
1b6c0ff134fa
Merged revisions 61913,61915-61916,61918-61919,61922-61926,61928-61929,61931,61935,61938,61943 via svnmerge from
Christian Heimes <christian@cheimes.de>
parents:
44535
diff
changeset
|
157 tester("ntpath.normpath('A/./B')", r'A\B') |
|
1b6c0ff134fa
Merged revisions 61913,61915-61916,61918-61919,61922-61926,61928-61929,61931,61935,61938,61943 via svnmerge from
Christian Heimes <christian@cheimes.de>
parents:
44535
diff
changeset
|
158 tester("ntpath.normpath('A/foo/../B')", r'A\B') |
|
1b6c0ff134fa
Merged revisions 61913,61915-61916,61918-61919,61922-61926,61928-61929,61931,61935,61938,61943 via svnmerge from
Christian Heimes <christian@cheimes.de>
parents:
44535
diff
changeset
|
159 tester("ntpath.normpath('C:A//B')", r'C:A\B') |
|
1b6c0ff134fa
Merged revisions 61913,61915-61916,61918-61919,61922-61926,61928-61929,61931,61935,61938,61943 via svnmerge from
Christian Heimes <christian@cheimes.de>
parents:
44535
diff
changeset
|
160 tester("ntpath.normpath('D:A/./B')", r'D:A\B') |
|
1b6c0ff134fa
Merged revisions 61913,61915-61916,61918-61919,61922-61926,61928-61929,61931,61935,61938,61943 via svnmerge from
Christian Heimes <christian@cheimes.de>
parents:
44535
diff
changeset
|
161 tester("ntpath.normpath('e:A/foo/../B')", r'e:A\B') |
|
19628
ef2cf9943acd
SF bug #456621: normpath on Win32 not collapsing c:\\..
Tim Peters <tim.peters@gmail.com>
parents:
18847
diff
changeset
|
162 |
|
46115
1b6c0ff134fa
Merged revisions 61913,61915-61916,61918-61919,61922-61926,61928-61929,61931,61935,61938,61943 via svnmerge from
Christian Heimes <christian@cheimes.de>
parents:
44535
diff
changeset
|
163 tester("ntpath.normpath('C:///A//B')", r'C:\A\B') |
|
1b6c0ff134fa
Merged revisions 61913,61915-61916,61918-61919,61922-61926,61928-61929,61931,61935,61938,61943 via svnmerge from
Christian Heimes <christian@cheimes.de>
parents:
44535
diff
changeset
|
164 tester("ntpath.normpath('D:///A/./B')", r'D:\A\B') |
|
1b6c0ff134fa
Merged revisions 61913,61915-61916,61918-61919,61922-61926,61928-61929,61931,61935,61938,61943 via svnmerge from
Christian Heimes <christian@cheimes.de>
parents:
44535
diff
changeset
|
165 tester("ntpath.normpath('e:///A/foo/../B')", r'e:\A\B') |
|
19628
ef2cf9943acd
SF bug #456621: normpath on Win32 not collapsing c:\\..
Tim Peters <tim.peters@gmail.com>
parents:
18847
diff
changeset
|
166 |
|
46115
1b6c0ff134fa
Merged revisions 61913,61915-61916,61918-61919,61922-61926,61928-61929,61931,61935,61938,61943 via svnmerge from
Christian Heimes <christian@cheimes.de>
parents:
44535
diff
changeset
|
167 tester("ntpath.normpath('..')", r'..') |
|
1b6c0ff134fa
Merged revisions 61913,61915-61916,61918-61919,61922-61926,61928-61929,61931,61935,61938,61943 via svnmerge from
Christian Heimes <christian@cheimes.de>
parents:
44535
diff
changeset
|
168 tester("ntpath.normpath('.')", r'.') |
|
1b6c0ff134fa
Merged revisions 61913,61915-61916,61918-61919,61922-61926,61928-61929,61931,61935,61938,61943 via svnmerge from
Christian Heimes <christian@cheimes.de>
parents:
44535
diff
changeset
|
169 tester("ntpath.normpath('')", r'.') |
|
1b6c0ff134fa
Merged revisions 61913,61915-61916,61918-61919,61922-61926,61928-61929,61931,61935,61938,61943 via svnmerge from
Christian Heimes <christian@cheimes.de>
parents:
44535
diff
changeset
|
170 tester("ntpath.normpath('/')", '\\') |
|
1b6c0ff134fa
Merged revisions 61913,61915-61916,61918-61919,61922-61926,61928-61929,61931,61935,61938,61943 via svnmerge from
Christian Heimes <christian@cheimes.de>
parents:
44535
diff
changeset
|
171 tester("ntpath.normpath('c:/')", 'c:\\') |
|
1b6c0ff134fa
Merged revisions 61913,61915-61916,61918-61919,61922-61926,61928-61929,61931,61935,61938,61943 via svnmerge from
Christian Heimes <christian@cheimes.de>
parents:
44535
diff
changeset
|
172 tester("ntpath.normpath('/../.././..')", '\\') |
|
1b6c0ff134fa
Merged revisions 61913,61915-61916,61918-61919,61922-61926,61928-61929,61931,61935,61938,61943 via svnmerge from
Christian Heimes <christian@cheimes.de>
parents:
44535
diff
changeset
|
173 tester("ntpath.normpath('c:/../../..')", 'c:\\') |
|
1b6c0ff134fa
Merged revisions 61913,61915-61916,61918-61919,61922-61926,61928-61929,61931,61935,61938,61943 via svnmerge from
Christian Heimes <christian@cheimes.de>
parents:
44535
diff
changeset
|
174 tester("ntpath.normpath('../.././..')", r'..\..\..') |
|
1b6c0ff134fa
Merged revisions 61913,61915-61916,61918-61919,61922-61926,61928-61929,61931,61935,61938,61943 via svnmerge from
Christian Heimes <christian@cheimes.de>
parents:
44535
diff
changeset
|
175 tester("ntpath.normpath('K:../.././..')", r'K:..\..\..') |
|
1b6c0ff134fa
Merged revisions 61913,61915-61916,61918-61919,61922-61926,61928-61929,61931,61935,61938,61943 via svnmerge from
Christian Heimes <christian@cheimes.de>
parents:
44535
diff
changeset
|
176 tester("ntpath.normpath('C:////a/b')", r'C:\a\b') |
|
1b6c0ff134fa
Merged revisions 61913,61915-61916,61918-61919,61922-61926,61928-61929,61931,61935,61938,61943 via svnmerge from
Christian Heimes <christian@cheimes.de>
parents:
44535
diff
changeset
|
177 tester("ntpath.normpath('//machine/share//a/b')", r'\\machine\share\a\b') |
|
19628
ef2cf9943acd
SF bug #456621: normpath on Win32 not collapsing c:\\..
Tim Peters <tim.peters@gmail.com>
parents:
18847
diff
changeset
|
178 |
|
63446
0dcae455ec07
Merged revisions 83352,83355-83358,83362,83366,83368-83369 via svnmerge from
Georg Brandl <georg@python.org>
parents:
53838
diff
changeset
|
179 tester("ntpath.normpath('\\\\.\\NUL')", r'\\.\NUL') |
|
0dcae455ec07
Merged revisions 83352,83355-83358,83362,83366,83368-83369 via svnmerge from
Georg Brandl <georg@python.org>
parents:
53838
diff
changeset
|
180 tester("ntpath.normpath('\\\\?\\D:/XY\\Z')", r'\\?\D:/XY\Z') |
|
0dcae455ec07
Merged revisions 83352,83355-83358,83362,83366,83368-83369 via svnmerge from
Georg Brandl <georg@python.org>
parents:
53838
diff
changeset
|
181 |
|
46115
1b6c0ff134fa
Merged revisions 61913,61915-61916,61918-61919,61922-61926,61928-61929,61931,61935,61938,61943 via svnmerge from
Christian Heimes <christian@cheimes.de>
parents:
44535
diff
changeset
|
182 def test_expandvars(self): |
|
53646
5c55b9c80846
Merged revisions 72167 via svnmerge from
Walter Dörwald <walter@livinglogic.de>
parents:
49410
diff
changeset
|
183 with support.EnvironmentVarGuard() as env: |
|
5c55b9c80846
Merged revisions 72167 via svnmerge from
Walter Dörwald <walter@livinglogic.de>
parents:
49410
diff
changeset
|
184 env.clear() |
|
5c55b9c80846
Merged revisions 72167 via svnmerge from
Walter Dörwald <walter@livinglogic.de>
parents:
49410
diff
changeset
|
185 env["foo"] = "bar" |
|
5c55b9c80846
Merged revisions 72167 via svnmerge from
Walter Dörwald <walter@livinglogic.de>
parents:
49410
diff
changeset
|
186 env["{foo"] = "baz1" |
|
5c55b9c80846
Merged revisions 72167 via svnmerge from
Walter Dörwald <walter@livinglogic.de>
parents:
49410
diff
changeset
|
187 env["{foo}"] = "baz2" |
|
46115
1b6c0ff134fa
Merged revisions 61913,61915-61916,61918-61919,61922-61926,61928-61929,61931,61935,61938,61943 via svnmerge from
Christian Heimes <christian@cheimes.de>
parents:
44535
diff
changeset
|
188 tester('ntpath.expandvars("foo")', "foo") |
|
1b6c0ff134fa
Merged revisions 61913,61915-61916,61918-61919,61922-61926,61928-61929,61931,61935,61938,61943 via svnmerge from
Christian Heimes <christian@cheimes.de>
parents:
44535
diff
changeset
|
189 tester('ntpath.expandvars("$foo bar")', "bar bar") |
|
1b6c0ff134fa
Merged revisions 61913,61915-61916,61918-61919,61922-61926,61928-61929,61931,61935,61938,61943 via svnmerge from
Christian Heimes <christian@cheimes.de>
parents:
44535
diff
changeset
|
190 tester('ntpath.expandvars("${foo}bar")', "barbar") |
|
1b6c0ff134fa
Merged revisions 61913,61915-61916,61918-61919,61922-61926,61928-61929,61931,61935,61938,61943 via svnmerge from
Christian Heimes <christian@cheimes.de>
parents:
44535
diff
changeset
|
191 tester('ntpath.expandvars("$[foo]bar")', "$[foo]bar") |
|
1b6c0ff134fa
Merged revisions 61913,61915-61916,61918-61919,61922-61926,61928-61929,61931,61935,61938,61943 via svnmerge from
Christian Heimes <christian@cheimes.de>
parents:
44535
diff
changeset
|
192 tester('ntpath.expandvars("$bar bar")', "$bar bar") |
|
1b6c0ff134fa
Merged revisions 61913,61915-61916,61918-61919,61922-61926,61928-61929,61931,61935,61938,61943 via svnmerge from
Christian Heimes <christian@cheimes.de>
parents:
44535
diff
changeset
|
193 tester('ntpath.expandvars("$?bar")', "$?bar") |
|
1b6c0ff134fa
Merged revisions 61913,61915-61916,61918-61919,61922-61926,61928-61929,61931,61935,61938,61943 via svnmerge from
Christian Heimes <christian@cheimes.de>
parents:
44535
diff
changeset
|
194 tester('ntpath.expandvars("${foo}bar")', "barbar") |
|
1b6c0ff134fa
Merged revisions 61913,61915-61916,61918-61919,61922-61926,61928-61929,61931,61935,61938,61943 via svnmerge from
Christian Heimes <christian@cheimes.de>
parents:
44535
diff
changeset
|
195 tester('ntpath.expandvars("$foo}bar")', "bar}bar") |
|
1b6c0ff134fa
Merged revisions 61913,61915-61916,61918-61919,61922-61926,61928-61929,61931,61935,61938,61943 via svnmerge from
Christian Heimes <christian@cheimes.de>
parents:
44535
diff
changeset
|
196 tester('ntpath.expandvars("${foo")', "${foo") |
|
1b6c0ff134fa
Merged revisions 61913,61915-61916,61918-61919,61922-61926,61928-61929,61931,61935,61938,61943 via svnmerge from
Christian Heimes <christian@cheimes.de>
parents:
44535
diff
changeset
|
197 tester('ntpath.expandvars("${{foo}}")', "baz1}") |
|
1b6c0ff134fa
Merged revisions 61913,61915-61916,61918-61919,61922-61926,61928-61929,61931,61935,61938,61943 via svnmerge from
Christian Heimes <christian@cheimes.de>
parents:
44535
diff
changeset
|
198 tester('ntpath.expandvars("$foo$foo")', "barbar") |
|
1b6c0ff134fa
Merged revisions 61913,61915-61916,61918-61919,61922-61926,61928-61929,61931,61935,61938,61943 via svnmerge from
Christian Heimes <christian@cheimes.de>
parents:
44535
diff
changeset
|
199 tester('ntpath.expandvars("$bar$bar")', "$bar$bar") |
|
1b6c0ff134fa
Merged revisions 61913,61915-61916,61918-61919,61922-61926,61928-61929,61931,61935,61938,61943 via svnmerge from
Christian Heimes <christian@cheimes.de>
parents:
44535
diff
changeset
|
200 tester('ntpath.expandvars("%foo% bar")', "bar bar") |
|
1b6c0ff134fa
Merged revisions 61913,61915-61916,61918-61919,61922-61926,61928-61929,61931,61935,61938,61943 via svnmerge from
Christian Heimes <christian@cheimes.de>
parents:
44535
diff
changeset
|
201 tester('ntpath.expandvars("%foo%bar")', "barbar") |
|
1b6c0ff134fa
Merged revisions 61913,61915-61916,61918-61919,61922-61926,61928-61929,61931,61935,61938,61943 via svnmerge from
Christian Heimes <christian@cheimes.de>
parents:
44535
diff
changeset
|
202 tester('ntpath.expandvars("%foo%%foo%")', "barbar") |
|
1b6c0ff134fa
Merged revisions 61913,61915-61916,61918-61919,61922-61926,61928-61929,61931,61935,61938,61943 via svnmerge from
Christian Heimes <christian@cheimes.de>
parents:
44535
diff
changeset
|
203 tester('ntpath.expandvars("%%foo%%foo%foo%")', "%foo%foobar") |
|
1b6c0ff134fa
Merged revisions 61913,61915-61916,61918-61919,61922-61926,61928-61929,61931,61935,61938,61943 via svnmerge from
Christian Heimes <christian@cheimes.de>
parents:
44535
diff
changeset
|
204 tester('ntpath.expandvars("%?bar%")', "%?bar%") |
|
1b6c0ff134fa
Merged revisions 61913,61915-61916,61918-61919,61922-61926,61928-61929,61931,61935,61938,61943 via svnmerge from
Christian Heimes <christian@cheimes.de>
parents:
44535
diff
changeset
|
205 tester('ntpath.expandvars("%foo%%bar")', "bar%bar") |
|
1b6c0ff134fa
Merged revisions 61913,61915-61916,61918-61919,61922-61926,61928-61929,61931,61935,61938,61943 via svnmerge from
Christian Heimes <christian@cheimes.de>
parents:
44535
diff
changeset
|
206 tester('ntpath.expandvars("\'%foo%\'%bar")', "\'%foo%\'%bar") |
|
40737
6ebad2a6b990
Merged revisions 53451-53537 via svnmerge from
Thomas Wouters <thomas@python.org>
parents:
32595
diff
changeset
|
207 |
|
46115
1b6c0ff134fa
Merged revisions 61913,61915-61916,61918-61919,61922-61926,61928-61929,61931,61935,61938,61943 via svnmerge from
Christian Heimes <christian@cheimes.de>
parents:
44535
diff
changeset
|
208 def test_abspath(self): |
|
1b6c0ff134fa
Merged revisions 61913,61915-61916,61918-61919,61922-61926,61928-61929,61931,61935,61938,61943 via svnmerge from
Christian Heimes <christian@cheimes.de>
parents:
44535
diff
changeset
|
209 # ntpath.abspath() can only be used on a system with the "nt" module |
|
1b6c0ff134fa
Merged revisions 61913,61915-61916,61918-61919,61922-61926,61928-61929,61931,61935,61938,61943 via svnmerge from
Christian Heimes <christian@cheimes.de>
parents:
44535
diff
changeset
|
210 # (reasonably), so we protect this test with "import nt". This allows |
|
1b6c0ff134fa
Merged revisions 61913,61915-61916,61918-61919,61922-61926,61928-61929,61931,61935,61938,61943 via svnmerge from
Christian Heimes <christian@cheimes.de>
parents:
44535
diff
changeset
|
211 # the rest of the tests for the ntpath module to be run to completion |
|
1b6c0ff134fa
Merged revisions 61913,61915-61916,61918-61919,61922-61926,61928-61929,61931,61935,61938,61943 via svnmerge from
Christian Heimes <christian@cheimes.de>
parents:
44535
diff
changeset
|
212 # on any platform, since most of the module is intended to be usable |
|
1b6c0ff134fa
Merged revisions 61913,61915-61916,61918-61919,61922-61926,61928-61929,61931,61935,61938,61943 via svnmerge from
Christian Heimes <christian@cheimes.de>
parents:
44535
diff
changeset
|
213 # from any platform. |
|
1b6c0ff134fa
Merged revisions 61913,61915-61916,61918-61919,61922-61926,61928-61929,61931,61935,61938,61943 via svnmerge from
Christian Heimes <christian@cheimes.de>
parents:
44535
diff
changeset
|
214 try: |
|
1b6c0ff134fa
Merged revisions 61913,61915-61916,61918-61919,61922-61926,61928-61929,61931,61935,61938,61943 via svnmerge from
Christian Heimes <christian@cheimes.de>
parents:
44535
diff
changeset
|
215 import nt |
|
53838
29025b530046
Issue #5799: ntpath (ie, os.path on Windows) fully supports UNC pathnames.
Mark Hammond <mhammond@skippinet.com.au>
parents:
53646
diff
changeset
|
216 tester('ntpath.abspath("C:\\")', "C:\\") |
|
46115
1b6c0ff134fa
Merged revisions 61913,61915-61916,61918-61919,61922-61926,61928-61929,61931,61935,61938,61943 via svnmerge from
Christian Heimes <christian@cheimes.de>
parents:
44535
diff
changeset
|
217 except ImportError: |
|
1b6c0ff134fa
Merged revisions 61913,61915-61916,61918-61919,61922-61926,61928-61929,61931,61935,61938,61943 via svnmerge from
Christian Heimes <christian@cheimes.de>
parents:
44535
diff
changeset
|
218 pass |
|
21720
e99198234d96
Only test ntpath.abspath() on Windows. This allows the rest of the module to
Fred Drake <fdrake@acm.org>
parents:
20892
diff
changeset
|
219 |
|
46115
1b6c0ff134fa
Merged revisions 61913,61915-61916,61918-61919,61922-61926,61928-61929,61931,61935,61938,61943 via svnmerge from
Christian Heimes <christian@cheimes.de>
parents:
44535
diff
changeset
|
220 def test_relpath(self): |
|
1b6c0ff134fa
Merged revisions 61913,61915-61916,61918-61919,61922-61926,61928-61929,61931,61935,61938,61943 via svnmerge from
Christian Heimes <christian@cheimes.de>
parents:
44535
diff
changeset
|
221 currentdir = os.path.split(os.getcwd())[-1] |
|
1b6c0ff134fa
Merged revisions 61913,61915-61916,61918-61919,61922-61926,61928-61929,61931,61935,61938,61943 via svnmerge from
Christian Heimes <christian@cheimes.de>
parents:
44535
diff
changeset
|
222 tester('ntpath.relpath("a")', 'a') |
|
1b6c0ff134fa
Merged revisions 61913,61915-61916,61918-61919,61922-61926,61928-61929,61931,61935,61938,61943 via svnmerge from
Christian Heimes <christian@cheimes.de>
parents:
44535
diff
changeset
|
223 tester('ntpath.relpath(os.path.abspath("a"))', 'a') |
|
1b6c0ff134fa
Merged revisions 61913,61915-61916,61918-61919,61922-61926,61928-61929,61931,61935,61938,61943 via svnmerge from
Christian Heimes <christian@cheimes.de>
parents:
44535
diff
changeset
|
224 tester('ntpath.relpath("a/b")', 'a\\b') |
|
1b6c0ff134fa
Merged revisions 61913,61915-61916,61918-61919,61922-61926,61928-61929,61931,61935,61938,61943 via svnmerge from
Christian Heimes <christian@cheimes.de>
parents:
44535
diff
changeset
|
225 tester('ntpath.relpath("../a/b")', '..\\a\\b') |
|
1b6c0ff134fa
Merged revisions 61913,61915-61916,61918-61919,61922-61926,61928-61929,61931,61935,61938,61943 via svnmerge from
Christian Heimes <christian@cheimes.de>
parents:
44535
diff
changeset
|
226 tester('ntpath.relpath("a", "../b")', '..\\'+currentdir+'\\a') |
|
1b6c0ff134fa
Merged revisions 61913,61915-61916,61918-61919,61922-61926,61928-61929,61931,61935,61938,61943 via svnmerge from
Christian Heimes <christian@cheimes.de>
parents:
44535
diff
changeset
|
227 tester('ntpath.relpath("a/b", "../c")', '..\\'+currentdir+'\\a\\b') |
|
1b6c0ff134fa
Merged revisions 61913,61915-61916,61918-61919,61922-61926,61928-61929,61931,61935,61938,61943 via svnmerge from
Christian Heimes <christian@cheimes.de>
parents:
44535
diff
changeset
|
228 tester('ntpath.relpath("a", "b/c")', '..\\..\\a') |
|
53838
29025b530046
Issue #5799: ntpath (ie, os.path on Windows) fully supports UNC pathnames.
Mark Hammond <mhammond@skippinet.com.au>
parents:
53646
diff
changeset
|
229 tester('ntpath.relpath("c:/foo/bar/bat", "c:/x/y")', '..\\..\\foo\\bar\\bat') |
|
46115
1b6c0ff134fa
Merged revisions 61913,61915-61916,61918-61919,61922-61926,61928-61929,61931,61935,61938,61943 via svnmerge from
Christian Heimes <christian@cheimes.de>
parents:
44535
diff
changeset
|
230 tester('ntpath.relpath("//conky/mountpoint/a", "//conky/mountpoint/b/c")', '..\\..\\a') |
|
1b6c0ff134fa
Merged revisions 61913,61915-61916,61918-61919,61922-61926,61928-61929,61931,61935,61938,61943 via svnmerge from
Christian Heimes <christian@cheimes.de>
parents:
44535
diff
changeset
|
231 tester('ntpath.relpath("a", "a")', '.') |
|
53838
29025b530046
Issue #5799: ntpath (ie, os.path on Windows) fully supports UNC pathnames.
Mark Hammond <mhammond@skippinet.com.au>
parents:
53646
diff
changeset
|
232 tester('ntpath.relpath("/foo/bar/bat", "/x/y/z")', '..\\..\\..\\foo\\bar\\bat') |
|
29025b530046
Issue #5799: ntpath (ie, os.path on Windows) fully supports UNC pathnames.
Mark Hammond <mhammond@skippinet.com.au>
parents:
53646
diff
changeset
|
233 tester('ntpath.relpath("/foo/bar/bat", "/foo/bar")', 'bat') |
|
29025b530046
Issue #5799: ntpath (ie, os.path on Windows) fully supports UNC pathnames.
Mark Hammond <mhammond@skippinet.com.au>
parents:
53646
diff
changeset
|
234 tester('ntpath.relpath("/foo/bar/bat", "/")', 'foo\\bar\\bat') |
|
29025b530046
Issue #5799: ntpath (ie, os.path on Windows) fully supports UNC pathnames.
Mark Hammond <mhammond@skippinet.com.au>
parents:
53646
diff
changeset
|
235 tester('ntpath.relpath("/", "/foo/bar/bat")', '..\\..\\..') |
|
29025b530046
Issue #5799: ntpath (ie, os.path on Windows) fully supports UNC pathnames.
Mark Hammond <mhammond@skippinet.com.au>
parents:
53646
diff
changeset
|
236 tester('ntpath.relpath("/foo/bar/bat", "/x")', '..\\foo\\bar\\bat') |
|
29025b530046
Issue #5799: ntpath (ie, os.path on Windows) fully supports UNC pathnames.
Mark Hammond <mhammond@skippinet.com.au>
parents:
53646
diff
changeset
|
237 tester('ntpath.relpath("/x", "/foo/bar/bat")', '..\\..\\..\\x') |
|
29025b530046
Issue #5799: ntpath (ie, os.path on Windows) fully supports UNC pathnames.
Mark Hammond <mhammond@skippinet.com.au>
parents:
53646
diff
changeset
|
238 tester('ntpath.relpath("/", "/")', '.') |
|
29025b530046
Issue #5799: ntpath (ie, os.path on Windows) fully supports UNC pathnames.
Mark Hammond <mhammond@skippinet.com.au>
parents:
53646
diff
changeset
|
239 tester('ntpath.relpath("/a", "/a")', '.') |
|
29025b530046
Issue #5799: ntpath (ie, os.path on Windows) fully supports UNC pathnames.
Mark Hammond <mhammond@skippinet.com.au>
parents:
53646
diff
changeset
|
240 tester('ntpath.relpath("/a/b", "/a/b")', '.') |
|
65523
b0ba7eeb98a5
Merged revisions 85689 via svnmerge from
Hirokazu Yamamoto <ocean-city@m2.ccsnet.ne.jp>
parents:
63446
diff
changeset
|
241 tester('ntpath.relpath("c:/foo", "C:/FOO")', '.') |
|
41554
06145fbc7ab9
Merged revisions 53952-54987 via svnmerge from
Guido van Rossum <guido@python.org>
parents:
40775
diff
changeset
|
242 |
|
64495
f6dfd6c563e1
Implement #7566 - os.path.sameopenfile for Windows.
Brian Curtin <brian.curtin@gmail.com>
parents:
63385
diff
changeset
|
243 def test_sameopenfile(self): |
|
f6dfd6c563e1
Implement #7566 - os.path.sameopenfile for Windows.
Brian Curtin <brian.curtin@gmail.com>
parents:
63385
diff
changeset
|
244 with TemporaryFile() as tf1, TemporaryFile() as tf2: |
|
f6dfd6c563e1
Implement #7566 - os.path.sameopenfile for Windows.
Brian Curtin <brian.curtin@gmail.com>
parents:
63385
diff
changeset
|
245 # Make sure the same file is really the same |
|
f6dfd6c563e1
Implement #7566 - os.path.sameopenfile for Windows.
Brian Curtin <brian.curtin@gmail.com>
parents:
63385
diff
changeset
|
246 self.assertTrue(ntpath.sameopenfile(tf1.fileno(), tf1.fileno())) |
|
f6dfd6c563e1
Implement #7566 - os.path.sameopenfile for Windows.
Brian Curtin <brian.curtin@gmail.com>
parents:
63385
diff
changeset
|
247 # Make sure different files are really different |
|
f6dfd6c563e1
Implement #7566 - os.path.sameopenfile for Windows.
Brian Curtin <brian.curtin@gmail.com>
parents:
63385
diff
changeset
|
248 self.assertFalse(ntpath.sameopenfile(tf1.fileno(), tf2.fileno())) |
|
64498
541338795950
Fix some errors that #7566 introduced on non-Windows platforms due to
Brian Curtin <brian.curtin@gmail.com>
parents:
64495
diff
changeset
|
249 # Make sure invalid values don't cause issues on win32 |
|
541338795950
Fix some errors that #7566 introduced on non-Windows platforms due to
Brian Curtin <brian.curtin@gmail.com>
parents:
64495
diff
changeset
|
250 if sys.platform == "win32": |
|
66740
5c3ac8795e9c
Should use posix_error here.
Hirokazu Yamamoto <ocean-city@m2.ccsnet.ne.jp>
parents:
65519
diff
changeset
|
251 with self.assertRaises(OSError): |
|
64498
541338795950
Fix some errors that #7566 introduced on non-Windows platforms due to
Brian Curtin <brian.curtin@gmail.com>
parents:
64495
diff
changeset
|
252 # Invalid file descriptors shouldn't display assert |
|
541338795950
Fix some errors that #7566 introduced on non-Windows platforms due to
Brian Curtin <brian.curtin@gmail.com>
parents:
64495
diff
changeset
|
253 # dialogs (#4804) |
|
541338795950
Fix some errors that #7566 introduced on non-Windows platforms due to
Brian Curtin <brian.curtin@gmail.com>
parents:
64495
diff
changeset
|
254 ntpath.sameopenfile(-1, -1) |
|
64495
f6dfd6c563e1
Implement #7566 - os.path.sameopenfile for Windows.
Brian Curtin <brian.curtin@gmail.com>
parents:
63385
diff
changeset
|
255 |
|
46115
1b6c0ff134fa
Merged revisions 61913,61915-61916,61918-61919,61922-61926,61928-61929,61931,61935,61938,61943 via svnmerge from
Christian Heimes <christian@cheimes.de>
parents:
44535
diff
changeset
|
256 |
|
59466
a2f1c15cae6c
Merged revisions 78734-78735 via svnmerge from
Florent Xicluna <florent.xicluna@gmail.com>
parents:
58473
diff
changeset
|
257 class NtCommonTest(test_genericpath.CommonTest): |
|
a2f1c15cae6c
Merged revisions 78734-78735 via svnmerge from
Florent Xicluna <florent.xicluna@gmail.com>
parents:
58473
diff
changeset
|
258 pathmodule = ntpath |
|
a2f1c15cae6c
Merged revisions 78734-78735 via svnmerge from
Florent Xicluna <florent.xicluna@gmail.com>
parents:
58473
diff
changeset
|
259 attributes = ['relpath', 'splitunc'] |
|
a2f1c15cae6c
Merged revisions 78734-78735 via svnmerge from
Florent Xicluna <florent.xicluna@gmail.com>
parents:
58473
diff
changeset
|
260 |
|
46115
1b6c0ff134fa
Merged revisions 61913,61915-61916,61918-61919,61922-61926,61928-61929,61931,61935,61938,61943 via svnmerge from
Christian Heimes <christian@cheimes.de>
parents:
44535
diff
changeset
|
261 |
|
1b6c0ff134fa
Merged revisions 61913,61915-61916,61918-61919,61922-61926,61928-61929,61931,61935,61938,61943 via svnmerge from
Christian Heimes <christian@cheimes.de>
parents:
44535
diff
changeset
|
262 def test_main(): |
|
59466
a2f1c15cae6c
Merged revisions 78734-78735 via svnmerge from
Florent Xicluna <florent.xicluna@gmail.com>
parents:
58473
diff
changeset
|
263 support.run_unittest(TestNtpath, NtCommonTest) |
|
46115
1b6c0ff134fa
Merged revisions 61913,61915-61916,61918-61919,61922-61926,61928-61929,61931,61935,61938,61943 via svnmerge from
Christian Heimes <christian@cheimes.de>
parents:
44535
diff
changeset
|
264 |
|
1b6c0ff134fa
Merged revisions 61913,61915-61916,61918-61919,61922-61926,61928-61929,61931,61935,61938,61943 via svnmerge from
Christian Heimes <christian@cheimes.de>
parents:
44535
diff
changeset
|
265 |
|
1b6c0ff134fa
Merged revisions 61913,61915-61916,61918-61919,61922-61926,61928-61929,61931,61935,61938,61943 via svnmerge from
Christian Heimes <christian@cheimes.de>
parents:
44535
diff
changeset
|
266 if __name__ == "__main__": |
|
1b6c0ff134fa
Merged revisions 61913,61915-61916,61918-61919,61922-61926,61928-61929,61931,61935,61938,61943 via svnmerge from
Christian Heimes <christian@cheimes.de>
parents:
44535
diff
changeset
|
267 unittest.main() |