mirror of
https://github.com/python/cpython.git
synced 2025-11-03 19:34:08 +00:00
faf2f63faf
svn+ssh://pythondev@svn.python.org/python/trunk
........
r59704 | christian.heimes | 2008-01-04 04:15:05 +0100 (Fri, 04 Jan 2008) | 1 line
Moved include "Python.h" in front of other imports to silence a warning.
........
r59706 | raymond.hettinger | 2008-01-04 04:22:53 +0100 (Fri, 04 Jan 2008) | 10 lines
Minor fix-ups to named tuples:
* Make the _replace() method respect subclassing.
* Using property() to make _fields read-only wasn't a good idea.
It caused len(Point._fields) to fail.
* Add note to _cast() about length checking and alternative with the star-operator.
........
r59707 | jeffrey.yasskin | 2008-01-04 09:01:23 +0100 (Fri, 04 Jan 2008) | 3 lines
Make math.{floor,ceil}({int,long}) return float again for backwards
compatibility after r59671 made them return integral types.
........
r59709 | christian.heimes | 2008-01-04 14:21:07 +0100 (Fri, 04 Jan 2008) | 1 line
Bug #1713: posixpath.ismount() claims symlink to a mountpoint is a mountpoint.
........
r59712 | lars.gustaebel | 2008-01-04 15:00:33 +0100 (Fri, 04 Jan 2008) | 5 lines
Issue #1735: TarFile.extractall() now correctly sets
directory permissions and times.
(will backport to 2.5)
........
r59714 | andrew.kuchling | 2008-01-04 15:47:17 +0100 (Fri, 04 Jan 2008) | 1 line
Update links to bug/patch tracker
........
r59716 | christian.heimes | 2008-01-04 16:23:30 +0100 (Fri, 04 Jan 2008) | 1 line
Added interface to Windows' WSAIoctl and a simple example for a network sniffer.
........
r59717 | christian.heimes | 2008-01-04 16:29:00 +0100 (Fri, 04 Jan 2008) | 1 line
And here is the rest of Hirokazu Yamamoto's patch for VS6.0 support. Thanks Hiro!
........
r59719 | christian.heimes | 2008-01-04 16:34:06 +0100 (Fri, 04 Jan 2008) | 1 line
Reverted last transaction. It's the wrong branch.
........
r59721 | christian.heimes | 2008-01-04 16:48:06 +0100 (Fri, 04 Jan 2008) | 1 line
socket.ioctl is only available on Windows
........
r59722 | andrew.kuchling | 2008-01-04 19:24:41 +0100 (Fri, 04 Jan 2008) | 1 line
Fix markup
........
r59723 | andrew.kuchling | 2008-01-04 19:25:05 +0100 (Fri, 04 Jan 2008) | 1 line
Fix markup
........
r59725 | guido.van.rossum | 2008-01-05 01:59:59 +0100 (Sat, 05 Jan 2008) | 3 lines
Patch #1725 by Mark Dickinson, fixes incorrect conversion of -1e1000
and adds errors for -0x.
........
r59726 | guido.van.rossum | 2008-01-05 02:21:57 +0100 (Sat, 05 Jan 2008) | 2 lines
Patch #1698 by Senthil: allow '@' in username when parsed by urlparse.py.
........
r59727 | raymond.hettinger | 2008-01-05 02:35:43 +0100 (Sat, 05 Jan 2008) | 1 line
Improve namedtuple's _cast() method with a docstring, new name, and error-checking.
........
r59728 | raymond.hettinger | 2008-01-05 03:17:24 +0100 (Sat, 05 Jan 2008) | 1 line
Add error-checking to namedtuple's _replace() method.
........
r59730 | fred.drake | 2008-01-05 05:38:38 +0100 (Sat, 05 Jan 2008) | 2 lines
clean up a comment
........
r59731 | jeffrey.yasskin | 2008-01-05 09:47:13 +0100 (Sat, 05 Jan 2008) | 11 lines
Continue rolling back pep-3141 changes that changed behavior from 2.5. This
round included:
* Revert round to its 2.6 behavior (half away from 0).
* Because round, floor, and ceil always return float again, it's no
longer necessary to have them delegate to __xxx___, so I've ripped
that out of their implementations and the Real ABC. This also helps
in implementing types that work in both 2.6 and 3.0: you return int
from the __xxx__ methods, and let it get enabled by the version
upgrade.
* Make pow(-1, .5) raise a ValueError again.
........
r59736 | andrew.kuchling | 2008-01-05 16:13:49 +0100 (Sat, 05 Jan 2008) | 1 line
Fix comment typo
........
r59738 | thomas.heller | 2008-01-05 18:15:44 +0100 (Sat, 05 Jan 2008) | 1 line
Add myself.
........
r59739 | georg.brandl | 2008-01-05 18:49:17 +0100 (Sat, 05 Jan 2008) | 2 lines
Fix C++-style comment.
........
r59742 | georg.brandl | 2008-01-05 20:28:16 +0100 (Sat, 05 Jan 2008) | 2 lines
Remove with_statement future imports from 2.6 docs.
........
r59743 | georg.brandl | 2008-01-05 20:29:45 +0100 (Sat, 05 Jan 2008) | 2 lines
Simplify index entries; fix #1712.
........
r59744 | georg.brandl | 2008-01-05 20:44:22 +0100 (Sat, 05 Jan 2008) | 2 lines
Doc patch #1730 from Robin Stocker; minor corrections mostly to os.rst.
........
r59749 | georg.brandl | 2008-01-05 21:29:13 +0100 (Sat, 05 Jan 2008) | 2 lines
Revert socket.rst to unix-eol.
........
r59750 | georg.brandl | 2008-01-05 21:33:46 +0100 (Sat, 05 Jan 2008) | 2 lines
Set native svn:eol-style property for text files.
........
r59752 | georg.brandl | 2008-01-05 21:46:29 +0100 (Sat, 05 Jan 2008) | 2 lines
#1719: capitalization error in "UuidCreate".
........
r59753 | georg.brandl | 2008-01-05 22:02:25 +0100 (Sat, 05 Jan 2008) | 2 lines
Repair markup.
........
r59754 | georg.brandl | 2008-01-05 22:10:50 +0100 (Sat, 05 Jan 2008) | 2 lines
Use markup.
........
r59757 | christian.heimes | 2008-01-05 22:35:52 +0100 (Sat, 05 Jan 2008) | 1 line
Final adjustments for #1601
........
r59758 | guido.van.rossum | 2008-01-05 23:19:06 +0100 (Sat, 05 Jan 2008) | 3 lines
Patch #1637: fix urlparse for URLs like 'http://x.com?arg=/foo'.
Fix by John Nagle.
........
r59759 | guido.van.rossum | 2008-01-05 23:20:01 +0100 (Sat, 05 Jan 2008) | 2 lines
Add John Nagle (of issue #1637).
........
r59765 | raymond.hettinger | 2008-01-06 10:02:24 +0100 (Sun, 06 Jan 2008) | 1 line
Small code simplification. Forgot that classmethods can be called from intances.
........
r59766 | martin.v.loewis | 2008-01-06 11:09:48 +0100 (Sun, 06 Jan 2008) | 2 lines
Use vcbuild for VS 2009.
........
r59767 | martin.v.loewis | 2008-01-06 12:03:43 +0100 (Sun, 06 Jan 2008) | 2 lines
Package using VS 2008.
........
r59768 | martin.v.loewis | 2008-01-06 12:13:16 +0100 (Sun, 06 Jan 2008) | 2 lines
Don't try to package msvcr90 for the moment.
........
r59769 | georg.brandl | 2008-01-06 15:17:36 +0100 (Sun, 06 Jan 2008) | 4 lines
#1696393: don't check for '.' and '..' in ntpath.walk since
they aren't returned from os.listdir anymore.
Reported by Michael Haggerty.
........
r59770 | georg.brandl | 2008-01-06 15:27:15 +0100 (Sun, 06 Jan 2008) | 3 lines
#1742: don't raise exception on os.path.relpath("a", "a"), but return os.curdir.
Reported by Jesse Towner.
........
r59771 | georg.brandl | 2008-01-06 15:33:52 +0100 (Sun, 06 Jan 2008) | 2 lines
#1591: Clarify docstring of Popen3.
........
r59772 | georg.brandl | 2008-01-06 16:30:34 +0100 (Sun, 06 Jan 2008) | 2 lines
#1680: fix context manager example function name.
........
r59773 | georg.brandl | 2008-01-06 16:34:57 +0100 (Sun, 06 Jan 2008) | 2 lines
#1755097: document default values for [].sort() and sorted().
........
174 lines
6.7 KiB
Python
174 lines
6.7 KiB
Python
import ntpath
|
|
from test.test_support import verbose, TestFailed
|
|
import os
|
|
|
|
errors = 0
|
|
|
|
def tester(fn, wantResult):
|
|
global errors
|
|
fn = fn.replace("\\", "\\\\")
|
|
gotResult = eval(fn)
|
|
if wantResult != gotResult:
|
|
print("error!")
|
|
print("evaluated: " + str(fn))
|
|
print("should be: " + str(wantResult))
|
|
print(" returned: " + str(gotResult))
|
|
print("")
|
|
errors = errors + 1
|
|
|
|
tester('ntpath.splitext("foo.ext")', ('foo', '.ext'))
|
|
tester('ntpath.splitext("/foo/foo.ext")', ('/foo/foo', '.ext'))
|
|
tester('ntpath.splitext(".ext")', ('.ext', ''))
|
|
tester('ntpath.splitext("\\foo.ext\\foo")', ('\\foo.ext\\foo', ''))
|
|
tester('ntpath.splitext("foo.ext\\")', ('foo.ext\\', ''))
|
|
tester('ntpath.splitext("")', ('', ''))
|
|
tester('ntpath.splitext("foo.bar.ext")', ('foo.bar', '.ext'))
|
|
tester('ntpath.splitext("xx/foo.bar.ext")', ('xx/foo.bar', '.ext'))
|
|
tester('ntpath.splitext("xx\\foo.bar.ext")', ('xx\\foo.bar', '.ext'))
|
|
tester('ntpath.splitext("c:a/b\\c.d")', ('c:a/b\\c', '.d'))
|
|
|
|
tester('ntpath.splitdrive("c:\\foo\\bar")',
|
|
('c:', '\\foo\\bar'))
|
|
tester('ntpath.splitunc("\\\\conky\\mountpoint\\foo\\bar")',
|
|
('\\\\conky\\mountpoint', '\\foo\\bar'))
|
|
tester('ntpath.splitdrive("c:/foo/bar")',
|
|
('c:', '/foo/bar'))
|
|
tester('ntpath.splitunc("//conky/mountpoint/foo/bar")',
|
|
('//conky/mountpoint', '/foo/bar'))
|
|
|
|
tester('ntpath.split("c:\\foo\\bar")', ('c:\\foo', 'bar'))
|
|
tester('ntpath.split("\\\\conky\\mountpoint\\foo\\bar")',
|
|
('\\\\conky\\mountpoint\\foo', 'bar'))
|
|
|
|
tester('ntpath.split("c:\\")', ('c:\\', ''))
|
|
tester('ntpath.split("\\\\conky\\mountpoint\\")',
|
|
('\\\\conky\\mountpoint', ''))
|
|
|
|
tester('ntpath.split("c:/")', ('c:/', ''))
|
|
tester('ntpath.split("//conky/mountpoint/")', ('//conky/mountpoint', ''))
|
|
|
|
tester('ntpath.isabs("c:\\")', 1)
|
|
tester('ntpath.isabs("\\\\conky\\mountpoint\\")', 1)
|
|
tester('ntpath.isabs("\\foo")', 1)
|
|
tester('ntpath.isabs("\\foo\\bar")', 1)
|
|
|
|
tester('ntpath.commonprefix(["/home/swenson/spam", "/home/swen/spam"])',
|
|
"/home/swen")
|
|
tester('ntpath.commonprefix(["\\home\\swen\\spam", "\\home\\swen\\eggs"])',
|
|
"\\home\\swen\\")
|
|
tester('ntpath.commonprefix(["/home/swen/spam", "/home/swen/spam"])',
|
|
"/home/swen/spam")
|
|
|
|
tester('ntpath.join("")', '')
|
|
tester('ntpath.join("", "", "")', '')
|
|
tester('ntpath.join("a")', 'a')
|
|
tester('ntpath.join("/a")', '/a')
|
|
tester('ntpath.join("\\a")', '\\a')
|
|
tester('ntpath.join("a:")', 'a:')
|
|
tester('ntpath.join("a:", "b")', 'a:b')
|
|
tester('ntpath.join("a:", "/b")', 'a:/b')
|
|
tester('ntpath.join("a:", "\\b")', 'a:\\b')
|
|
tester('ntpath.join("a", "/b")', '/b')
|
|
tester('ntpath.join("a", "\\b")', '\\b')
|
|
tester('ntpath.join("a", "b", "c")', 'a\\b\\c')
|
|
tester('ntpath.join("a\\", "b", "c")', 'a\\b\\c')
|
|
tester('ntpath.join("a", "b\\", "c")', 'a\\b\\c')
|
|
tester('ntpath.join("a", "b", "\\c")', '\\c')
|
|
tester('ntpath.join("d:\\", "\\pleep")', 'd:\\pleep')
|
|
tester('ntpath.join("d:\\", "a", "b")', 'd:\\a\\b')
|
|
tester("ntpath.join('c:', '/a')", 'c:/a')
|
|
tester("ntpath.join('c:/', '/a')", 'c:/a')
|
|
tester("ntpath.join('c:/a', '/b')", '/b')
|
|
tester("ntpath.join('c:', 'd:/')", 'd:/')
|
|
tester("ntpath.join('c:/', 'd:/')", 'd:/')
|
|
tester("ntpath.join('c:/', 'd:/a/b')", 'd:/a/b')
|
|
|
|
tester("ntpath.join('')", '')
|
|
tester("ntpath.join('', '', '', '', '')", '')
|
|
tester("ntpath.join('a')", 'a')
|
|
tester("ntpath.join('', 'a')", 'a')
|
|
tester("ntpath.join('', '', '', '', 'a')", 'a')
|
|
tester("ntpath.join('a', '')", 'a\\')
|
|
tester("ntpath.join('a', '', '', '', '')", 'a\\')
|
|
tester("ntpath.join('a\\', '')", 'a\\')
|
|
tester("ntpath.join('a\\', '', '', '', '')", 'a\\')
|
|
|
|
tester("ntpath.normpath('A//////././//.//B')", r'A\B')
|
|
tester("ntpath.normpath('A/./B')", r'A\B')
|
|
tester("ntpath.normpath('A/foo/../B')", r'A\B')
|
|
tester("ntpath.normpath('C:A//B')", r'C:A\B')
|
|
tester("ntpath.normpath('D:A/./B')", r'D:A\B')
|
|
tester("ntpath.normpath('e:A/foo/../B')", r'e:A\B')
|
|
|
|
tester("ntpath.normpath('C:///A//B')", r'C:\A\B')
|
|
tester("ntpath.normpath('D:///A/./B')", r'D:\A\B')
|
|
tester("ntpath.normpath('e:///A/foo/../B')", r'e:\A\B')
|
|
|
|
tester("ntpath.normpath('..')", r'..')
|
|
tester("ntpath.normpath('.')", r'.')
|
|
tester("ntpath.normpath('')", r'.')
|
|
tester("ntpath.normpath('/')", '\\')
|
|
tester("ntpath.normpath('c:/')", 'c:\\')
|
|
tester("ntpath.normpath('/../.././..')", '\\')
|
|
tester("ntpath.normpath('c:/../../..')", 'c:\\')
|
|
tester("ntpath.normpath('../.././..')", r'..\..\..')
|
|
tester("ntpath.normpath('K:../.././..')", r'K:..\..\..')
|
|
tester("ntpath.normpath('C:////a/b')", r'C:\a\b')
|
|
tester("ntpath.normpath('//machine/share//a/b')", r'\\machine\share\a\b')
|
|
|
|
oldenv = os.environ.copy()
|
|
try:
|
|
os.environ.clear()
|
|
os.environ["foo"] = "bar"
|
|
os.environ["{foo"] = "baz1"
|
|
os.environ["{foo}"] = "baz2"
|
|
tester('ntpath.expandvars("foo")', "foo")
|
|
tester('ntpath.expandvars("$foo bar")', "bar bar")
|
|
tester('ntpath.expandvars("${foo}bar")', "barbar")
|
|
tester('ntpath.expandvars("$[foo]bar")', "$[foo]bar")
|
|
tester('ntpath.expandvars("$bar bar")', "$bar bar")
|
|
tester('ntpath.expandvars("$?bar")', "$?bar")
|
|
tester('ntpath.expandvars("${foo}bar")', "barbar")
|
|
tester('ntpath.expandvars("$foo}bar")', "bar}bar")
|
|
tester('ntpath.expandvars("${foo")', "${foo")
|
|
tester('ntpath.expandvars("${{foo}}")', "baz1}")
|
|
tester('ntpath.expandvars("$foo$foo")', "barbar")
|
|
tester('ntpath.expandvars("$bar$bar")', "$bar$bar")
|
|
tester('ntpath.expandvars("%foo% bar")', "bar bar")
|
|
tester('ntpath.expandvars("%foo%bar")', "barbar")
|
|
tester('ntpath.expandvars("%foo%%foo%")', "barbar")
|
|
tester('ntpath.expandvars("%%foo%%foo%foo%")', "%foo%foobar")
|
|
tester('ntpath.expandvars("%?bar%")', "%?bar%")
|
|
tester('ntpath.expandvars("%foo%%bar")', "bar%bar")
|
|
tester('ntpath.expandvars("\'%foo%\'%bar")', "\'%foo%\'%bar")
|
|
finally:
|
|
os.environ.clear()
|
|
os.environ.update(oldenv)
|
|
|
|
# ntpath.abspath() can only be used on a system with the "nt" module
|
|
# (reasonably), so we protect this test with "import nt". This allows
|
|
# the rest of the tests for the ntpath module to be run to completion
|
|
# on any platform, since most of the module is intended to be usable
|
|
# from any platform.
|
|
try:
|
|
import nt
|
|
except ImportError:
|
|
pass
|
|
else:
|
|
tester('ntpath.abspath("C:\\")', "C:\\")
|
|
|
|
currentdir = os.path.split(os.getcwd())[-1]
|
|
tester('ntpath.relpath("a")', 'a')
|
|
tester('ntpath.relpath(os.path.abspath("a"))', 'a')
|
|
tester('ntpath.relpath("a/b")', 'a\\b')
|
|
tester('ntpath.relpath("../a/b")', '..\\a\\b')
|
|
tester('ntpath.relpath("a", "../b")', '..\\'+currentdir+'\\a')
|
|
tester('ntpath.relpath("a/b", "../c")', '..\\'+currentdir+'\\a\\b')
|
|
tester('ntpath.relpath("a", "b/c")', '..\\..\\a')
|
|
tester('ntpath.relpath("//conky/mountpoint/a", "//conky/mountpoint/b/c")', '..\\..\\a')
|
|
tester('ntpath.relpath("a", "a")', '.')
|
|
|
|
if errors:
|
|
raise TestFailed(str(errors) + " errors.")
|
|
elif verbose:
|
|
print("No errors. Thank your lucky stars.")
|