2002-07-30 20:27:12 -03:00
|
|
|
from test.test_support import verify, verbose, TestFailed, sortdict
|
2000-03-28 19:51:17 -04:00
|
|
|
from UserList import UserList
|
Merged revisions 55407-55513 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/p3yk
................
r55413 | fred.drake | 2007-05-17 12:30:10 -0700 (Thu, 17 May 2007) | 1 line
fix argument name in documentation; match the implementation
................
r55430 | jack.diederich | 2007-05-18 06:39:59 -0700 (Fri, 18 May 2007) | 1 line
Implements class decorators, PEP 3129.
................
r55432 | guido.van.rossum | 2007-05-18 08:09:41 -0700 (Fri, 18 May 2007) | 2 lines
obsubmit.
................
r55434 | guido.van.rossum | 2007-05-18 09:39:10 -0700 (Fri, 18 May 2007) | 3 lines
Fix bug in test_inspect. (I presume this is how it should be fixed;
Jack Diedrich, please verify.)
................
r55460 | brett.cannon | 2007-05-20 00:31:57 -0700 (Sun, 20 May 2007) | 4 lines
Remove the imageop module. With imgfile already removed in Python 3.0 and
rgbimg gone in Python 2.6 the unit tests themselves were made worthless. Plus
third-party libraries perform the same function much better.
................
r55469 | neal.norwitz | 2007-05-20 11:28:20 -0700 (Sun, 20 May 2007) | 118 lines
Merged revisions 55324-55467 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r55348 | georg.brandl | 2007-05-15 13:19:34 -0700 (Tue, 15 May 2007) | 4 lines
HTML-escape the plain traceback in cgitb's HTML output, to prevent
the traceback inadvertently or maliciously closing the comment and
injecting HTML into the error page.
........
r55372 | neal.norwitz | 2007-05-15 21:33:50 -0700 (Tue, 15 May 2007) | 6 lines
Port rev 55353 from Guido:
Add what looks like a necessary call to PyErr_NoMemory() when PyMem_MALLOC()
fails.
Will backport.
........
r55377 | neal.norwitz | 2007-05-15 22:06:33 -0700 (Tue, 15 May 2007) | 1 line
Mention removal of some directories for obsolete platforms
........
r55380 | brett.cannon | 2007-05-15 22:50:03 -0700 (Tue, 15 May 2007) | 2 lines
Change the maintainer of the BeOS port.
........
r55383 | georg.brandl | 2007-05-16 06:44:18 -0700 (Wed, 16 May 2007) | 2 lines
Bug #1719995: don't use deprecated method in sets example.
........
r55386 | neal.norwitz | 2007-05-16 13:05:11 -0700 (Wed, 16 May 2007) | 5 lines
Fix bug in marshal where bad data would cause a segfault due to
lack of an infinite recursion check.
Contributed by Damien Miller at Google.
........
r55389 | brett.cannon | 2007-05-16 15:42:29 -0700 (Wed, 16 May 2007) | 6 lines
Remove the gopherlib module. It has been raising a DeprecationWarning since
Python 2.5.
Also remove gopher support from urllib/urllib2. As both imported gopherlib the
usage of the support would have raised a DeprecationWarning.
........
r55394 | raymond.hettinger | 2007-05-16 18:08:04 -0700 (Wed, 16 May 2007) | 1 line
calendar.py gets no benefit from xrange() instead of range()
........
r55395 | brett.cannon | 2007-05-16 19:02:56 -0700 (Wed, 16 May 2007) | 3 lines
Complete deprecation of BaseException.message. Some subclasses were directly
accessing the message attribute instead of using the descriptor.
........
r55396 | neal.norwitz | 2007-05-16 23:11:36 -0700 (Wed, 16 May 2007) | 4 lines
Reduce the max stack depth to see if this fixes the segfaults on
Windows and some other boxes. If this is successful, this rev should
be backported. I'm not sure how close to the limit we should push this.
........
r55397 | neal.norwitz | 2007-05-16 23:23:50 -0700 (Wed, 16 May 2007) | 4 lines
Set the depth to something very small to try to determine if the
crashes on Windows are really due to the stack size or possibly
some other problem.
........
r55398 | neal.norwitz | 2007-05-17 00:04:46 -0700 (Thu, 17 May 2007) | 4 lines
Last try for tweaking the max stack depth. 5000 was the original value,
4000 didn't work either. 1000 does work on Windows. If 2000 works,
that will hopefully be a reasonable balance.
........
r55412 | fred.drake | 2007-05-17 12:29:58 -0700 (Thu, 17 May 2007) | 1 line
fix argument name in documentation; match the implementation
........
r55427 | neal.norwitz | 2007-05-17 22:47:16 -0700 (Thu, 17 May 2007) | 1 line
Verify neither dumps or loads overflow the stack and segfault.
........
r55446 | collin.winter | 2007-05-18 16:11:24 -0700 (Fri, 18 May 2007) | 1 line
Backport PEP 3110's new 'except' syntax to 2.6.
........
r55448 | raymond.hettinger | 2007-05-18 18:11:16 -0700 (Fri, 18 May 2007) | 1 line
Improvements to NamedTuple's implementation, tests, and documentation
........
r55449 | raymond.hettinger | 2007-05-18 18:50:11 -0700 (Fri, 18 May 2007) | 1 line
Fix beginner mistake -- don't mix spaces and tabs.
........
r55450 | neal.norwitz | 2007-05-18 20:48:47 -0700 (Fri, 18 May 2007) | 1 line
Clear data so random memory does not get freed. Will backport.
........
r55452 | neal.norwitz | 2007-05-18 21:34:55 -0700 (Fri, 18 May 2007) | 3 lines
Whoops, need to pay attention to those test failures.
Move the clear to *before* the first use, not after.
........
r55453 | neal.norwitz | 2007-05-18 21:35:52 -0700 (Fri, 18 May 2007) | 1 line
Give some clue as to what happened if the test fails.
........
r55455 | georg.brandl | 2007-05-19 11:09:26 -0700 (Sat, 19 May 2007) | 2 lines
Fix docstring for add_package in site.py.
........
r55458 | brett.cannon | 2007-05-20 00:09:50 -0700 (Sun, 20 May 2007) | 2 lines
Remove the rgbimg module. It has been deprecated since Python 2.5.
........
r55465 | nick.coghlan | 2007-05-20 04:12:49 -0700 (Sun, 20 May 2007) | 1 line
Fix typo in example (should be backported, but my maintenance branch is woefully out of date)
........
................
r55472 | brett.cannon | 2007-05-20 12:06:18 -0700 (Sun, 20 May 2007) | 2 lines
Remove imageop from the Windows build process.
................
r55486 | neal.norwitz | 2007-05-20 23:59:52 -0700 (Sun, 20 May 2007) | 1 line
Remove callable() builtin
................
r55506 | neal.norwitz | 2007-05-22 00:43:29 -0700 (Tue, 22 May 2007) | 78 lines
Merged revisions 55468-55505 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r55468 | neal.norwitz | 2007-05-20 11:06:27 -0700 (Sun, 20 May 2007) | 1 line
rotor is long gone.
........
r55470 | neal.norwitz | 2007-05-20 11:43:00 -0700 (Sun, 20 May 2007) | 1 line
Update directories/files at the top-level.
........
r55471 | brett.cannon | 2007-05-20 12:05:06 -0700 (Sun, 20 May 2007) | 2 lines
Try to remove rgbimg from Windows builds.
........
r55474 | brett.cannon | 2007-05-20 16:17:38 -0700 (Sun, 20 May 2007) | 4 lines
Remove the macfs module. This led to the deprecation of macostools.touched();
it completely relied on macfs and is a no-op on OS X according to code
comments.
........
r55476 | brett.cannon | 2007-05-20 16:56:18 -0700 (Sun, 20 May 2007) | 3 lines
Move imgfile import to the global namespace to trigger an import error ASAP to
prevent creation of a test file.
........
r55477 | brett.cannon | 2007-05-20 16:57:38 -0700 (Sun, 20 May 2007) | 3 lines
Cause posixfile to raise a DeprecationWarning. Documented as deprecated since
Ptyhon 1.5.
........
r55479 | andrew.kuchling | 2007-05-20 17:03:15 -0700 (Sun, 20 May 2007) | 1 line
Note removed modules
........
r55481 | martin.v.loewis | 2007-05-20 21:35:47 -0700 (Sun, 20 May 2007) | 2 lines
Add Alexandre Vassalotti.
........
r55482 | george.yoshida | 2007-05-20 21:41:21 -0700 (Sun, 20 May 2007) | 4 lines
fix against r55474 [Remove the macfs module]
Remove "libmacfs.tex" from Makefile.deps and mac/mac.tex.
........
r55487 | raymond.hettinger | 2007-05-21 01:13:35 -0700 (Mon, 21 May 2007) | 1 line
Replace assertion with straight error-checking.
........
r55489 | raymond.hettinger | 2007-05-21 09:40:10 -0700 (Mon, 21 May 2007) | 1 line
Allow all alphanumeric and underscores in type and field names.
........
r55490 | facundo.batista | 2007-05-21 10:32:32 -0700 (Mon, 21 May 2007) | 5 lines
Added timeout support to HTTPSConnection, through the
socket.create_connection function. Also added a small
test for this, and updated NEWS file.
........
r55495 | georg.brandl | 2007-05-21 13:34:16 -0700 (Mon, 21 May 2007) | 2 lines
Patch #1686487: you can now pass any mapping after '**' in function calls.
........
r55502 | neal.norwitz | 2007-05-21 23:03:36 -0700 (Mon, 21 May 2007) | 1 line
Document new params to HTTPSConnection
........
r55504 | neal.norwitz | 2007-05-22 00:16:10 -0700 (Tue, 22 May 2007) | 1 line
Stop using METH_OLDARGS
........
r55505 | neal.norwitz | 2007-05-22 00:16:44 -0700 (Tue, 22 May 2007) | 1 line
Stop using METH_OLDARGS implicitly
........
................
2007-05-22 15:11:13 -03:00
|
|
|
from UserDict import UserDict
|
2000-03-28 19:51:17 -04:00
|
|
|
|
2003-05-31 04:04:16 -03:00
|
|
|
def e(a, b):
|
2007-02-09 01:37:30 -04:00
|
|
|
print(a, b)
|
2003-05-31 04:04:16 -03:00
|
|
|
|
2000-03-28 19:51:17 -04:00
|
|
|
def f(*a, **k):
|
2007-02-09 01:37:30 -04:00
|
|
|
print(a, sortdict(k))
|
2000-03-28 19:51:17 -04:00
|
|
|
|
|
|
|
def g(x, *y, **z):
|
2007-02-09 01:37:30 -04:00
|
|
|
print(x, y, sortdict(z))
|
2000-03-28 19:51:17 -04:00
|
|
|
|
|
|
|
def h(j=1, a=2, h=3):
|
2007-02-09 01:37:30 -04:00
|
|
|
print(j, a, h)
|
2000-03-28 19:51:17 -04:00
|
|
|
|
|
|
|
f()
|
|
|
|
f(1)
|
|
|
|
f(1, 2)
|
|
|
|
f(1, 2, 3)
|
|
|
|
|
|
|
|
f(1, 2, 3, *(4, 5))
|
|
|
|
f(1, 2, 3, *[4, 5])
|
2000-03-28 19:53:22 -04:00
|
|
|
f(1, 2, 3, *UserList([4, 5]))
|
2000-03-28 19:51:17 -04:00
|
|
|
f(1, 2, 3, **{'a':4, 'b':5})
|
|
|
|
f(1, 2, 3, *(4, 5), **{'a':6, 'b':7})
|
|
|
|
f(1, 2, 3, x=4, y=5, *(6, 7), **{'a':8, 'b':9})
|
|
|
|
|
Merged revisions 55407-55513 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/p3yk
................
r55413 | fred.drake | 2007-05-17 12:30:10 -0700 (Thu, 17 May 2007) | 1 line
fix argument name in documentation; match the implementation
................
r55430 | jack.diederich | 2007-05-18 06:39:59 -0700 (Fri, 18 May 2007) | 1 line
Implements class decorators, PEP 3129.
................
r55432 | guido.van.rossum | 2007-05-18 08:09:41 -0700 (Fri, 18 May 2007) | 2 lines
obsubmit.
................
r55434 | guido.van.rossum | 2007-05-18 09:39:10 -0700 (Fri, 18 May 2007) | 3 lines
Fix bug in test_inspect. (I presume this is how it should be fixed;
Jack Diedrich, please verify.)
................
r55460 | brett.cannon | 2007-05-20 00:31:57 -0700 (Sun, 20 May 2007) | 4 lines
Remove the imageop module. With imgfile already removed in Python 3.0 and
rgbimg gone in Python 2.6 the unit tests themselves were made worthless. Plus
third-party libraries perform the same function much better.
................
r55469 | neal.norwitz | 2007-05-20 11:28:20 -0700 (Sun, 20 May 2007) | 118 lines
Merged revisions 55324-55467 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r55348 | georg.brandl | 2007-05-15 13:19:34 -0700 (Tue, 15 May 2007) | 4 lines
HTML-escape the plain traceback in cgitb's HTML output, to prevent
the traceback inadvertently or maliciously closing the comment and
injecting HTML into the error page.
........
r55372 | neal.norwitz | 2007-05-15 21:33:50 -0700 (Tue, 15 May 2007) | 6 lines
Port rev 55353 from Guido:
Add what looks like a necessary call to PyErr_NoMemory() when PyMem_MALLOC()
fails.
Will backport.
........
r55377 | neal.norwitz | 2007-05-15 22:06:33 -0700 (Tue, 15 May 2007) | 1 line
Mention removal of some directories for obsolete platforms
........
r55380 | brett.cannon | 2007-05-15 22:50:03 -0700 (Tue, 15 May 2007) | 2 lines
Change the maintainer of the BeOS port.
........
r55383 | georg.brandl | 2007-05-16 06:44:18 -0700 (Wed, 16 May 2007) | 2 lines
Bug #1719995: don't use deprecated method in sets example.
........
r55386 | neal.norwitz | 2007-05-16 13:05:11 -0700 (Wed, 16 May 2007) | 5 lines
Fix bug in marshal where bad data would cause a segfault due to
lack of an infinite recursion check.
Contributed by Damien Miller at Google.
........
r55389 | brett.cannon | 2007-05-16 15:42:29 -0700 (Wed, 16 May 2007) | 6 lines
Remove the gopherlib module. It has been raising a DeprecationWarning since
Python 2.5.
Also remove gopher support from urllib/urllib2. As both imported gopherlib the
usage of the support would have raised a DeprecationWarning.
........
r55394 | raymond.hettinger | 2007-05-16 18:08:04 -0700 (Wed, 16 May 2007) | 1 line
calendar.py gets no benefit from xrange() instead of range()
........
r55395 | brett.cannon | 2007-05-16 19:02:56 -0700 (Wed, 16 May 2007) | 3 lines
Complete deprecation of BaseException.message. Some subclasses were directly
accessing the message attribute instead of using the descriptor.
........
r55396 | neal.norwitz | 2007-05-16 23:11:36 -0700 (Wed, 16 May 2007) | 4 lines
Reduce the max stack depth to see if this fixes the segfaults on
Windows and some other boxes. If this is successful, this rev should
be backported. I'm not sure how close to the limit we should push this.
........
r55397 | neal.norwitz | 2007-05-16 23:23:50 -0700 (Wed, 16 May 2007) | 4 lines
Set the depth to something very small to try to determine if the
crashes on Windows are really due to the stack size or possibly
some other problem.
........
r55398 | neal.norwitz | 2007-05-17 00:04:46 -0700 (Thu, 17 May 2007) | 4 lines
Last try for tweaking the max stack depth. 5000 was the original value,
4000 didn't work either. 1000 does work on Windows. If 2000 works,
that will hopefully be a reasonable balance.
........
r55412 | fred.drake | 2007-05-17 12:29:58 -0700 (Thu, 17 May 2007) | 1 line
fix argument name in documentation; match the implementation
........
r55427 | neal.norwitz | 2007-05-17 22:47:16 -0700 (Thu, 17 May 2007) | 1 line
Verify neither dumps or loads overflow the stack and segfault.
........
r55446 | collin.winter | 2007-05-18 16:11:24 -0700 (Fri, 18 May 2007) | 1 line
Backport PEP 3110's new 'except' syntax to 2.6.
........
r55448 | raymond.hettinger | 2007-05-18 18:11:16 -0700 (Fri, 18 May 2007) | 1 line
Improvements to NamedTuple's implementation, tests, and documentation
........
r55449 | raymond.hettinger | 2007-05-18 18:50:11 -0700 (Fri, 18 May 2007) | 1 line
Fix beginner mistake -- don't mix spaces and tabs.
........
r55450 | neal.norwitz | 2007-05-18 20:48:47 -0700 (Fri, 18 May 2007) | 1 line
Clear data so random memory does not get freed. Will backport.
........
r55452 | neal.norwitz | 2007-05-18 21:34:55 -0700 (Fri, 18 May 2007) | 3 lines
Whoops, need to pay attention to those test failures.
Move the clear to *before* the first use, not after.
........
r55453 | neal.norwitz | 2007-05-18 21:35:52 -0700 (Fri, 18 May 2007) | 1 line
Give some clue as to what happened if the test fails.
........
r55455 | georg.brandl | 2007-05-19 11:09:26 -0700 (Sat, 19 May 2007) | 2 lines
Fix docstring for add_package in site.py.
........
r55458 | brett.cannon | 2007-05-20 00:09:50 -0700 (Sun, 20 May 2007) | 2 lines
Remove the rgbimg module. It has been deprecated since Python 2.5.
........
r55465 | nick.coghlan | 2007-05-20 04:12:49 -0700 (Sun, 20 May 2007) | 1 line
Fix typo in example (should be backported, but my maintenance branch is woefully out of date)
........
................
r55472 | brett.cannon | 2007-05-20 12:06:18 -0700 (Sun, 20 May 2007) | 2 lines
Remove imageop from the Windows build process.
................
r55486 | neal.norwitz | 2007-05-20 23:59:52 -0700 (Sun, 20 May 2007) | 1 line
Remove callable() builtin
................
r55506 | neal.norwitz | 2007-05-22 00:43:29 -0700 (Tue, 22 May 2007) | 78 lines
Merged revisions 55468-55505 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r55468 | neal.norwitz | 2007-05-20 11:06:27 -0700 (Sun, 20 May 2007) | 1 line
rotor is long gone.
........
r55470 | neal.norwitz | 2007-05-20 11:43:00 -0700 (Sun, 20 May 2007) | 1 line
Update directories/files at the top-level.
........
r55471 | brett.cannon | 2007-05-20 12:05:06 -0700 (Sun, 20 May 2007) | 2 lines
Try to remove rgbimg from Windows builds.
........
r55474 | brett.cannon | 2007-05-20 16:17:38 -0700 (Sun, 20 May 2007) | 4 lines
Remove the macfs module. This led to the deprecation of macostools.touched();
it completely relied on macfs and is a no-op on OS X according to code
comments.
........
r55476 | brett.cannon | 2007-05-20 16:56:18 -0700 (Sun, 20 May 2007) | 3 lines
Move imgfile import to the global namespace to trigger an import error ASAP to
prevent creation of a test file.
........
r55477 | brett.cannon | 2007-05-20 16:57:38 -0700 (Sun, 20 May 2007) | 3 lines
Cause posixfile to raise a DeprecationWarning. Documented as deprecated since
Ptyhon 1.5.
........
r55479 | andrew.kuchling | 2007-05-20 17:03:15 -0700 (Sun, 20 May 2007) | 1 line
Note removed modules
........
r55481 | martin.v.loewis | 2007-05-20 21:35:47 -0700 (Sun, 20 May 2007) | 2 lines
Add Alexandre Vassalotti.
........
r55482 | george.yoshida | 2007-05-20 21:41:21 -0700 (Sun, 20 May 2007) | 4 lines
fix against r55474 [Remove the macfs module]
Remove "libmacfs.tex" from Makefile.deps and mac/mac.tex.
........
r55487 | raymond.hettinger | 2007-05-21 01:13:35 -0700 (Mon, 21 May 2007) | 1 line
Replace assertion with straight error-checking.
........
r55489 | raymond.hettinger | 2007-05-21 09:40:10 -0700 (Mon, 21 May 2007) | 1 line
Allow all alphanumeric and underscores in type and field names.
........
r55490 | facundo.batista | 2007-05-21 10:32:32 -0700 (Mon, 21 May 2007) | 5 lines
Added timeout support to HTTPSConnection, through the
socket.create_connection function. Also added a small
test for this, and updated NEWS file.
........
r55495 | georg.brandl | 2007-05-21 13:34:16 -0700 (Mon, 21 May 2007) | 2 lines
Patch #1686487: you can now pass any mapping after '**' in function calls.
........
r55502 | neal.norwitz | 2007-05-21 23:03:36 -0700 (Mon, 21 May 2007) | 1 line
Document new params to HTTPSConnection
........
r55504 | neal.norwitz | 2007-05-22 00:16:10 -0700 (Tue, 22 May 2007) | 1 line
Stop using METH_OLDARGS
........
r55505 | neal.norwitz | 2007-05-22 00:16:44 -0700 (Tue, 22 May 2007) | 1 line
Stop using METH_OLDARGS implicitly
........
................
2007-05-22 15:11:13 -03:00
|
|
|
|
|
|
|
f(1, 2, 3, **UserDict(a=4, b=5))
|
|
|
|
f(1, 2, 3, *(4, 5), **UserDict(a=6, b=7))
|
|
|
|
f(1, 2, 3, x=4, y=5, *(6, 7), **UserDict(a=8, b=9))
|
|
|
|
|
|
|
|
|
2003-05-31 04:04:16 -03:00
|
|
|
# Verify clearing of SF bug #733667
|
|
|
|
try:
|
|
|
|
e(c=3)
|
|
|
|
except TypeError:
|
|
|
|
pass
|
|
|
|
else:
|
2007-02-09 01:37:30 -04:00
|
|
|
print("should raise TypeError: e() got an unexpected keyword argument 'c'")
|
2003-05-31 04:04:16 -03:00
|
|
|
|
2000-03-28 19:51:17 -04:00
|
|
|
try:
|
|
|
|
g()
|
2007-01-10 12:19:56 -04:00
|
|
|
except TypeError as err:
|
2007-02-09 01:37:30 -04:00
|
|
|
print("TypeError:", err)
|
2000-03-28 19:51:17 -04:00
|
|
|
else:
|
2007-02-09 01:37:30 -04:00
|
|
|
print("should raise TypeError: not enough arguments; expected 1, got 0")
|
2000-10-23 14:22:08 -03:00
|
|
|
|
2000-03-28 19:51:17 -04:00
|
|
|
try:
|
|
|
|
g(*())
|
2007-01-10 12:19:56 -04:00
|
|
|
except TypeError as err:
|
2007-02-09 01:37:30 -04:00
|
|
|
print("TypeError:", err)
|
2000-03-28 19:51:17 -04:00
|
|
|
else:
|
2007-02-09 01:37:30 -04:00
|
|
|
print("should raise TypeError: not enough arguments; expected 1, got 0")
|
2000-10-23 14:22:08 -03:00
|
|
|
|
2000-03-28 19:51:17 -04:00
|
|
|
try:
|
|
|
|
g(*(), **{})
|
2007-01-10 12:19:56 -04:00
|
|
|
except TypeError as err:
|
2007-02-09 01:37:30 -04:00
|
|
|
print("TypeError:", err)
|
2000-03-28 19:51:17 -04:00
|
|
|
else:
|
2007-02-09 01:37:30 -04:00
|
|
|
print("should raise TypeError: not enough arguments; expected 1, got 0")
|
2000-10-23 14:22:08 -03:00
|
|
|
|
2000-03-28 19:51:17 -04:00
|
|
|
g(1)
|
|
|
|
g(1, 2)
|
|
|
|
g(1, 2, 3)
|
|
|
|
g(1, 2, 3, *(4, 5))
|
2000-03-30 19:55:31 -04:00
|
|
|
class Nothing: pass
|
|
|
|
try:
|
|
|
|
g(*Nothing())
|
2007-01-10 12:19:56 -04:00
|
|
|
except TypeError as attr:
|
2000-04-10 10:37:14 -03:00
|
|
|
pass
|
2000-03-30 19:55:31 -04:00
|
|
|
else:
|
2007-02-09 01:37:30 -04:00
|
|
|
print("should raise TypeError")
|
2000-03-30 19:55:31 -04:00
|
|
|
|
|
|
|
class Nothing:
|
|
|
|
def __len__(self):
|
|
|
|
return 5
|
|
|
|
try:
|
|
|
|
g(*Nothing())
|
2007-01-10 12:19:56 -04:00
|
|
|
except TypeError as attr:
|
2000-04-10 10:37:14 -03:00
|
|
|
pass
|
2000-03-30 19:55:31 -04:00
|
|
|
else:
|
2007-02-09 01:37:30 -04:00
|
|
|
print("should raise TypeError")
|
2000-10-23 14:22:08 -03:00
|
|
|
|
2000-03-30 19:55:31 -04:00
|
|
|
class Nothing:
|
|
|
|
def __len__(self):
|
|
|
|
return 5
|
|
|
|
def __getitem__(self, i):
|
|
|
|
if i < 3:
|
|
|
|
return i
|
|
|
|
else:
|
|
|
|
raise IndexError, i
|
|
|
|
g(*Nothing())
|
|
|
|
|
2004-02-21 17:03:30 -04:00
|
|
|
class Nothing:
|
|
|
|
def __init__(self):
|
|
|
|
self.c = 0
|
|
|
|
def __iter__(self):
|
|
|
|
return self
|
|
|
|
try:
|
|
|
|
g(*Nothing())
|
2007-01-10 12:19:56 -04:00
|
|
|
except TypeError as attr:
|
2004-02-21 17:03:30 -04:00
|
|
|
pass
|
|
|
|
else:
|
2007-02-09 01:37:30 -04:00
|
|
|
print("should raise TypeError")
|
2004-02-21 17:03:30 -04:00
|
|
|
|
|
|
|
class Nothing:
|
|
|
|
def __init__(self):
|
|
|
|
self.c = 0
|
|
|
|
def __iter__(self):
|
|
|
|
return self
|
2007-04-21 12:47:16 -03:00
|
|
|
def __next__(self):
|
2004-02-21 17:03:30 -04:00
|
|
|
if self.c == 4:
|
|
|
|
raise StopIteration
|
|
|
|
c = self.c
|
|
|
|
self.c += 1
|
|
|
|
return c
|
|
|
|
g(*Nothing())
|
|
|
|
|
2000-03-30 19:55:31 -04:00
|
|
|
# make sure the function call doesn't stomp on the dictionary?
|
|
|
|
d = {'a': 1, 'b': 2, 'c': 3}
|
|
|
|
d2 = d.copy()
|
2001-01-17 15:11:13 -04:00
|
|
|
verify(d == d2)
|
2000-03-30 19:55:31 -04:00
|
|
|
g(1, d=4, **d)
|
2007-02-09 01:37:30 -04:00
|
|
|
print(sortdict(d))
|
|
|
|
print(sortdict(d2))
|
2001-01-17 15:11:13 -04:00
|
|
|
verify(d == d2, "function call modified dictionary")
|
2000-03-30 19:55:31 -04:00
|
|
|
|
|
|
|
# what about willful misconduct?
|
|
|
|
def saboteur(**kw):
|
2000-07-14 21:42:09 -03:00
|
|
|
kw['x'] = locals() # yields a cyclic kw
|
|
|
|
return kw
|
2000-03-30 19:55:31 -04:00
|
|
|
d = {}
|
2000-07-14 21:42:09 -03:00
|
|
|
kw = saboteur(a=1, **d)
|
2001-01-17 15:11:13 -04:00
|
|
|
verify(d == {})
|
2000-07-14 21:42:09 -03:00
|
|
|
# break the cycle
|
|
|
|
del kw['x']
|
2000-10-23 14:22:08 -03:00
|
|
|
|
2000-03-28 19:51:17 -04:00
|
|
|
try:
|
|
|
|
g(1, 2, 3, **{'x':4, 'y':5})
|
2007-01-10 12:19:56 -04:00
|
|
|
except TypeError as err:
|
2007-02-09 01:37:30 -04:00
|
|
|
print(err)
|
2000-03-28 19:51:17 -04:00
|
|
|
else:
|
2007-02-09 01:37:30 -04:00
|
|
|
print("should raise TypeError: keyword parameter redefined")
|
2000-10-23 14:22:08 -03:00
|
|
|
|
2000-03-28 19:51:17 -04:00
|
|
|
try:
|
|
|
|
g(1, 2, 3, a=4, b=5, *(6, 7), **{'a':8, 'b':9})
|
2007-01-10 12:19:56 -04:00
|
|
|
except TypeError as err:
|
2007-02-09 01:37:30 -04:00
|
|
|
print(err)
|
2000-03-28 19:51:17 -04:00
|
|
|
else:
|
2007-02-09 01:37:30 -04:00
|
|
|
print("should raise TypeError: keyword parameter redefined")
|
2000-03-28 19:51:17 -04:00
|
|
|
|
|
|
|
try:
|
|
|
|
f(**{1:2})
|
2007-01-10 12:19:56 -04:00
|
|
|
except TypeError as err:
|
2007-02-09 01:37:30 -04:00
|
|
|
print(err)
|
2000-03-28 19:51:17 -04:00
|
|
|
else:
|
2007-02-09 01:37:30 -04:00
|
|
|
print("should raise TypeError: keywords must be strings")
|
2000-03-28 19:51:17 -04:00
|
|
|
|
|
|
|
try:
|
|
|
|
h(**{'e': 2})
|
2007-01-10 12:19:56 -04:00
|
|
|
except TypeError as err:
|
2007-02-09 01:37:30 -04:00
|
|
|
print(err)
|
2000-03-28 19:51:17 -04:00
|
|
|
else:
|
2007-02-09 01:37:30 -04:00
|
|
|
print("should raise TypeError: unexpected keyword argument: e")
|
2000-03-28 19:51:17 -04:00
|
|
|
|
|
|
|
try:
|
|
|
|
h(*h)
|
2007-01-10 12:19:56 -04:00
|
|
|
except TypeError as err:
|
2007-02-09 01:37:30 -04:00
|
|
|
print(err)
|
2000-03-28 19:51:17 -04:00
|
|
|
else:
|
2007-02-09 01:37:30 -04:00
|
|
|
print("should raise TypeError: * argument must be a tuple")
|
2000-03-28 19:51:17 -04:00
|
|
|
|
2001-04-11 10:53:35 -03:00
|
|
|
try:
|
|
|
|
dir(*h)
|
2007-01-10 12:19:56 -04:00
|
|
|
except TypeError as err:
|
2007-02-09 01:37:30 -04:00
|
|
|
print(err)
|
2001-04-11 10:53:35 -03:00
|
|
|
else:
|
2007-02-09 01:37:30 -04:00
|
|
|
print("should raise TypeError: * argument must be a tuple")
|
2001-04-11 10:53:35 -03:00
|
|
|
|
|
|
|
try:
|
|
|
|
None(*h)
|
2007-01-10 12:19:56 -04:00
|
|
|
except TypeError as err:
|
2007-02-09 01:37:30 -04:00
|
|
|
print(err)
|
2001-04-11 10:53:35 -03:00
|
|
|
else:
|
2007-02-09 01:37:30 -04:00
|
|
|
print("should raise TypeError: * argument must be a tuple")
|
2001-04-11 10:53:35 -03:00
|
|
|
|
2000-03-28 19:51:17 -04:00
|
|
|
try:
|
|
|
|
h(**h)
|
2007-01-10 12:19:56 -04:00
|
|
|
except TypeError as err:
|
2007-02-09 01:37:30 -04:00
|
|
|
print(err)
|
2000-03-28 19:51:17 -04:00
|
|
|
else:
|
2007-02-09 01:37:30 -04:00
|
|
|
print("should raise TypeError: ** argument must be a dictionary")
|
2000-03-28 19:51:17 -04:00
|
|
|
|
2001-04-11 10:53:35 -03:00
|
|
|
try:
|
|
|
|
dir(**h)
|
2007-01-10 12:19:56 -04:00
|
|
|
except TypeError as err:
|
2007-02-09 01:37:30 -04:00
|
|
|
print(err)
|
2001-04-11 10:53:35 -03:00
|
|
|
else:
|
2007-02-09 01:37:30 -04:00
|
|
|
print("should raise TypeError: ** argument must be a dictionary")
|
2001-04-11 10:53:35 -03:00
|
|
|
|
|
|
|
try:
|
|
|
|
None(**h)
|
2007-01-10 12:19:56 -04:00
|
|
|
except TypeError as err:
|
2007-02-09 01:37:30 -04:00
|
|
|
print(err)
|
2001-04-11 10:53:35 -03:00
|
|
|
else:
|
2007-02-09 01:37:30 -04:00
|
|
|
print("should raise TypeError: ** argument must be a dictionary")
|
2001-04-11 10:53:35 -03:00
|
|
|
|
|
|
|
try:
|
|
|
|
dir(b=1,**{'b':1})
|
2007-01-10 12:19:56 -04:00
|
|
|
except TypeError as err:
|
2007-02-09 01:37:30 -04:00
|
|
|
print(err)
|
2001-04-11 10:53:35 -03:00
|
|
|
else:
|
2007-02-09 01:37:30 -04:00
|
|
|
print("should raise TypeError: dir() got multiple values for keyword argument 'b'")
|
2001-04-11 10:53:35 -03:00
|
|
|
|
2000-03-28 19:51:17 -04:00
|
|
|
def f2(*a, **b):
|
|
|
|
return a, b
|
|
|
|
|
|
|
|
d = {}
|
|
|
|
for i in range(512):
|
|
|
|
key = 'k%d' % i
|
|
|
|
d[key] = i
|
|
|
|
a, b = f2(1, *(2, 3), **d)
|
2007-02-09 01:37:30 -04:00
|
|
|
print(len(a), len(b), b == d)
|
2000-10-30 13:15:20 -04:00
|
|
|
|
|
|
|
class Foo:
|
|
|
|
def method(self, arg1, arg2):
|
|
|
|
return arg1 + arg2
|
|
|
|
|
|
|
|
x = Foo()
|
2007-02-09 01:37:30 -04:00
|
|
|
print(Foo.method(*(x, 1, 2)))
|
|
|
|
print(Foo.method(x, *(1, 2)))
|
2000-10-30 13:15:20 -04:00
|
|
|
try:
|
2007-02-09 01:37:30 -04:00
|
|
|
print(Foo.method(*(1, 2, 3)))
|
2007-01-10 12:19:56 -04:00
|
|
|
except TypeError as err:
|
2001-08-24 16:11:57 -03:00
|
|
|
pass
|
|
|
|
else:
|
2007-02-09 01:37:30 -04:00
|
|
|
print('expected a TypeError for unbound method call')
|
2000-10-30 13:15:20 -04:00
|
|
|
try:
|
2007-02-09 01:37:30 -04:00
|
|
|
print(Foo.method(1, *(2, 3)))
|
2007-01-10 12:19:56 -04:00
|
|
|
except TypeError as err:
|
2001-08-24 16:11:57 -03:00
|
|
|
pass
|
|
|
|
else:
|
2007-02-09 01:37:30 -04:00
|
|
|
print('expected a TypeError for unbound method call')
|
2000-10-30 13:15:20 -04:00
|
|
|
|
2001-01-04 18:33:02 -04:00
|
|
|
# A PyCFunction that takes only positional parameters should allow an
|
|
|
|
# empty keyword dictionary to pass without a complaint, but raise a
|
|
|
|
# TypeError if the dictionary is non-empty.
|
|
|
|
id(1, **{})
|
|
|
|
try:
|
|
|
|
id(1, **{"foo": 1})
|
|
|
|
except TypeError:
|
|
|
|
pass
|
|
|
|
else:
|
|
|
|
raise TestFailed, 'expected TypeError; no exception raised'
|
2001-01-15 18:14:16 -04:00
|
|
|
|
|
|
|
a, b, d, e, v, k = 'A', 'B', 'D', 'E', 'V', 'K'
|
|
|
|
funcs = []
|
|
|
|
maxargs = {}
|
|
|
|
for args in ['', 'a', 'ab']:
|
|
|
|
for defargs in ['', 'd', 'de']:
|
|
|
|
for vararg in ['', 'v']:
|
|
|
|
for kwarg in ['', 'k']:
|
|
|
|
name = 'z' + args + defargs + vararg + kwarg
|
Merged revisions 56125-56153 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/p3yk
........
r56127 | georg.brandl | 2007-06-30 09:32:49 +0200 (Sat, 30 Jun 2007) | 2 lines
Fix a place where floor division would be in order.
........
r56135 | guido.van.rossum | 2007-07-01 06:13:54 +0200 (Sun, 01 Jul 2007) | 28 lines
Make map() and filter() identical to itertools.imap() and .ifilter(),
respectively.
I fixed two bootstrap issues, due to the dynamic import of itertools:
1. Starting python requires that map() and filter() are not used until
site.py has added build/lib.<arch> to sys.path.
2. Building python requires that setup.py and distutils and everything
they use is free of map() and filter() calls.
Beyond this, I only fixed the tests in test_builtin.py.
Others, please help fixing the remaining tests that are now broken!
The fixes are usually simple:
a. map(None, X) -> list(X)
b. map(F, X) -> list(map(F, X))
c. map(lambda x: F(x), X) -> [F(x) for x in X]
d. filter(F, X) -> list(filter(F, X))
e. filter(lambda x: P(x), X) -> [x for x in X if P(x)]
Someone, please also contribute a fixer for 2to3 to do this.
It can leave map()/filter() calls alone that are already
inside a list() or sorted() call or for-loop.
Only in rare cases have I seen code that depends on map() of lists
of different lengths going to the end of the longest, or on filter()
of a string or tuple returning an object of the same type; these
will need more thought to fix.
........
r56136 | guido.van.rossum | 2007-07-01 06:22:01 +0200 (Sun, 01 Jul 2007) | 3 lines
Make it so that test_decimal fails instead of hangs, to help automated
test runners.
........
r56139 | georg.brandl | 2007-07-01 18:20:58 +0200 (Sun, 01 Jul 2007) | 2 lines
Fix a few test cases after the map->imap change.
........
r56142 | neal.norwitz | 2007-07-02 06:38:12 +0200 (Mon, 02 Jul 2007) | 1 line
Get a bunch more tests passing after converting map/filter to return iterators.
........
r56147 | guido.van.rossum | 2007-07-02 15:32:02 +0200 (Mon, 02 Jul 2007) | 4 lines
Fix the remaining failing unit tests (at least on OSX).
Also tweaked urllib2 so it doesn't raise socket.gaierror when
all network interfaces are turned off.
........
2007-07-03 05:25:58 -03:00
|
|
|
arglist = list(args) + ['%s="%s"' % (x, x) for x in defargs]
|
2001-01-15 18:14:16 -04:00
|
|
|
if vararg: arglist.append('*' + vararg)
|
|
|
|
if kwarg: arglist.append('**' + kwarg)
|
* Remove PRINT_ITEM(_TO), PRINT_NEWLINE(_TO) opcodes.
* Fix some docstrings and one Print -> print.
* Fix test_{class,code,descrtut,dis,extcall,parser,popen,pkg,subprocess,syntax,traceback}.
These were the ones that generated code with a print statement.
In most remaining failing tests there's an issue with the soft space.
2007-02-09 17:28:07 -04:00
|
|
|
decl = (('def %s(%s): print("ok %s", a, b, d, e, v, ' +
|
|
|
|
'type(k) is type ("") and k or sortdict(k))')
|
Get rid of the superstitious "~" in dict hashing's "i = (~hash) & mask".
The comment following used to say:
/* We use ~hash instead of hash, as degenerate hash functions, such
as for ints <sigh>, can have lots of leading zeros. It's not
really a performance risk, but better safe than sorry.
12-Dec-00 tim: so ~hash produces lots of leading ones instead --
what's the gain? */
That is, there was never a good reason for doing it. And to the contrary,
as explained on Python-Dev last December, it tended to make the *sum*
(i + incr) & mask (which is the first table index examined in case of
collison) the same "too often" across distinct hashes.
Changing to the simpler "i = hash & mask" reduced the number of string-dict
collisions (== # number of times we go around the lookup for-loop) from about
6 million to 5 million during a full run of the test suite (these are
approximate because the test suite does some random stuff from run to run).
The number of collisions in non-string dicts also decreased, but not as
dramatically.
Note that this may, for a given dict, change the order (wrt previous
releases) of entries exposed by .keys(), .values() and .items(). A number
of std tests suffered bogus failures as a result. For dicts keyed by
small ints, or (less so) by characters, the order is much more likely to be
in increasing order of key now; e.g.,
>>> d = {}
>>> for i in range(10):
... d[i] = i
...
>>> d
{0: 0, 1: 1, 2: 2, 3: 3, 4: 4, 5: 5, 6: 6, 7: 7, 8: 8, 9: 9}
>>>
Unfortunately. people may latch on to that in small examples and draw a
bogus conclusion.
test_support.py
Moved test_extcall's sortdict() into test_support, made it stronger,
and imported sortdict into other std tests that needed it.
test_unicode.py
Excluced cp875 from the "roundtrip over range(128)" test, because
cp875 doesn't have a well-defined inverse for unicode("?", "cp875").
See Python-Dev for excruciating details.
Cookie.py
Chaged various output functions to sort dicts before building
strings from them.
test_extcall
Fiddled the expected-result file. This remains sensitive to native
dict ordering, because, e.g., if there are multiple errors in a
keyword-arg dict (and test_extcall sets up many cases like that), the
specific error Python complains about first depends on native dict
ordering.
2001-05-12 21:19:31 -03:00
|
|
|
% (name, ', '.join(arglist), name))
|
2001-01-15 18:14:16 -04:00
|
|
|
exec(decl)
|
|
|
|
func = eval(name)
|
|
|
|
funcs.append(func)
|
|
|
|
maxargs[func] = len(args + defargs)
|
|
|
|
|
|
|
|
for name in ['za', 'zade', 'zabk', 'zabdv', 'zabdevk']:
|
|
|
|
func = eval(name)
|
|
|
|
for args in [(), (1, 2), (1, 2, 3, 4, 5)]:
|
|
|
|
for kwargs in ['', 'a', 'd', 'ad', 'abde']:
|
|
|
|
kwdict = {}
|
|
|
|
for k in kwargs: kwdict[k] = k + k
|
2007-02-25 16:55:47 -04:00
|
|
|
print(func.__name__, args, sortdict(kwdict), '->', end=' ')
|
2003-02-27 16:14:51 -04:00
|
|
|
try: func(*args, **kwdict)
|
2007-02-09 01:37:30 -04:00
|
|
|
except TypeError as err: print(err)
|