Lib/test/test_posixpath.py - Issue 3055: combined patches from http://bugs.python.org/issue3187

Delta Between Two Patch Sets: Lib/test/test_posixpath.py

Issue 3055: combined patches from http://bugs.python.org/issue3187 (Closed) SVN Base: http://svn.python.org/view/*checkout*/python/branches/py3k/

Left Patch Set: My final version of Victor's patches Created 1 year, 2 months ago

Right Patch Set: One more tweak (fold some long lines) Created 1 year, 2 months ago

Use n/p to move between diff chunks; N/P to move between comments. Please Sign in to add in-line comments.

Jump to:

Left: Side by side diff | Download
Right: Side by side diff | Download

LEFT	RIGHT
1 import unittest	1 import unittest

2 from test import support	2 from test import support

3	3

4 import posixpath, os	4 import posixpath, os

5 from posixpath import realpath, abspath, join, dirname, basename, relpath	5 from posixpath import realpath, abspath, join, dirname, basename, relpath

6	6

7 # An absolute path to a temporary filename for testing. We can't rely on TESTFN	7 # An absolute path to a temporary filename for testing. We can't rely on TESTFN

8 # being an absolute path, so we need this.	8 # being an absolute path, so we need this.

9	9

10 ABSTFN = abspath(support.TESTFN)	10 ABSTFN = abspath(support.TESTFN)

(...skipping 62 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
73 self.assertEqual(posixpath.split(b"/"), (b"/", b""))	73 self.assertEqual(posixpath.split(b"/"), (b"/", b""))

74 self.assertEqual(posixpath.split(b"foo"), (b"", b"foo"))	74 self.assertEqual(posixpath.split(b"foo"), (b"", b"foo"))

75 self.assertEqual(posixpath.split(b"////foo"), (b"////", b"foo"))	75 self.assertEqual(posixpath.split(b"////foo"), (b"////", b"foo"))

76 self.assertEqual(posixpath.split(b"//foo//bar"), (b"//foo", b"bar"))	76 self.assertEqual(posixpath.split(b"//foo//bar"), (b"//foo", b"bar"))

77	77

78 self.assertRaises(TypeError, posixpath.split)	78 self.assertRaises(TypeError, posixpath.split)

79	79

80 def splitextTest(self, path, filename, ext):	80 def splitextTest(self, path, filename, ext):

81 self.assertEqual(posixpath.splitext(path), (filename, ext))	81 self.assertEqual(posixpath.splitext(path), (filename, ext))

82 self.assertEqual(posixpath.splitext("/" + path), ("/" + filename, ext))	82 self.assertEqual(posixpath.splitext("/" + path), ("/" + filename, ext))

83 self.assertEqual(posixpath.splitext("abc/" + path), ("abc/" + filename, ext))	83 self.assertEqual(posixpath.splitext("abc/" + path),

84 self.assertEqual(posixpath.splitext("abc.def/" + path), ("abc.def/" + fi lename, ext))	84 ("abc/" + filename, ext))

85 self.assertEqual(posixpath.splitext("/abc.def/" + path), ("/abc.def/" + filename, ext))	85 self.assertEqual(posixpath.splitext("abc.def/" + path),

86 self.assertEqual(posixpath.splitext(path + "/"), (filename + ext + "/", ""))	86 ("abc.def/" + filename, ext))

	87 self.assertEqual(posixpath.splitext("/abc.def/" + path),

	88 ("/abc.def/" + filename, ext))

	89 self.assertEqual(posixpath.splitext(path + "/"),

	90 (filename + ext + "/", ""))

87	91

88 path = bytes(path, "ASCII")	92 path = bytes(path, "ASCII")

89 filename = bytes(filename, "ASCII")	93 filename = bytes(filename, "ASCII")

90 ext = bytes(ext, "ASCII")	94 ext = bytes(ext, "ASCII")

91	95

92 self.assertEqual(posixpath.splitext(path), (filename, ext))	96 self.assertEqual(posixpath.splitext(path), (filename, ext))

93 self.assertEqual(posixpath.splitext(b"/" + path), (b"/" + filename, ext) )	97 self.assertEqual(posixpath.splitext(b"/" + path),

94 self.assertEqual(posixpath.splitext(b"abc/" + path), (b"abc/" + filename , ext))	98 (b"/" + filename, ext))

95 self.assertEqual(posixpath.splitext(b"abc.def/" + path), (b"abc.def/" + filename, ext))	99 self.assertEqual(posixpath.splitext(b"abc/" + path),

96 self.assertEqual(posixpath.splitext(b"/abc.def/" + path), (b"/abc.def/" + filename, ext))	100 (b"abc/" + filename, ext))

97 self.assertEqual(posixpath.splitext(path + b"/"), (filename + ext + b"/" , b""))	101 self.assertEqual(posixpath.splitext(b"abc.def/" + path),

	102 (b"abc.def/" + filename, ext))

	103 self.assertEqual(posixpath.splitext(b"/abc.def/" + path),

	104 (b"/abc.def/" + filename, ext))

	105 self.assertEqual(posixpath.splitext(path + b"/"),

	106 (filename + ext + b"/", b""))

98	107

99 def test_splitext(self):	108 def test_splitext(self):

100 self.splitextTest("foo.bar", "foo", ".bar")	109 self.splitextTest("foo.bar", "foo", ".bar")

101 self.splitextTest("foo.boo.bar", "foo.boo", ".bar")	110 self.splitextTest("foo.boo.bar", "foo.boo", ".bar")

102 self.splitextTest("foo.boo.biff.bar", "foo.boo.biff", ".bar")	111 self.splitextTest("foo.boo.biff.bar", "foo.boo.biff", ".bar")

103 self.splitextTest(".csh.rc", ".csh", ".rc")	112 self.splitextTest(".csh.rc", ".csh", ".rc")

104 self.splitextTest("nodots", "nodots", "")	113 self.splitextTest("nodots", "nodots", "")

105 self.splitextTest(".cshrc", ".cshrc", "")	114 self.splitextTest(".cshrc", ".cshrc", "")

106 self.splitextTest("...manydots", "...manydots", "")	115 self.splitextTest("...manydots", "...manydots", "")

107 self.splitextTest("...manydots.ext", "...manydots", ".ext")	116 self.splitextTest("...manydots.ext", "...manydots", ".ext")

(...skipping 508 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
616 self.assertRaises(TypeError, posixpath.relpath, b"bytes", "str")	625 self.assertRaises(TypeError, posixpath.relpath, b"bytes", "str")

617 self.assertRaises(TypeError, posixpath.relpath, "str", b"bytes")	626 self.assertRaises(TypeError, posixpath.relpath, "str", b"bytes")

618 finally:	627 finally:

619 os.getcwdb = real_getcwdb	628 os.getcwdb = real_getcwdb

620	629

621 def test_main():	630 def test_main():

622 support.run_unittest(PosixPathTest)	631 support.run_unittest(PosixPathTest)

623	632

624 if __name__=="__main__":	633 if __name__=="__main__":

625 test_main()	634 test_main()

LEFT	RIGHT