mirror of
https://github.com/python/cpython.git
synced 2025-08-03 16:39:00 +00:00

svn+ssh://pythondev@svn.python.org/python/trunk ........ r53954 | jeremy.hylton | 2007-02-26 10:41:18 -0800 (Mon, 26 Feb 2007) | 10 lines Do not copy free variables to locals in class namespaces. Fixes bug 1569356, but at the cost of a minor incompatibility in locals(). Add test that verifies that the class namespace is not polluted. Also clarify the behavior in the library docs. Along the way, cleaned up the dict_to_map and map_to_dict implementations and added some comments that explain what they do. ........ r53955 | jeremy.hylton | 2007-02-26 11:00:20 -0800 (Mon, 26 Feb 2007) | 2 lines Fix assertion. ........ r53969 | neal.norwitz | 2007-02-26 14:41:45 -0800 (Mon, 26 Feb 2007) | 3 lines When printing an unraisable error, don't print exceptions. before the name. This duplicates the behavior whening normally printing exceptions. ........ r53970 | andrew.kuchling | 2007-02-26 15:02:47 -0800 (Mon, 26 Feb 2007) | 1 line Markup fix ........ r53975 | neal.norwitz | 2007-02-26 15:48:27 -0800 (Mon, 26 Feb 2007) | 3 lines SF #1669182, 2.5 was already fixed. Just assert in 2.6 since string exceptions are gone. ........ r53976 | andrew.kuchling | 2007-02-26 15:54:17 -0800 (Mon, 26 Feb 2007) | 1 line Add some items ........ r53981 | jeremy.hylton | 2007-02-26 17:01:59 -0800 (Mon, 26 Feb 2007) | 4 lines Fix long-standing bug in name mangling for package imports Reported by Mike Verdone. ........ r53993 | jeremy.hylton | 2007-02-27 08:00:06 -0800 (Tue, 27 Feb 2007) | 2 lines tabify ........ r53994 | jeremy.hylton | 2007-02-27 08:13:23 -0800 (Tue, 27 Feb 2007) | 5 lines tabify Note that ast.c still has a mix of tabs and spaces, because it attempts to use four-space indents for more of the new code. ........ r53996 | jeremy.hylton | 2007-02-27 09:24:48 -0800 (Tue, 27 Feb 2007) | 2 lines whitespace normalization ........ r53997 | jeremy.hylton | 2007-02-27 10:29:45 -0800 (Tue, 27 Feb 2007) | 24 lines Add checking for a number of metaclass error conditions. We add some new rules that are required for preserving internal invariants of types. 1. If type (or a subclass of type) appears in bases, it must appear before any non-type bases. If a non-type base (like a regular new-style class) occurred first, it could trick type into allocating the new class an __dict__ which must be impossible. 2. There are several checks that are made of bases when creating a type. Those checks are now repeated when assigning to __bases__. We also add the restriction that assignment to __bases__ may not change the metaclass of the type. Add new tests for these cases and for a few other oddball errors that were no previously tested. Remove a crasher test that was fixed. Also some internal refactoring: Extract the code to find the most derived metaclass of a type and its bases. It is now needed in two places. Rewrite the TypeError checks in test_descr to use doctest. The tests now clearly show what exception they expect to see. ........ r53998 | jeremy.hylton | 2007-02-27 10:33:31 -0800 (Tue, 27 Feb 2007) | 2 lines Add news about changes to metaclasses and __bases__ error checking. ........ r54016 | armin.rigo | 2007-02-28 01:25:29 -0800 (Wed, 28 Feb 2007) | 3 lines Modify the segfaulting example to show why r53997 is not a solution to it. ........ r54022 | brett.cannon | 2007-02-28 10:15:00 -0800 (Wed, 28 Feb 2007) | 2 lines Add a test for instantiating SyntaxError with no arguments. ........ r54026 | raymond.hettinger | 2007-02-28 10:27:41 -0800 (Wed, 28 Feb 2007) | 1 line Docstring nit. ........ r54033 | raymond.hettinger | 2007-02-28 10:37:52 -0800 (Wed, 28 Feb 2007) | 1 line Prepare collections module for pure python code entries. ........ r54053 | raymond.hettinger | 2007-02-28 22:16:43 -0800 (Wed, 28 Feb 2007) | 1 line Add collections.NamedTuple ........ r54054 | neal.norwitz | 2007-02-28 23:04:41 -0800 (Wed, 28 Feb 2007) | 1 line Add Pat and Eric for work on PEP 3101 in the sandbox ........ r54061 | andrew.kuchling | 2007-03-01 06:36:12 -0800 (Thu, 01 Mar 2007) | 1 line Add NamedTuple ........ r54080 | georg.brandl | 2007-03-02 06:37:12 -0800 (Fri, 02 Mar 2007) | 2 lines Bug #1628895: some better tries to find HTML documentation in pydoc. ........ r54086 | raymond.hettinger | 2007-03-02 11:20:46 -0800 (Fri, 02 Mar 2007) | 1 line Fix embarrassing typo and fix constantification of None ........ r54088 | georg.brandl | 2007-03-02 12:30:14 -0800 (Fri, 02 Mar 2007) | 2 lines Bugs #1668032, #1668036, #1669304: clarify behavior of PyMem_Realloc and _Resize. ........ r54114 | georg.brandl | 2007-03-04 09:18:54 -0800 (Sun, 04 Mar 2007) | 2 lines Fix a bug in test_dict and test_userdict, found at the PyPy sprint. ........ r54124 | skip.montanaro | 2007-03-04 12:52:28 -0800 (Sun, 04 Mar 2007) | 2 lines Teach setup.py how to find Berkeley DB on Macs using MacPorts. ........ r54125 | skip.montanaro | 2007-03-04 12:54:12 -0800 (Sun, 04 Mar 2007) | 1 line note MacPorts/BerkDB change in setup.py ........ r54136 | neal.norwitz | 2007-03-04 23:52:01 -0800 (Sun, 04 Mar 2007) | 1 line Added Pete for 3101 too ........ r54138 | facundo.batista | 2007-03-05 08:31:54 -0800 (Mon, 05 Mar 2007) | 1 line Minor corrections to docs, and an explanation comentary ........ r54139 | georg.brandl | 2007-03-05 14:28:08 -0800 (Mon, 05 Mar 2007) | 3 lines Patch #1674228: when assigning a slice (old-style), check for the sq_ass_slice instead of the sq_slice slot. ........ r54149 | georg.brandl | 2007-03-06 01:33:01 -0800 (Tue, 06 Mar 2007) | 3 lines Nit: a struct field is set to GenericAlloc, not GenericAlloc(). ........ r54150 | georg.brandl | 2007-03-06 02:02:47 -0800 (Tue, 06 Mar 2007) | 3 lines Patch #1671450: add a section about subclassing builtin types to the "extending and embedding" tutorial. ........ r54152 | martin.v.loewis | 2007-03-06 02:41:24 -0800 (Tue, 06 Mar 2007) | 2 lines Patch #1121142: Implement ZipFile.open. ........ r54154 | georg.brandl | 2007-03-06 03:51:14 -0800 (Tue, 06 Mar 2007) | 2 lines A test case for the fix in #1674228. ........ r54156 | georg.brandl | 2007-03-06 03:52:24 -0800 (Tue, 06 Mar 2007) | 2 lines Patch #1672481: fix bug in idlelib.MultiCall. ........ r54159 | georg.brandl | 2007-03-06 04:17:50 -0800 (Tue, 06 Mar 2007) | 1 line Bug #1674503: close the file opened by execfile() in an error condition. ........ r54160 | georg.brandl | 2007-03-06 05:32:52 -0800 (Tue, 06 Mar 2007) | 3 lines Fix another reincarnation of bug #1576657 in defaultdict. ........ r54162 | georg.brandl | 2007-03-06 05:35:00 -0800 (Tue, 06 Mar 2007) | 2 lines A test case for the defaultdict KeyError bug. ........ r54164 | georg.brandl | 2007-03-06 05:37:45 -0800 (Tue, 06 Mar 2007) | 3 lines Patch #1663234: you can now run doctest on test files and modules using "python -m doctest [-v] filename ...". ........ r54165 | martin.v.loewis | 2007-03-06 06:43:00 -0800 (Tue, 06 Mar 2007) | 3 lines Patch #912410: Replace HTML entity references for attribute values in HTMLParser. ........ r54166 | skip.montanaro | 2007-03-06 07:41:38 -0800 (Tue, 06 Mar 2007) | 1 line patch 1673619 - identify extension modules which cannot be built ........ r54167 | guido.van.rossum | 2007-03-06 07:50:01 -0800 (Tue, 06 Mar 2007) | 5 lines Patch #1646728: datetime.fromtimestamp fails with negative fractional times. With unittest. Somebody please backport to 2.5. ........ r54169 | georg.brandl | 2007-03-06 09:49:14 -0800 (Tue, 06 Mar 2007) | 2 lines Fix cmp vs. key argument for list.sort. ........ r54170 | georg.brandl | 2007-03-06 10:21:32 -0800 (Tue, 06 Mar 2007) | 2 lines Small nit, found by Neal. ........ r54171 | georg.brandl | 2007-03-06 10:29:58 -0800 (Tue, 06 Mar 2007) | 3 lines Patch #1602128: clarify that richcmp methods can return NotImplemented and should return True or False otherwise. ........ r54173 | georg.brandl | 2007-03-06 10:41:12 -0800 (Tue, 06 Mar 2007) | 2 lines Patch #1638879: don't accept strings with embedded NUL bytes in long(). ........ r54175 | georg.brandl | 2007-03-06 10:47:31 -0800 (Tue, 06 Mar 2007) | 2 lines Patch #1673121: update README wrt. OSX default shell. ........ r54177 | georg.brandl | 2007-03-06 10:59:11 -0800 (Tue, 06 Mar 2007) | 3 lines Patch #1654417: make operator.{get,set,del}slice use the full range of Py_ssize_t. ........ r54180 | walter.doerwald | 2007-03-06 12:38:57 -0800 (Tue, 06 Mar 2007) | 4 lines Patch for bug #1633621: if curses.resizeterm() or curses.resize_term() is called, update _curses.LINES, _curses.COLS, curses.LINES and curses.COLS. ........ r54182 | walter.doerwald | 2007-03-06 13:15:24 -0800 (Tue, 06 Mar 2007) | 2 lines Document change to curses. ........ r54188 | georg.brandl | 2007-03-06 16:34:46 -0800 (Tue, 06 Mar 2007) | 5 lines Variant of patch #697613: don't exit the interpreter on a SystemExit exception if the -i command line option or PYTHONINSPECT environment variable is given, but break into the interactive interpreter just like on other exceptions or normal program exit. (backport) ........ r54189 | georg.brandl | 2007-03-06 16:40:28 -0800 (Tue, 06 Mar 2007) | 4 lines Patch #703779: unset __file__ in __main__ after running a file. This makes the filenames the warning module prints much more sensible when a PYTHONSTARTUP file is used. ........ r54192 | george.yoshida | 2007-03-06 20:21:18 -0800 (Tue, 06 Mar 2007) | 2 lines add versionadded info ........ r54195 | georg.brandl | 2007-03-06 23:39:06 -0800 (Tue, 06 Mar 2007) | 2 lines Patch #812285: allow multiple auth schemes in AbstractBasicAuthHandler. ........ r54197 | georg.brandl | 2007-03-07 00:31:51 -0800 (Wed, 07 Mar 2007) | 3 lines Patch #1001604: glob.glob() now returns unicode filenames if it was given a unicode argument and os.listdir() returns unicode filenames. ........ r54199 | georg.brandl | 2007-03-07 01:09:40 -0800 (Wed, 07 Mar 2007) | 3 lines Patches #1550273, #1550272: fix a few bugs in unittest and add a comprehensive test suite for the module. ........ r54201 | georg.brandl | 2007-03-07 01:21:06 -0800 (Wed, 07 Mar 2007) | 3 lines Patch #787789: allow to pass custom TestRunner instances to unittest's main() function. ........ r54202 | georg.brandl | 2007-03-07 01:34:45 -0800 (Wed, 07 Mar 2007) | 2 lines Patch #1669331: clarify shutil.copyfileobj() behavior wrt. file position. ........ r54204 | martin.v.loewis | 2007-03-07 03:04:33 -0800 (Wed, 07 Mar 2007) | 2 lines Bug #1115886: os.path.splitext('.cshrc') gives now ('.cshrc', ''). ........ r54206 | georg.brandl | 2007-03-07 03:37:42 -0800 (Wed, 07 Mar 2007) | 2 lines Patch #1675471: convert test_pty to unittest. ........ r54207 | georg.brandl | 2007-03-07 03:54:49 -0800 (Wed, 07 Mar 2007) | 4 lines Add some sanity checks to unittest.TestSuite's addTest(s) methods. Fixes #878275. ........ r54209 | guido.van.rossum | 2007-03-07 07:16:29 -0800 (Wed, 07 Mar 2007) | 3 lines Windows doesn't support negative timestamps. Skip the tests involving them if os.name == "nt". ........ r54219 | martin.v.loewis | 2007-03-08 05:42:43 -0800 (Thu, 08 Mar 2007) | 2 lines Add missing ) in parenthical remark. ........ r54220 | georg.brandl | 2007-03-08 09:49:06 -0800 (Thu, 08 Mar 2007) | 2 lines Fix #1676656: \em is different from \emph... ........ r54222 | georg.brandl | 2007-03-08 10:37:31 -0800 (Thu, 08 Mar 2007) | 2 lines Add a NEWS entry for rev. 54207,8. ........ r54225 | raymond.hettinger | 2007-03-08 11:24:27 -0800 (Thu, 08 Mar 2007) | 1 line SF 1676321: empty() returned wrong result ........ r54227 | collin.winter | 2007-03-08 11:58:14 -0800 (Thu, 08 Mar 2007) | 1 line Backported r54226 from p3yk: Move test_unittest, test_doctest and test_doctest2 higher up in the testing order. ........ r54230 | raymond.hettinger | 2007-03-08 13:33:47 -0800 (Thu, 08 Mar 2007) | 1 line SF #1637850: make_table in difflib did not work with unicode ........ r54232 | collin.winter | 2007-03-08 14:16:25 -0800 (Thu, 08 Mar 2007) | 1 line Patch #1668482: don't use '-' in mkstemp ........ r54233 | brett.cannon | 2007-03-08 15:58:11 -0800 (Thu, 08 Mar 2007) | 10 lines Introduce test.test_support.TransientResource. It's a context manager to surround calls to resources that may or may not be available. Specifying the expected exception and attributes to be raised if the resource is not available prevents overly broad catching of exceptions. This is meant to help suppress spurious failures by raising test.test_support.ResourceDenied if the exception matches. It would probably be good to go through the various network tests and surround the calls to catch connection timeouts (as done with test_socket_ssl in this commit). ........ r54234 | collin.winter | 2007-03-08 19:15:56 -0800 (Thu, 08 Mar 2007) | 1 line Patch #1481079: Support of HTTP_REFERER in CGIHTTPServer.py ........ r54235 | collin.winter | 2007-03-08 19:26:32 -0800 (Thu, 08 Mar 2007) | 1 line Add NEWS item for patch #1481079 (r54234). ........ r54237 | neal.norwitz | 2007-03-08 21:59:01 -0800 (Thu, 08 Mar 2007) | 1 line Fix SF #1676971, Complex OverflowError has a typo ........ r54239 | georg.brandl | 2007-03-09 04:58:41 -0800 (Fri, 09 Mar 2007) | 2 lines Typo. ........ r54240 | martin.v.loewis | 2007-03-09 07:35:55 -0800 (Fri, 09 Mar 2007) | 2 lines Patch #957003: Implement smtplib.LMTP. ........ r54243 | collin.winter | 2007-03-09 10:09:10 -0800 (Fri, 09 Mar 2007) | 2 lines Bug #1629566: clarify the docs on the return values of parsedate() and parsedate_tz() in email.utils and rfc822. ........ r54244 | thomas.heller | 2007-03-09 11:21:28 -0800 (Fri, 09 Mar 2007) | 3 lines Fix bug #1646630: ctypes.string_at(buf, 0) and ctypes.wstring_at(buf, 0) returned string up to the first NUL character. ........ r54245 | martin.v.loewis | 2007-03-09 11:36:01 -0800 (Fri, 09 Mar 2007) | 2 lines Add Ziga Seilnacht. ........ r54247 | collin.winter | 2007-03-09 12:33:07 -0800 (Fri, 09 Mar 2007) | 2 lines Patch #1491866: change the complex() constructor to allow parthensized forms. This means complex(repr(x)) now works instead of raising a ValueError. ........ r54248 | thomas.heller | 2007-03-09 12:39:22 -0800 (Fri, 09 Mar 2007) | 7 lines Bug #1651235: When a tuple was passed to a ctypes function call, Python would crash instead of raising an error. The crash was caused by a section of code that should have been removed long ago, at that time ctypes had other ways to pass parameters to function calls. ........ r54250 | collin.winter | 2007-03-09 15:30:39 -0800 (Fri, 09 Mar 2007) | 1 line Hashing simplification pointed out by Thomas Wouters. ........ r54252 | collin.winter | 2007-03-09 18:23:40 -0800 (Fri, 09 Mar 2007) | 5 lines * Unlink test files before and after each test; hopefully this will cut down on recent buildbot failures in test_islink. * Drop safe_remove() in favor of test_support.unlink(). * Fix the indentation of test_samefile so that it runs. ........ r54253 | collin.winter | 2007-03-09 18:51:26 -0800 (Fri, 09 Mar 2007) | 3 lines Bug #1531963: Make SocketServer.TCPServer's server_address always be equal to calling getsockname() on the server's socket. Will backport. ........ r54254 | neal.norwitz | 2007-03-09 19:19:18 -0800 (Fri, 09 Mar 2007) | 4 lines Simplify a little by handling the TCP case first. Update to use predominant style of spaces around = in args list and print to stderr if debugging. ........ r54256 | collin.winter | 2007-03-09 19:35:34 -0800 (Fri, 09 Mar 2007) | 1 line Add proper attribution for a bug fix. ........ r54257 | georg.brandl | 2007-03-09 23:38:14 -0800 (Fri, 09 Mar 2007) | 2 lines Typos. ........ r54260 | collin.winter | 2007-03-10 06:33:32 -0800 (Sat, 10 Mar 2007) | 1 line Convert an assert to a raise so it works even in the presence of -O. ........ r54262 | collin.winter | 2007-03-10 06:41:48 -0800 (Sat, 10 Mar 2007) | 2 lines Patch #1599845: Add an option to disable the implicit calls to server_bind() and server_activate() in the constructors for TCPServer, SimpleXMLRPCServer and DocXMLRPCServer. ........ r54268 | georg.brandl | 2007-03-11 00:28:46 -0800 (Sun, 11 Mar 2007) | 2 lines Add missing "return" statements in exception handler. ........ r54270 | ziga.seilnacht | 2007-03-11 08:54:54 -0700 (Sun, 11 Mar 2007) | 3 lines Patch #1675981: remove unreachable code from type.__new__() method. __dict__ and __weakref__ are removed from the slots tuple earlier in the code, in the loop that mangles slot names. Will backport. ........ r54271 | collin.winter | 2007-03-11 09:00:20 -0700 (Sun, 11 Mar 2007) | 3 lines Patch #1192590: Fix pdb's "ignore" and "condition" commands so they trap the IndexError caused by passing in an invalid breakpoint number. Will backport. ........ r54274 | vinay.sajip | 2007-03-11 11:32:07 -0700 (Sun, 11 Mar 2007) | 1 line Fix resource leak reported in SF #1516995. ........ r54278 | collin.winter | 2007-03-11 18:55:54 -0700 (Sun, 11 Mar 2007) | 4 lines Patch #1678662: ftp.python.org does not exist. So the testcode in urllib.py must use a more stable FTP. Will backport. ........ r54280 | barry.warsaw | 2007-03-11 20:20:01 -0700 (Sun, 11 Mar 2007) | 8 lines Tokio Kikuchi's fix for SF bug #1629369; folding whitespace allowed in the display name of an email address, e.g. Foo \tBar <foo@example.com> Test case added by Barry. ........ r54282 | skip.montanaro | 2007-03-11 20:30:50 -0700 (Sun, 11 Mar 2007) | 4 lines Sane humans would call these invalid tests, but Andrew McNamara pointed out that given the inputs in these tests Excel does indeed produce the output these tests expect. Document that for future confused folks. ........ r54283 | martin.v.loewis | 2007-03-12 03:50:39 -0700 (Mon, 12 Mar 2007) | 2 lines Bug #1675511: Use -Kpic instead of -xcode=pic32 on Solaris/x86. ........ r54285 | martin.v.loewis | 2007-03-12 04:01:10 -0700 (Mon, 12 Mar 2007) | 2 lines Patch #1677862: Require a space or tab after import in .pth files. ........ r54287 | georg.brandl | 2007-03-12 06:17:36 -0700 (Mon, 12 Mar 2007) | 8 lines Backport from Py3k branch: Patch #1591665: implement the __dir__() special function lookup in PyObject_Dir. Had to change a few bits of the patch because classobjs and __methods__ are still in Py2.6. ........ r54288 | georg.brandl | 2007-03-12 07:30:05 -0700 (Mon, 12 Mar 2007) | 3 lines Bug #1678647: write a newline after printing an exception in any case, even when converting the value to a string failed. ........ r54290 | collin.winter | 2007-03-12 08:57:19 -0700 (Mon, 12 Mar 2007) | 1 line Patch #1678088: convert test_operations to use unittest, fold the result into test_dict. ........ r54291 | collin.winter | 2007-03-12 09:11:39 -0700 (Mon, 12 Mar 2007) | 3 lines Bug #742342: make Python stop segfaulting on infinitely-recursive reload()s. Fixed by patch #922167. Will backport. ........ r54292 | georg.brandl | 2007-03-12 09:15:09 -0700 (Mon, 12 Mar 2007) | 2 lines Typo fix. ........ r54295 | collin.winter | 2007-03-12 10:24:07 -0700 (Mon, 12 Mar 2007) | 1 line Patch #1670993: Refactor test_threadedtempfile.py to use unittest. ........ r54296 | tim.peters | 2007-03-12 11:07:52 -0700 (Mon, 12 Mar 2007) | 2 lines Whitespace normalization. ........ r54297 | tim.peters | 2007-03-12 11:09:22 -0700 (Mon, 12 Mar 2007) | 2 lines Set missing svn:eol-style property on text files. ........ r54315 | brett.cannon | 2007-03-12 19:34:09 -0700 (Mon, 12 Mar 2007) | 8 lines Add test.test_support.transient_internet . Returns a context manager that nests test.test_support.TransientResource context managers that capture exceptions raised when the Internet connection is flaky. Initially using in test_socket_ssl but should probably be expanded to cover any test that should not raise the captured exceptions if the Internet connection works. ........ r54316 | brett.cannon | 2007-03-12 20:05:40 -0700 (Mon, 12 Mar 2007) | 2 lines Fix a typo where the variable name was not updated. ........ r54318 | neal.norwitz | 2007-03-12 21:59:58 -0700 (Mon, 12 Mar 2007) | 1 line Add Jerry Seutter for a bunch of his recent patches refactoring tests ........ r54319 | neal.norwitz | 2007-03-12 22:07:14 -0700 (Mon, 12 Mar 2007) | 7 lines Add some other acks for recent checkins: Brian Leair - 922167 Tomer Filiba - 1591665 Jeremy Jones - 1192590 ........ r54321 | neal.norwitz | 2007-03-12 22:31:38 -0700 (Mon, 12 Mar 2007) | 9 lines Fix some style nits: * lines too long * wrong indentation * space after a function name * wrong function name in error string * simplifying some logic Also add an error check to PyDict_SetItemString. ........ r54322 | georg.brandl | 2007-03-13 00:23:16 -0700 (Tue, 13 Mar 2007) | 2 lines Typo and grammar fixes. ........ r54323 | georg.brandl | 2007-03-13 00:50:57 -0700 (Tue, 13 Mar 2007) | 2 lines Patch #1679379: add documentation for fnmatch.translate(). ........ r54325 | georg.brandl | 2007-03-13 00:57:51 -0700 (Tue, 13 Mar 2007) | 2 lines Patch #1642844: comments to clarify the complexobject constructor. ........ r54326 | georg.brandl | 2007-03-13 01:14:27 -0700 (Tue, 13 Mar 2007) | 3 lines Patch #1668100: urllib2 now correctly raises URLError instead of OSError if accessing a local file via the file:// protocol fails. ........ r54327 | georg.brandl | 2007-03-13 02:32:11 -0700 (Tue, 13 Mar 2007) | 4 lines Patch #1635454: the csv.DictWriter class now includes the offending field names in its exception message if you try to write a record with a dictionary containing fields not in the CSV field names list. ........ r54328 | georg.brandl | 2007-03-13 02:41:31 -0700 (Tue, 13 Mar 2007) | 3 lines Patch #1555098: use str.join() instead of repeated string concatenation in robotparser. ........ r54329 | georg.brandl | 2007-03-13 03:06:48 -0700 (Tue, 13 Mar 2007) | 3 lines Patch #1542681: add entries for "with", "as" and "CONTEXTMANAGERS" to pydoc's help keywords. ........ r54331 | georg.brandl | 2007-03-13 03:19:22 -0700 (Tue, 13 Mar 2007) | 3 lines Patch #1569798: fix a bug in distutils when building Python from a directory within sys.exec_prefix. ........ r54333 | martin.v.loewis | 2007-03-13 03:24:00 -0700 (Tue, 13 Mar 2007) | 4 lines Patch #1449244: Support Unicode strings in email.message.Message.{set_charset,get_content_charset}. Will backport. ........ r54335 | lars.gustaebel | 2007-03-13 03:47:19 -0700 (Tue, 13 Mar 2007) | 34 lines This is the implementation of POSIX.1-2001 (pax) format read/write support. The TarInfo class now contains all necessary logic to process and create tar header data which has been moved there from the TarFile class. The fromtarfile() method was added. The new path and linkpath properties are aliases for the name and linkname attributes in correspondence to the pax naming scheme. The TarFile constructor and classmethods now accept a number of keyword arguments which could only be set as attributes before (e.g. dereference, ignore_zeros). The encoding and pax_headers arguments were added for pax support. There is a new tarinfo keyword argument that allows using subclassed TarInfo objects in TarFile. The boolean TarFile.posix attribute is deprecated, because now three tar formats are supported. Instead, the desired format for writing is specified using the constants USTAR_FORMAT, GNU_FORMAT and PAX_FORMAT as the format keyword argument. This change affects TarInfo.tobuf() as well. The test suite has been heavily reorganized and partially rewritten. A new testtar.tar was added that contains sample data in many formats from 4 different tar programs. Some bugs and quirks that also have been fixed: Directory names do no longer have a trailing slash in TarInfo.name or TarFile.getnames(). Adding the same file twice does not create a hardlink file member. The TarFile constructor does no longer need a name argument. The TarFile._mode attribute was renamed to mode and contains either 'r', 'w' or 'a'. ........ r54336 | georg.brandl | 2007-03-13 05:34:25 -0700 (Tue, 13 Mar 2007) | 3 lines Bug #1622896: fix a rare corner case where the bz2 module raised an error in spite of a succesful compression. ........ r54338 | lars.gustaebel | 2007-03-13 08:47:07 -0700 (Tue, 13 Mar 2007) | 3 lines Quick fix for tests that fail on systems with an encoding other than 'iso8859-1'. ........ r54339 | georg.brandl | 2007-03-13 10:43:32 -0700 (Tue, 13 Mar 2007) | 4 lines Patch #1603688: ConfigParser.SafeConfigParser now checks values that are set for invalid interpolation sequences that would lead to errors on reading back those values. ........ r54341 | georg.brandl | 2007-03-13 11:15:41 -0700 (Tue, 13 Mar 2007) | 3 lines Patch #1581073: add a flag to textwrap that prevents the dropping of whitespace while wrapping. ........ r54343 | georg.brandl | 2007-03-13 11:24:40 -0700 (Tue, 13 Mar 2007) | 2 lines Patch #1605192: list allowed states in error messages for imaplib. ........ r54344 | georg.brandl | 2007-03-13 11:31:49 -0700 (Tue, 13 Mar 2007) | 4 lines Patch #1537850: tempfile.NamedTemporaryFile now has a "delete" parameter which can be set to False to prevent the default delete-on-close behavior. ........ r54345 | collin.winter | 2007-03-13 11:53:04 -0700 (Tue, 13 Mar 2007) | 9 lines Add acks for recent patch checkins: Arvin Schnell - 1668482 S?\195?\169bastien Martini - 1481079 Heiko Wundram - 1491866 Damon Kohler - 1545011 Peter Parente - 1599845 Bjorn Lindqvist - 1678662 ........ r54346 | georg.brandl | 2007-03-13 12:00:36 -0700 (Tue, 13 Mar 2007) | 2 lines Acks for recent patches. ........ r54347 | georg.brandl | 2007-03-13 12:18:18 -0700 (Tue, 13 Mar 2007) | 3 lines Fix a tab. ........ r54348 | georg.brandl | 2007-03-13 12:32:21 -0700 (Tue, 13 Mar 2007) | 4 lines Patch #1533909: the timeit module now accepts callables in addition to strings for the code to time and the setup code. Also added two convenience functions for instantiating a Timer and calling its methods. ........ r54352 | georg.brandl | 2007-03-13 13:02:57 -0700 (Tue, 13 Mar 2007) | 3 lines Patch #1530482: add pydoc.render_doc() which returns the documentation for a thing instead of paging it to stdout, which pydoc.doc() does. ........ r54357 | thomas.heller | 2007-03-13 13:42:52 -0700 (Tue, 13 Mar 2007) | 1 line Patch #1649190: Adding support for _Bool to ctypes as c_bool, by David Remahl. ........ r54358 | georg.brandl | 2007-03-13 13:46:32 -0700 (Tue, 13 Mar 2007) | 2 lines Patch #1444529: the builtin compile() now accepts keyword arguments. (backport) ........ r54359 | thomas.heller | 2007-03-13 14:01:39 -0700 (Tue, 13 Mar 2007) | 1 line Add versionadded marker for ctypes.c_bool. ........ r54360 | georg.brandl | 2007-03-13 14:08:15 -0700 (Tue, 13 Mar 2007) | 3 lines Patch #1393667: pdb now has a "run" command which restarts the debugged Python program, optionally with different arguments. ........ r54361 | georg.brandl | 2007-03-13 14:32:01 -0700 (Tue, 13 Mar 2007) | 3 lines Deprecate commands.getstatus(). ........ r54362 | georg.brandl | 2007-03-13 14:32:56 -0700 (Tue, 13 Mar 2007) | 2 lines NEWS entry for getstatus() deprecation. ........ r54363 | georg.brandl | 2007-03-13 14:58:44 -0700 (Tue, 13 Mar 2007) | 4 lines Patch #1429539: pdb now correctly initializes the __main__ module for the debugged script, which means that imports from __main__ work correctly now. ........ r54364 | georg.brandl | 2007-03-13 15:07:36 -0700 (Tue, 13 Mar 2007) | 4 lines Patch #957650: "%var%" environment variable references are now properly expanded in ntpath.expandvars(), also "~user" home directory references are recognized and handled on Windows. ........ r54365 | georg.brandl | 2007-03-13 15:16:30 -0700 (Tue, 13 Mar 2007) | 2 lines Patch #1194449: correctly detect unbound methods in pydoc. ........ r54367 | georg.brandl | 2007-03-13 15:49:43 -0700 (Tue, 13 Mar 2007) | 5 lines Patch #1185447: binascii.b2a_qp() now correctly quotes binary characters with ASCII value less than 32. Also, it correctly quotes dots only if they occur on a single line, as opposed to the previous behavior of quoting dots if they are the second character of any line. ........ r54368 | collin.winter | 2007-03-13 16:02:15 -0700 (Tue, 13 Mar 2007) | 1 line Inline PyImport_GetModulesReloading(). ........ r54371 | barry.warsaw | 2007-03-13 21:59:50 -0700 (Tue, 13 Mar 2007) | 6 lines SF bug #1582282; decode_header() incorrectly splits not-conformant RFC 2047-like headers where there is no whitespace between encoded words. This fix changes the matching regexp to include a trailing lookahead assertion that the closing ?= must be followed by whitespace, newline, or end-of-string. This also changes the regexp to add the MULTILINE flag. ........ r54372 | gregory.p.smith | 2007-03-14 00:17:40 -0700 (Wed, 14 Mar 2007) | 2 lines correct order and names of the less often used keyword parameters. ........ r54373 | gregory.p.smith | 2007-03-14 00:19:50 -0700 (Wed, 14 Mar 2007) | 5 lines Its time to stop listing (Unix, Windows) when we really mean "everything but Mac OS 9" now that nobody is likely to use Python on Mac OS 9 and most of the (Mac) platform items are all OS X special API specific since OS X is unixy enough for these modules to be available out of the box. ........ r54376 | georg.brandl | 2007-03-14 01:27:52 -0700 (Wed, 14 Mar 2007) | 4 lines Bug #767111: fix long-standing bug in urllib which caused an AttributeError instead of an IOError when the server's response didn't contain a valid HTTP status line. ........ r54378 | ziga.seilnacht | 2007-03-14 05:24:09 -0700 (Wed, 14 Mar 2007) | 4 lines Patch #1680015: Don't modify __slots__ tuple if it contains an unicode name. Remove a reference leak that happened if the name could not be converted to string. Will backport. ........ r54386 | martin.v.loewis | 2007-03-14 13:02:31 -0700 (Wed, 14 Mar 2007) | 3 lines Patch #1559413: Fix test_cmd_line if sys.executable contains a space. Will backport. ........ r54389 | brett.cannon | 2007-03-14 14:40:13 -0700 (Wed, 14 Mar 2007) | 3 lines Note how test_socket_ssl has various exceptions that deal with a flaky Net connection are silenced. ........ r54390 | brett.cannon | 2007-03-14 14:44:15 -0700 (Wed, 14 Mar 2007) | 2 lines Raise ResourceDenied in test_urllib2net when the Net connection goes bad. ........ r54391 | neal.norwitz | 2007-03-14 21:41:20 -0700 (Wed, 14 Mar 2007) | 1 line Wrap a long line and fix a typo (is -> if) ........ r54392 | georg.brandl | 2007-03-15 00:38:14 -0700 (Thu, 15 Mar 2007) | 3 lines Patch #1680978: consistently use "alive" instead of "active" in the thread lib doc. ........ r54394 | georg.brandl | 2007-03-15 00:41:30 -0700 (Thu, 15 Mar 2007) | 3 lines Patch #1681153: the wave module now closes a file object it opened if initialization failed. ........ r54397 | ziga.seilnacht | 2007-03-15 04:44:55 -0700 (Thu, 15 Mar 2007) | 3 lines Patch #1462488: prevent a segfault in object_reduce_ex() by splitting the implementation for __reduce__ and __reduce_ex__ into two separate functions. Fixes bug #931877. Will backport. ........ r54404 | collin.winter | 2007-03-15 21:11:30 -0700 (Thu, 15 Mar 2007) | 3 lines Patch #1642547: Fix an error/crash when encountering syntax errors in complex if statements. Will backport. ........ r54406 | georg.brandl | 2007-03-16 00:55:09 -0700 (Fri, 16 Mar 2007) | 5 lines Bug #1681228: the webbrowser module now correctly uses the default GNOME or KDE browser, depending on whether there is a session of one of those present. Also, it tries the Windows default browser before trying Mozilla variants. (backport) ........ r54407 | georg.brandl | 2007-03-16 01:22:40 -0700 (Fri, 16 Mar 2007) | 4 lines Patch #1273829: os.walk() now has a "followlinks" parameter. If set to True (which is not the default), it visits symlinks pointing to directories. ........ r54408 | georg.brandl | 2007-03-16 01:24:21 -0700 (Fri, 16 Mar 2007) | 2 lines Add \versionadded tag. ........ r54409 | georg.brandl | 2007-03-16 01:33:47 -0700 (Fri, 16 Mar 2007) | 2 lines RFE #1670167: fix in isinstance() docs. ........ r54412 | ziga.seilnacht | 2007-03-16 04:59:38 -0700 (Fri, 16 Mar 2007) | 3 lines Patch #1623563: allow __class__ assignment for classes with __slots__. The old and the new class are still required to have the same slot names, but the order in which they are specified is not relevant. ........ r54413 | ziga.seilnacht | 2007-03-16 05:11:11 -0700 (Fri, 16 Mar 2007) | 2 lines Whitespace cleanup. Also remove the empty lines from the previous check in. ........ r54414 | jeremy.hylton | 2007-03-16 07:49:11 -0700 (Fri, 16 Mar 2007) | 2 lines Remove warning: funcion declaration isn't a prototype ........ r54415 | jeremy.hylton | 2007-03-16 08:59:47 -0700 (Fri, 16 Mar 2007) | 11 lines Clean up formatting of this file. The file should now follow PEP 7, except that it uses 4 space indents (in the style of Py3k). This particular code would be really hard to read with the regular tab idents. Other changes: - reflow long lines - change multi-line conditionals to have test at end of line ........ r54417 | collin.winter | 2007-03-16 14:13:35 -0700 (Fri, 16 Mar 2007) | 1 line Patch #1676994: Refactor test_popen2 to use unittest. ........ r54418 | collin.winter | 2007-03-16 14:15:35 -0700 (Fri, 16 Mar 2007) | 1 line Remove test/output/test_popen2 (missed in r54417). ........ r54419 | collin.winter | 2007-03-16 15:16:08 -0700 (Fri, 16 Mar 2007) | 1 line Patch 1339796: add a relpath() function to os.path. ........ r54421 | georg.brandl | 2007-03-17 09:08:45 -0700 (Sat, 17 Mar 2007) | 5 lines Patch #1675423: PyComplex_AsCComplex() now tries to convert an object to complex using its __complex__() method before falling back to the __float__() method. Therefore, the functions in the cmath module now can operate on objects that define a __complex__() method. (backport) ........ r54423 | gregory.p.smith | 2007-03-17 15:33:35 -0700 (Sat, 17 Mar 2007) | 2 lines move note to the correct section ........ r54426 | georg.brandl | 2007-03-18 01:25:00 -0700 (Sun, 18 Mar 2007) | 2 lines Patch #1682878: the new socket methods are recv_into and recvfrom_into, not *_buf. ........ r54432 | georg.brandl | 2007-03-18 11:28:25 -0700 (Sun, 18 Mar 2007) | 2 lines Patch #1678339: test case for bug in difflib. ........ r54439 | collin.winter | 2007-03-19 11:52:08 -0700 (Mon, 19 Mar 2007) | 1 line Patch #1630118: add a SpooledTemporaryFile class to tempfile. ........ r54441 | georg.brandl | 2007-03-19 12:02:48 -0700 (Mon, 19 Mar 2007) | 2 lines Patch #1683328: fixes and enhancements for "unparse" demo. ........ r54456 | neal.norwitz | 2007-03-19 22:07:28 -0700 (Mon, 19 Mar 2007) | 1 line Add some doc that was left out from some change to platform.py ........ r54457 | neal.norwitz | 2007-03-19 22:08:23 -0700 (Mon, 19 Mar 2007) | 1 line Add a comment about 3k migration ........ r54458 | neal.norwitz | 2007-03-19 22:21:21 -0700 (Mon, 19 Mar 2007) | 1 line Get rid of deprecation warning when testing commands.getstatus() ........ r54459 | neal.norwitz | 2007-03-19 22:23:09 -0700 (Mon, 19 Mar 2007) | 4 lines Try backing out 54407 to see if it corrects the problems on the Windows buildbots. This rev was backported, so we will need to keep both branches in sync, pending the outcome of the test after this checkin. ........ r54460 | neal.norwitz | 2007-03-19 23:13:25 -0700 (Mon, 19 Mar 2007) | 1 line Try to make this test more resistant to dropping from previous runs (ie, files that may exist but cause the test to fail). Should be backported (assuming it works :-) ........ r54461 | neal.norwitz | 2007-03-19 23:16:26 -0700 (Mon, 19 Mar 2007) | 1 line Try to make this test more resistant to dropping from previous runs (ie, files that may exist but cause the test to fail). Should be backported (assuming it works :-) ........ r54462 | neal.norwitz | 2007-03-19 23:53:17 -0700 (Mon, 19 Mar 2007) | 5 lines Try to be a little more resilient to errors. This might help the test pass, but my guess is that it won't. I'm guessing that some other test is leaving this file open which means it can't be removed under Windows AFAIK. ........ r54463 | neal.norwitz | 2007-03-20 01:14:57 -0700 (Tue, 20 Mar 2007) | 8 lines Try to get test_urllib to pass on Windows by closing the file. I'm guessing that's the problem. h.getfile() must be called *after* h.getreply() and the fp can be None. I'm not entirely convinced this is the best fix (or even correct). The buildbots will tell us if things improve or not. I don't know if this needs to be backported (assuming it actually works). ........ r54465 | raymond.hettinger | 2007-03-20 14:27:24 -0700 (Tue, 20 Mar 2007) | 1 line Extend work on rev 52962 and 53829 eliminating redundant PyObject_Hash() calls and fixing set/dict interoperability. ........ r54468 | georg.brandl | 2007-03-20 16:05:14 -0700 (Tue, 20 Mar 2007) | 2 lines Fix for glob.py if filesystem encoding is None. ........ r54479 | neal.norwitz | 2007-03-20 23:39:48 -0700 (Tue, 20 Mar 2007) | 1 line Remove unused file spotted by Paul Hankin ........ r54480 | georg.brandl | 2007-03-21 02:00:39 -0700 (Wed, 21 Mar 2007) | 3 lines Patch #1682205: a TypeError while unpacking an iterable is no longer masked by a generic one with the message "unpack non-sequence". ........ r54482 | georg.brandl | 2007-03-21 02:10:29 -0700 (Wed, 21 Mar 2007) | 2 lines New test for rev. 54407 which only uses directories under TESTFN. ........ r54483 | georg.brandl | 2007-03-21 02:16:53 -0700 (Wed, 21 Mar 2007) | 2 lines Patch #1684834: document some utility C API functions. ........ r54485 | georg.brandl | 2007-03-21 04:51:25 -0700 (Wed, 21 Mar 2007) | 2 lines Fix #1684254: split BROWSER contents with shlex to avoid displaying 'URL'. ........ r54487 | andrew.kuchling | 2007-03-21 07:32:43 -0700 (Wed, 21 Mar 2007) | 1 line Add comments on maintenance of this file ........ r54489 | andrew.kuchling | 2007-03-21 09:57:32 -0700 (Wed, 21 Mar 2007) | 1 line Fix sentence, and fix typo in example ........ r54490 | andrew.kuchling | 2007-03-21 09:59:20 -0700 (Wed, 21 Mar 2007) | 1 line Put code examples at left margin instead of indenting them ........ r54491 | facundo.batista | 2007-03-21 12:41:24 -0700 (Wed, 21 Mar 2007) | 1 line Minor clarification, saying that blocking means no timeout (from bug #882297) ........ r54492 | ziga.seilnacht | 2007-03-21 13:07:56 -0700 (Wed, 21 Mar 2007) | 2 lines Bug #1675967: re patterns pickled with older Python versions can now be unpickled. Will backport. ........ r54495 | raymond.hettinger | 2007-03-21 13:33:57 -0700 (Wed, 21 Mar 2007) | 1 line Add test and fix for fromkeys() optional argument. ........ r54524 | georg.brandl | 2007-03-22 01:05:45 -0700 (Thu, 22 Mar 2007) | 2 lines Bug #1685704: use -m switch in timeit docs. ........ r54533 | thomas.heller | 2007-03-22 12:44:31 -0700 (Thu, 22 Mar 2007) | 5 lines Back out "Patch #1643874: memory leak in ctypes fixed." The code in this patch leaves no way to give up the ownership of a BSTR instance. ........ r54538 | thomas.heller | 2007-03-22 13:34:37 -0700 (Thu, 22 Mar 2007) | 2 lines Explain the purpose of the b_needsfree flag (forward ported from release25-maint). ........ r54539 | guido.van.rossum | 2007-03-22 21:58:42 -0700 (Thu, 22 Mar 2007) | 12 lines - Bug #1683368: The object.__init__() and object.__new__() methods are now stricter in rejecting excess arguments. The only time when either allows excess arguments is when it is not overridden and the other one is. For backwards compatibility, when both are overridden, it is a deprecation warning (for now; maybe a Py3k warning later). When merging this into 3.0, the warnings should become errors. Note: without the change to string.py, lots of spurious warnings happen. What's going on there? ........ r54540 | neal.norwitz | 2007-03-22 22:17:23 -0700 (Thu, 22 Mar 2007) | 1 line Add Mark Dickinson for SF # 1675423. ........ r54541 | martin.v.loewis | 2007-03-23 03:35:49 -0700 (Fri, 23 Mar 2007) | 3 lines Patch #1686451: Fix return type for PySequence_{Count,Index,Fast_GET_SIZE}. Will backport. ........ r54543 | martin.v.loewis | 2007-03-23 06:27:15 -0700 (Fri, 23 Mar 2007) | 3 lines Bug #978833: Revert r50844, as it broke _socketobject.dup. Will backport. ........ r54545 | guido.van.rossum | 2007-03-23 11:53:03 -0700 (Fri, 23 Mar 2007) | 8 lines Add a type.__init__() method that enforces the same signature as type.__new__(), and then calls object.__init__(cls), just to be anal. This allows us to restore the code in string.py's _TemplateMetaclass that called super(...).__init__(name, bases, dct), which I commented out yesterday since it broke due to the stricter argument checking added to object.__init__(). ........ r54546 | facundo.batista | 2007-03-23 11:54:07 -0700 (Fri, 23 Mar 2007) | 4 lines Added a 'create_connect()' function to socket.py, which creates a connection with an optional timeout, and modified httplib.py to use this function in HTTPConnection. Applies patch 1676823. ........ r54547 | guido.van.rossum | 2007-03-23 12:39:01 -0700 (Fri, 23 Mar 2007) | 2 lines Add note about type.__init__(). ........ r54553 | thomas.heller | 2007-03-23 12:55:27 -0700 (Fri, 23 Mar 2007) | 5 lines Prevent creation (followed by a segfault) of array types when the size overflows the valid Py_ssize_t range. Check return values of PyMem_Malloc. Will backport to release25-maint. ........ r54555 | facundo.batista | 2007-03-23 13:23:08 -0700 (Fri, 23 Mar 2007) | 6 lines Surrounded with try/finally to socket's default timeout setting changes in the tests, so failing one test won't produce strange results in others. Also relaxed the timeout settings in the test (where actually the value didn't mean anything). ........ r54556 | collin.winter | 2007-03-23 15:24:39 -0700 (Fri, 23 Mar 2007) | 1 line Make test_relpath() pass on Windows. ........ r54559 | ziga.seilnacht | 2007-03-24 07:24:26 -0700 (Sat, 24 Mar 2007) | 6 lines Patch #1489771: update syntax rules in Python Reference Manual. Python 2.5 added support for explicit relative import statements and yield expressions, which were missing in the manual. Also fix grammar productions that used the names from the Grammar file, markup that broke the generated grammar.txt, and wrap some lines that broke the pdf output. Will backport. ........ r54565 | georg.brandl | 2007-03-24 15:20:34 -0700 (Sat, 24 Mar 2007) | 2 lines Remove typo accent. ........ r54566 | georg.brandl | 2007-03-24 15:27:56 -0700 (Sat, 24 Mar 2007) | 2 lines Revert accidental change. ........ r54567 | brett.cannon | 2007-03-24 18:32:36 -0700 (Sat, 24 Mar 2007) | 3 lines Change the docs to no longer claim that unittest is preferred over doctest for regression tests. ........ r54568 | facundo.batista | 2007-03-24 18:53:21 -0700 (Sat, 24 Mar 2007) | 4 lines Redone the tests, using the infrastructure already present for threading and socket serving. ........ r54570 | facundo.batista | 2007-03-24 20:20:05 -0700 (Sat, 24 Mar 2007) | 3 lines Closing the HTTP connection after each test, and listening more. ........ r54572 | georg.brandl | 2007-03-25 11:44:35 -0700 (Sun, 25 Mar 2007) | 2 lines Markup fix. ........ r54573 | georg.brandl | 2007-03-25 12:04:55 -0700 (Sun, 25 Mar 2007) | 2 lines Markup fix. ........ r54580 | facundo.batista | 2007-03-26 13:18:31 -0700 (Mon, 26 Mar 2007) | 5 lines Added an optional timeout to FTP class. Also I started a test_ftplib.py file to test the ftp lib (right now I included a basic test, the timeout one, and nothing else). ........ r54581 | georg.brandl | 2007-03-26 13:28:28 -0700 (Mon, 26 Mar 2007) | 2 lines Some nits. ........ r54582 | facundo.batista | 2007-03-26 13:56:09 -0700 (Mon, 26 Mar 2007) | 4 lines Forgot to add the file before the previous commit, here go the ftplib tests. ........ r54585 | facundo.batista | 2007-03-27 11:23:21 -0700 (Tue, 27 Mar 2007) | 5 lines Added an optional timeout to poplib.POP3. Also created a test_poplib.py file with a basic test and the timeout ones. Docs are also updated. ........ r54586 | facundo.batista | 2007-03-27 11:50:29 -0700 (Tue, 27 Mar 2007) | 3 lines The basic test cases of poplib.py. ........ r54594 | facundo.batista | 2007-03-27 20:45:20 -0700 (Tue, 27 Mar 2007) | 4 lines Bug 1688393. Adds a control of negative values in socket.recvfrom, which caused an ugly crash. ........ r54599 | facundo.batista | 2007-03-28 11:25:54 -0700 (Wed, 28 Mar 2007) | 5 lines Added timeout to smtplib (to SMTP and SMTP_SSL). Also created the test_smtplib.py file, with a basic test and the timeout ones. Docs are updated too. ........ r54603 | collin.winter | 2007-03-28 16:34:06 -0700 (Wed, 28 Mar 2007) | 3 lines Consolidate patches #1690164, 1683397, and 1690169, all of which refactor XML-related test suites. The patches are applied together because they use a common output/xmltests file. Thanks to Jerry Seutter for all three patches. ........ r54604 | collin.winter | 2007-03-28 19:28:16 -0700 (Wed, 28 Mar 2007) | 1 line Make test_zipfile clean up its temporary files properly. ........ r54605 | georg.brandl | 2007-03-29 00:41:32 -0700 (Thu, 29 Mar 2007) | 2 lines These are actually methods. ........ r54606 | georg.brandl | 2007-03-29 05:42:07 -0700 (Thu, 29 Mar 2007) | 4 lines In Windows' time.clock(), when QueryPerformanceFrequency() fails, the C lib's clock() is used, but it must be divided by CLOCKS_PER_SEC as for the POSIX implementation (thanks to #pypy). ........ r54608 | facundo.batista | 2007-03-29 11:22:35 -0700 (Thu, 29 Mar 2007) | 5 lines Added timout parameter to telnetlib.Telnet. Also created test_telnetlib.py with a basic test and timeout ones. Docs are also updated. ........ r54613 | facundo.batista | 2007-03-30 06:00:35 -0700 (Fri, 30 Mar 2007) | 4 lines Added the posibility to pass the timeout to FTP.connect, not only when instantiating the class. Docs and tests are updated. ........ r54614 | collin.winter | 2007-03-30 07:01:25 -0700 (Fri, 30 Mar 2007) | 1 line Bug #1688274: add documentation for C-level class objects. ........ r54615 | marc-andre.lemburg | 2007-03-30 08:01:42 -0700 (Fri, 30 Mar 2007) | 4 lines Bump the patch level version of distutils since there were a few bug fixes since the 2.5.0 release. ........ r54617 | georg.brandl | 2007-03-30 08:49:05 -0700 (Fri, 30 Mar 2007) | 2 lines Markup fix. ........ r54618 | georg.brandl | 2007-03-30 10:39:39 -0700 (Fri, 30 Mar 2007) | 2 lines Label name fix. ........ r54619 | georg.brandl | 2007-03-30 10:47:21 -0700 (Fri, 30 Mar 2007) | 2 lines Duplicate label fix. ........ r54620 | georg.brandl | 2007-03-30 10:48:39 -0700 (Fri, 30 Mar 2007) | 2 lines Markup fix. ........ r54623 | andrew.kuchling | 2007-03-30 11:00:15 -0700 (Fri, 30 Mar 2007) | 1 line Add item. (Oops, accidentally checked this in on my branch) ........ r54624 | georg.brandl | 2007-03-30 12:01:38 -0700 (Fri, 30 Mar 2007) | 2 lines Duplicate label fix. ........ r54625 | georg.brandl | 2007-03-30 12:14:02 -0700 (Fri, 30 Mar 2007) | 2 lines Markup fix. ........ r54629 | georg.brandl | 2007-03-31 03:17:31 -0700 (Sat, 31 Mar 2007) | 2 lines repair string literal. ........ r54630 | georg.brandl | 2007-03-31 04:54:58 -0700 (Sat, 31 Mar 2007) | 2 lines Markup fix. ........ r54631 | georg.brandl | 2007-03-31 04:58:36 -0700 (Sat, 31 Mar 2007) | 2 lines Duplicate label fix. ........ r54632 | georg.brandl | 2007-03-31 04:59:54 -0700 (Sat, 31 Mar 2007) | 2 lines Typo fix. ........ r54633 | neal.norwitz | 2007-03-31 11:54:18 -0700 (Sat, 31 Mar 2007) | 1 line Fix method names. Will backport. ........ r54634 | georg.brandl | 2007-03-31 11:56:11 -0700 (Sat, 31 Mar 2007) | 4 lines Bug #1655392: don't add -L/usr/lib/pythonX.Y/config to the LDFLAGS returned by python-config if Python was built with --enable-shared because that prevented the shared library from being used. ........ r54637 | collin.winter | 2007-03-31 12:31:34 -0700 (Sat, 31 Mar 2007) | 1 line Shut up an occaisonal buildbot error due to test files being left around. ........ r54644 | neal.norwitz | 2007-04-01 11:24:22 -0700 (Sun, 01 Apr 2007) | 11 lines SF #1685563, MSVCCompiler creates redundant and long PATH strings If MSVCCompiler.initialize() was called multiple times, the path would get duplicated. On Windows, this is a problem because the path is limited to 4k. There's no benefit in adding a path multiple times, so prevent that from occuring. We also normalize the path before checking for duplicates so things like /a and /a/ won't both be stored. Will backport. ........ r54646 | brett.cannon | 2007-04-01 11:47:27 -0700 (Sun, 01 Apr 2007) | 8 lines time.strptime's caching of its locale object was being recreated when the locale changed but not used during the function call it was recreated during. The test in this checkin is untested (OS X does not have the proper locale support for me to test), although the fix for the bug this deals with was tested by the OP (#1290505). Once the buildbots verify the test at least doesn't fail it becomes a backport candidate. ........ r54647 | brett.cannon | 2007-04-01 12:46:19 -0700 (Sun, 01 Apr 2007) | 3 lines Fix the test for recreating the locale cache object by not worrying about if one of the test locales cannot be set. ........ r54649 | georg.brandl | 2007-04-01 14:29:15 -0700 (Sun, 01 Apr 2007) | 2 lines Fix a lot of markup and meta-information glitches. ........ r54650 | georg.brandl | 2007-04-01 14:39:52 -0700 (Sun, 01 Apr 2007) | 2 lines Another fix. ........ r54651 | georg.brandl | 2007-04-01 15:39:10 -0700 (Sun, 01 Apr 2007) | 2 lines Lots of explicit class names for method and member descs. ........ r54652 | georg.brandl | 2007-04-01 15:40:12 -0700 (Sun, 01 Apr 2007) | 2 lines Explicit class names. ........ r54653 | georg.brandl | 2007-04-01 15:47:31 -0700 (Sun, 01 Apr 2007) | 2 lines Some semantic fixes. ........ r54654 | georg.brandl | 2007-04-01 16:29:10 -0700 (Sun, 01 Apr 2007) | 2 lines Remove bogus entry. ........ r54655 | georg.brandl | 2007-04-01 16:31:30 -0700 (Sun, 01 Apr 2007) | 2 lines Fix the class name of strings. ........ r54658 | raymond.hettinger | 2007-04-02 10:29:30 -0700 (Mon, 02 Apr 2007) | 1 line SF #1693079: Cannot save empty array in shelve ........ r54663 | raymond.hettinger | 2007-04-02 15:54:21 -0700 (Mon, 02 Apr 2007) | 3 lines Array module's buffer interface can now handle empty arrays. ........ r54664 | guido.van.rossum | 2007-04-02 16:55:37 -0700 (Mon, 02 Apr 2007) | 5 lines Fix warnings about object.__init__() signature. Two (test_array and test_descr) were bug IMO; the third (copy_reg) is a work-around which recognizes that object.__init__() doesn't do anything. ........ r54666 | raymond.hettinger | 2007-04-02 17:02:11 -0700 (Mon, 02 Apr 2007) | 1 line SF 1602378 Clarify docstrings for bisect ........ r54668 | raymond.hettinger | 2007-04-02 18:39:43 -0700 (Mon, 02 Apr 2007) | 3 lines SF #1382213: Tutorial section 9.5.1 ignores MRO for new-style classes ........ r54669 | matthias.klose | 2007-04-02 21:35:59 -0700 (Mon, 02 Apr 2007) | 4 lines - Fix an off-by-one bug in locale.strxfrm(). patch taken from http://bugs.debian.org/416934. ........ r54671 | georg.brandl | 2007-04-03 00:04:27 -0700 (Tue, 03 Apr 2007) | 9 lines Fix the strange case of \begin{methoddesc}[NNTP]{...} where \ifx#1\@undefined ended up comparing N and N, therefore executing the true part of the conditional, blowing up at \@undefined. ........ r54672 | facundo.batista | 2007-04-03 07:05:08 -0700 (Tue, 03 Apr 2007) | 4 lines Now using unittest for the tests infraestructure. Also split the tests in those who need the network, and that who doesn't. ........ r54673 | walter.doerwald | 2007-04-03 09:08:10 -0700 (Tue, 03 Apr 2007) | 4 lines Move the functionality for catching warnings in test_warnings.py into a separate class to that reusing the functionality in test_structmembers.py doesn't rerun the tests from test_warnings.py. ........ r54674 | walter.doerwald | 2007-04-03 09:16:24 -0700 (Tue, 03 Apr 2007) | 2 lines Document that CatchWarningTests is reused by test_structmembers.py. ........ r54675 | walter.doerwald | 2007-04-03 09:53:43 -0700 (Tue, 03 Apr 2007) | 4 lines Add tests for the filename. Test that the stacklevel is handled correctly. ........ r54676 | facundo.batista | 2007-04-03 10:29:48 -0700 (Tue, 03 Apr 2007) | 6 lines Added a SSL server to test_socket_ssl.py to be able to test locally. Now, it checks if have openssl available and run those specific tests (it starts openssl at the beggining of all the tests and then kills it at the end). ........ r54677 | walter.doerwald | 2007-04-03 11:33:29 -0700 (Tue, 03 Apr 2007) | 6 lines Implement a contextmanager test.test_support.catch_warning that can be used to catch the last warning issued by the warning framework. Change test_warnings.py and test_structmembers.py to use this new contextmanager. ........ r54678 | facundo.batista | 2007-04-03 14:15:34 -0700 (Tue, 03 Apr 2007) | 4 lines Changed the whole structure of startup and checking if the server is available. Hope to not get more false alarms. ........ r54681 | facundo.batista | 2007-04-04 07:10:40 -0700 (Wed, 04 Apr 2007) | 4 lines Fixed the way that the .pem files are looked for, and changed how to kill the process in win32 to use the _handle attribute. ........ r54682 | guido.van.rossum | 2007-04-04 10:43:02 -0700 (Wed, 04 Apr 2007) | 4 lines Fix a race condition in this test -- instead of assuming that it will take the test server thread at most 0.5 seconds to get ready, use an event variable. ........ r54683 | collin.winter | 2007-04-04 11:14:17 -0700 (Wed, 04 Apr 2007) | 1 line Clean up imports. ........ r54684 | collin.winter | 2007-04-04 11:16:24 -0700 (Wed, 04 Apr 2007) | 1 line Stop using test_support.verify(). ........ r54685 | martin.v.loewis | 2007-04-04 11:30:36 -0700 (Wed, 04 Apr 2007) | 2 lines Bug #1686475: Support stat'ing open files on Windows again. Will backport to 2.5. ........ r54687 | collin.winter | 2007-04-04 11:33:40 -0700 (Wed, 04 Apr 2007) | 1 line Make test_getopt use unittest. ........ r54688 | collin.winter | 2007-04-04 11:36:30 -0700 (Wed, 04 Apr 2007) | 1 line Make test_softspace use unittest. ........ r54689 | ziga.seilnacht | 2007-04-04 11:38:47 -0700 (Wed, 04 Apr 2007) | 2 lines Fix WalkTests.test_traversal() on Windows. The cleanup in MakedirTests.setUp() can now be removed. ........ r54695 | raymond.hettinger | 2007-04-05 11:00:03 -0700 (Thu, 05 Apr 2007) | 3 lines Bug #1563759: struct.unpack doens't support buffer protocol objects ........ r54697 | collin.winter | 2007-04-05 13:05:07 -0700 (Thu, 05 Apr 2007) | 1 line Convert test_long_future to use unittest. ........ r54698 | collin.winter | 2007-04-05 13:08:56 -0700 (Thu, 05 Apr 2007) | 1 line Convert test_normalization to use unittest. ........ r54699 | andrew.kuchling | 2007-04-05 18:11:58 -0700 (Thu, 05 Apr 2007) | 1 line Some grammar fixes ........ r54704 | collin.winter | 2007-04-06 12:27:40 -0700 (Fri, 06 Apr 2007) | 1 line Convert test_stringprep to use unittest. ........ r54705 | collin.winter | 2007-04-06 12:32:32 -0700 (Fri, 06 Apr 2007) | 1 line Import cleanup in test_crypt. ........ r54706 | collin.winter | 2007-04-06 13:00:05 -0700 (Fri, 06 Apr 2007) | 1 line Convert test_gc to use unittest. ........ r54707 | collin.winter | 2007-04-06 13:03:11 -0700 (Fri, 06 Apr 2007) | 1 line Convert test_module to use unittest. ........ r54711 | collin.winter | 2007-04-06 21:40:43 -0700 (Fri, 06 Apr 2007) | 1 line Convert test_fileinput to use unittest. ........ r54712 | brett.cannon | 2007-04-07 21:29:32 -0700 (Sat, 07 Apr 2007) | 5 lines Doc that file.next() has undefined behaviour when called on a file opened with 'w'. Closes bug #1569057. To be backported once 2.5 branch is unfrozen. ........ r54726 | vinay.sajip | 2007-04-09 09:16:10 -0700 (Mon, 09 Apr 2007) | 1 line Added optional timeout to SocketHandler.makeSocket (SF #1695948) ........ r54727 | ziga.seilnacht | 2007-04-09 12:10:29 -0700 (Mon, 09 Apr 2007) | 3 lines Patch #1695862: remove old test directory that causes test_urllib failures on Windows buildbots. The change is a one time fix and will be removed after a successful buildbot run. ........ r54729 | facundo.batista | 2007-04-09 20:00:37 -0700 (Mon, 09 Apr 2007) | 3 lines Minor fix to the tests pass ok even with -O. ........ r54730 | collin.winter | 2007-04-09 21:44:49 -0700 (Mon, 09 Apr 2007) | 1 line Typo fix. ........ r54732 | facundo.batista | 2007-04-10 05:58:45 -0700 (Tue, 10 Apr 2007) | 5 lines General clean-up. Lot of margin corrections, comments, some typos. Exceptions now are raised in the new style. And a mockup class is now also new style. Thanks Santiago Pereson. ........ r54741 | georg.brandl | 2007-04-10 14:39:38 -0700 (Tue, 10 Apr 2007) | 2 lines Repair a duplicate label and some obsolete uses of \setindexsubitem. ........ r54746 | andrew.kuchling | 2007-04-11 06:39:00 -0700 (Wed, 11 Apr 2007) | 1 line Add window.chgat() method, submitted via e-mail by Fabian Kreutz ........ r54747 | andrew.kuchling | 2007-04-11 06:42:25 -0700 (Wed, 11 Apr 2007) | 1 line Point readers at the patch submission instructions ........ r54748 | andrew.kuchling | 2007-04-11 06:47:13 -0700 (Wed, 11 Apr 2007) | 1 line Describe undocumented third argument to touchline() ........ r54757 | georg.brandl | 2007-04-11 10:16:24 -0700 (Wed, 11 Apr 2007) | 3 lines Add some missing NULL checks which trigger crashes on low-memory conditions. Found by Victor Stinner. Will backport when 2.5 branch is unfrozen. ........ r54760 | raymond.hettinger | 2007-04-11 11:40:58 -0700 (Wed, 11 Apr 2007) | 1 line SF 1191699: Make slices picklable ........ r54762 | georg.brandl | 2007-04-11 12:25:11 -0700 (Wed, 11 Apr 2007) | 2 lines Exceptions are no longer old-style instances. Fix accordingly. ........ r54763 | georg.brandl | 2007-04-11 16:28:44 -0700 (Wed, 11 Apr 2007) | 2 lines Repair missing spaces after \UNIX. ........ r54772 | raymond.hettinger | 2007-04-11 21:10:00 -0700 (Wed, 11 Apr 2007) | 1 line SF 1193128: Let str.translate(None) be an identity transformation ........ r54784 | georg.brandl | 2007-04-12 00:01:19 -0700 (Thu, 12 Apr 2007) | 2 lines Patch #1698951: clarify deprecation message in rexec and Bastion ........ r54785 | ziga.seilnacht | 2007-04-12 01:46:51 -0700 (Thu, 12 Apr 2007) | 2 lines Patch #1695862: remove the cleanup code, now that Windows buildbots are green again. ........ r54786 | walter.doerwald | 2007-04-12 03:35:00 -0700 (Thu, 12 Apr 2007) | 3 lines Fix utf-8-sig incremental decoder, which didn't recognise a BOM when the first chunk fed to the decoder started with a BOM, but was longer than 3 bytes. ........ r54807 | barry.warsaw | 2007-04-13 11:47:14 -0700 (Fri, 13 Apr 2007) | 8 lines Port r54805 from python25-maint branch: Add code to read from master_fd in the parent, breaking when we get an OSError (EIO can occur on Linux) or there's no more data to read. Without this, test_pty.py can hang on the waitpid() because the child is blocking on the stdout write. This will definitely happen on Mac OS X and could potentially happen on other platforms. See the comment for details. ........ r54812 | kristjan.jonsson | 2007-04-13 15:07:33 -0700 (Fri, 13 Apr 2007) | 1 line Fix a bug when using the __lltrace__ opcode tracer, and a problem sith signed chars in frameobject.c which can occur with opcodes > 127 ........ r54814 | kristjan.jonsson | 2007-04-13 15:20:13 -0700 (Fri, 13 Apr 2007) | 1 line Fix potential crash in path manipulation on windows ........ r54816 | trent.mick | 2007-04-13 16:22:05 -0700 (Fri, 13 Apr 2007) | 4 lines Add the necessary dependency for the Windows VC6 build to ensure 'pythoncore' is built before '_ctypes' is attempted. Will backport to 2.5 once it is unfrozen for 2.5.1. ........ r54825 | neal.norwitz | 2007-04-13 22:25:50 -0700 (Fri, 13 Apr 2007) | 3 lines When __slots__ are set to a unicode string, make it work the same as setting a plain string, ie don't expand to single letter identifiers. ........ r54841 | neal.norwitz | 2007-04-16 00:37:55 -0700 (Mon, 16 Apr 2007) | 1 line SF #1701207, Fix bogus assertion (and test it!) ........ r54844 | collin.winter | 2007-04-16 15:10:32 -0700 (Mon, 16 Apr 2007) | 1 line Check the availability of the urlfetch resource earlier than before. ........ r54849 | martin.v.loewis | 2007-04-16 22:02:01 -0700 (Mon, 16 Apr 2007) | 2 lines Add Travis Oliphant. ........ r54873 | brett.cannon | 2007-04-18 20:44:17 -0700 (Wed, 18 Apr 2007) | 2 lines Silence a compiler warning about incompatible pointer types. ........ r54874 | neal.norwitz | 2007-04-18 22:52:37 -0700 (Wed, 18 Apr 2007) | 2 lines SF #1703270, add missing declaration in readline.c to avoid compiler warning. ........ r54875 | armin.rigo | 2007-04-19 07:44:48 -0700 (Thu, 19 Apr 2007) | 8 lines Revert r53997 as per http://mail.python.org/pipermail/python-dev/2007-March/071796.html . I've kept a couple of still-valid extra tests in test_descr, but didn't bother to sort through the new comments and refactorings added in r53997 to see if some of them could be kept. If so, they could go in a follow-up check-in. ........ r54876 | armin.rigo | 2007-04-19 07:56:48 -0700 (Thu, 19 Apr 2007) | 2 lines Fix a usage of the dangerous pattern decref - modify field - incref. ........ r54884 | neal.norwitz | 2007-04-19 22:20:38 -0700 (Thu, 19 Apr 2007) | 9 lines Add an optional address to copy the failure mails to. Detect a conflict in the only file that should have outstanding changes when this script is run. This doesn't matter on the trunk, but does when run on a branch. Trunk always has the date set to today in boilerplate.tex. Each time a release is cut with a different date, a conflict occurs. (We could copy a known good version, but then we would lose changes to this file.) ........ r54918 | georg.brandl | 2007-04-21 13:35:38 -0700 (Sat, 21 Apr 2007) | 3 lines Bug #1704790: bind name "sys" locally in __del__ method so that it is not cleared before __del__ is run. ........ r54920 | facundo.batista | 2007-04-21 18:18:56 -0700 (Sat, 21 Apr 2007) | 5 lines Added tests for other methods of SSL object. Now we cover all the object methods. This is the final step to close the #451607 bug. ........ r54927 | facundo.batista | 2007-04-23 10:08:31 -0700 (Mon, 23 Apr 2007) | 5 lines As specified in RFC 2616, 2xx code indicates that the client's request was successfully received, understood, and accepted. Now in these cases no error is raised. Also fixed tests. ........ r54929 | collin.winter | 2007-04-23 20:43:46 -0700 (Mon, 23 Apr 2007) | 1 line Convert PyUnit -> unittest. ........ r54931 | collin.winter | 2007-04-23 21:09:52 -0700 (Mon, 23 Apr 2007) | 1 line Remove code that hasn't been called in years. ........ r54932 | neal.norwitz | 2007-04-23 21:53:12 -0700 (Mon, 23 Apr 2007) | 1 line Fix SF #1703110, Incorrect example for add_password() (use uri, not host) ........ r54934 | georg.brandl | 2007-04-24 03:36:42 -0700 (Tue, 24 Apr 2007) | 2 lines Some new year updates. ........ r54938 | facundo.batista | 2007-04-24 06:54:38 -0700 (Tue, 24 Apr 2007) | 4 lines Added a comment about last change in urllib2.py (all 2xx responses are ok now). ........ r54939 | georg.brandl | 2007-04-24 08:10:09 -0700 (Tue, 24 Apr 2007) | 2 lines Bug #1705717: error in sys.argv docs. ........ r54941 | georg.brandl | 2007-04-24 08:27:13 -0700 (Tue, 24 Apr 2007) | 4 lines Bug #1706381: Specifying the SWIG option "-c++" in the setup.py file (as opposed to the command line) will now write file names ending in ".cpp" too. ........ r54944 | raymond.hettinger | 2007-04-24 15:13:43 -0700 (Tue, 24 Apr 2007) | 1 line Fix markup ........ r54945 | kristjan.jonsson | 2007-04-24 17:10:50 -0700 (Tue, 24 Apr 2007) | 1 line Merge change 54909 from release25-maint: Fix several minor issues discovered using code analysis in VisualStudio 2005 Team Edition ........ r54947 | kristjan.jonsson | 2007-04-24 17:17:39 -0700 (Tue, 24 Apr 2007) | 1 line Make pythoncore compile cleanly with VisualStudio 2005. Used an explicit typecast to get a 64 bit integer, and undefined the Yield macro that conflicts with winbase.h ........ r54948 | kristjan.jonsson | 2007-04-24 17:19:26 -0700 (Tue, 24 Apr 2007) | 1 line Remove obsolete comment. Importing of .dll files has been discontinued, only .pyd files supported on windows now. ........ r54949 | georg.brandl | 2007-04-24 23:24:59 -0700 (Tue, 24 Apr 2007) | 2 lines Patch #1698768: updated the "using Python on the Mac" intro. ........ r54951 | georg.brandl | 2007-04-24 23:25:55 -0700 (Tue, 24 Apr 2007) | 2 lines Markup fix. ........ r54953 | neal.norwitz | 2007-04-24 23:30:05 -0700 (Tue, 24 Apr 2007) | 3 lines Whitespace normalization. Ugh, we really need to do this more often. You might want to review this change as it's my first time. Be gentle. :-) ........ r54956 | collin.winter | 2007-04-25 10:29:52 -0700 (Wed, 25 Apr 2007) | 1 line Standardize on test.test_support.run_unittest() (as opposed to a mix of run_unittest() and run_suite()). Also, add functionality to run_unittest() that admits usage of unittest.TestLoader.loadTestsFromModule(). ........ r54957 | collin.winter | 2007-04-25 10:37:35 -0700 (Wed, 25 Apr 2007) | 1 line Remove functionality from test_datetime.test_main() that does reference count checking; 'regrtest.py -R' is the way to do this kind of testing. ........ r54958 | collin.winter | 2007-04-25 10:57:53 -0700 (Wed, 25 Apr 2007) | 1 line Change test_support.have_unicode to use True/False instead of 1/0. ........ r54959 | tim.peters | 2007-04-25 11:47:18 -0700 (Wed, 25 Apr 2007) | 2 lines Whitespace normalization. ........ r54960 | tim.peters | 2007-04-25 11:48:35 -0700 (Wed, 25 Apr 2007) | 2 lines Set missing svn:eol-style property on text files. ........ r54961 | collin.winter | 2007-04-25 11:54:36 -0700 (Wed, 25 Apr 2007) | 1 line Import and raise statement cleanup. ........ r54969 | collin.winter | 2007-04-25 13:41:34 -0700 (Wed, 25 Apr 2007) | 1 line Convert test_ossaudiodev to use unittest. ........ r54974 | collin.winter | 2007-04-25 14:50:25 -0700 (Wed, 25 Apr 2007) | 1 line Fix an issue related to the unittest conversion. ........ r54979 | fred.drake | 2007-04-25 21:42:19 -0700 (Wed, 25 Apr 2007) | 1 line fix some markup errors ........ r54982 | kristjan.jonsson | 2007-04-26 02:15:08 -0700 (Thu, 26 Apr 2007) | 1 line Export function sanitize_the_mode from fileobject.c as _PyFile_SanitizeMode(). Use this function in posixmodule.c when implementing fdopen(). This fixes test_subprocess.py for a VisualStudio 2005 compile. ........ r54983 | kristjan.jonsson | 2007-04-26 06:44:16 -0700 (Thu, 26 Apr 2007) | 1 line The locale "En" appears not to be valid on windows underi VisualStudio.2005. Added "English" to the test_locale.py to make the testsuite pass for that build ........ r54984 | steve.holden | 2007-04-26 07:23:12 -0700 (Thu, 26 Apr 2007) | 1 line Minor wording change on slicing aide-memoire. ........ r54985 | kristjan.jonsson | 2007-04-26 08:24:54 -0700 (Thu, 26 Apr 2007) | 1 line Accomodate 64 bit time_t in the _bsddb module. ........
4230 lines
117 KiB
Python
4230 lines
117 KiB
Python
# Test enhancements related to descriptors and new-style classes
|
|
|
|
from test.test_support import verify, vereq, verbose, TestFailed, TESTFN, get_original_stdout
|
|
from copy import deepcopy
|
|
import warnings
|
|
|
|
warnings.filterwarnings("ignore",
|
|
r'complex divmod\(\), // and % are deprecated$',
|
|
DeprecationWarning, r'(<string>|%s)$' % __name__)
|
|
|
|
def veris(a, b):
|
|
if a is not b:
|
|
raise TestFailed, "%r is %r" % (a, b)
|
|
|
|
def testunop(a, res, expr="len(a)", meth="__len__"):
|
|
if verbose: print("checking", expr)
|
|
dict = {'a': a}
|
|
vereq(eval(expr, dict), res)
|
|
t = type(a)
|
|
m = getattr(t, meth)
|
|
while meth not in t.__dict__:
|
|
t = t.__bases__[0]
|
|
vereq(m, t.__dict__[meth])
|
|
vereq(m(a), res)
|
|
bm = getattr(a, meth)
|
|
vereq(bm(), res)
|
|
|
|
def testbinop(a, b, res, expr="a+b", meth="__add__"):
|
|
if verbose: print("checking", expr)
|
|
dict = {'a': a, 'b': b}
|
|
|
|
vereq(eval(expr, dict), res)
|
|
t = type(a)
|
|
m = getattr(t, meth)
|
|
while meth not in t.__dict__:
|
|
t = t.__bases__[0]
|
|
vereq(m, t.__dict__[meth])
|
|
vereq(m(a, b), res)
|
|
bm = getattr(a, meth)
|
|
vereq(bm(b), res)
|
|
|
|
def testternop(a, b, c, res, expr="a[b:c]", meth="__getslice__"):
|
|
if verbose: print("checking", expr)
|
|
dict = {'a': a, 'b': b, 'c': c}
|
|
vereq(eval(expr, dict), res)
|
|
t = type(a)
|
|
m = getattr(t, meth)
|
|
while meth not in t.__dict__:
|
|
t = t.__bases__[0]
|
|
vereq(m, t.__dict__[meth])
|
|
vereq(m(a, b, c), res)
|
|
bm = getattr(a, meth)
|
|
vereq(bm(b, c), res)
|
|
|
|
def testsetop(a, b, res, stmt="a+=b", meth="__iadd__"):
|
|
if verbose: print("checking", stmt)
|
|
dict = {'a': deepcopy(a), 'b': b}
|
|
exec(stmt, dict)
|
|
vereq(dict['a'], res)
|
|
t = type(a)
|
|
m = getattr(t, meth)
|
|
while meth not in t.__dict__:
|
|
t = t.__bases__[0]
|
|
vereq(m, t.__dict__[meth])
|
|
dict['a'] = deepcopy(a)
|
|
m(dict['a'], b)
|
|
vereq(dict['a'], res)
|
|
dict['a'] = deepcopy(a)
|
|
bm = getattr(dict['a'], meth)
|
|
bm(b)
|
|
vereq(dict['a'], res)
|
|
|
|
def testset2op(a, b, c, res, stmt="a[b]=c", meth="__setitem__"):
|
|
if verbose: print("checking", stmt)
|
|
dict = {'a': deepcopy(a), 'b': b, 'c': c}
|
|
exec(stmt, dict)
|
|
vereq(dict['a'], res)
|
|
t = type(a)
|
|
m = getattr(t, meth)
|
|
while meth not in t.__dict__:
|
|
t = t.__bases__[0]
|
|
vereq(m, t.__dict__[meth])
|
|
dict['a'] = deepcopy(a)
|
|
m(dict['a'], b, c)
|
|
vereq(dict['a'], res)
|
|
dict['a'] = deepcopy(a)
|
|
bm = getattr(dict['a'], meth)
|
|
bm(b, c)
|
|
vereq(dict['a'], res)
|
|
|
|
def testset3op(a, b, c, d, res, stmt="a[b:c]=d", meth="__setslice__"):
|
|
if verbose: print("checking", stmt)
|
|
dict = {'a': deepcopy(a), 'b': b, 'c': c, 'd': d}
|
|
exec(stmt, dict)
|
|
vereq(dict['a'], res)
|
|
t = type(a)
|
|
while meth not in t.__dict__:
|
|
t = t.__bases__[0]
|
|
m = getattr(t, meth)
|
|
vereq(m, t.__dict__[meth])
|
|
dict['a'] = deepcopy(a)
|
|
m(dict['a'], b, c, d)
|
|
vereq(dict['a'], res)
|
|
dict['a'] = deepcopy(a)
|
|
bm = getattr(dict['a'], meth)
|
|
bm(b, c, d)
|
|
vereq(dict['a'], res)
|
|
|
|
def class_docstrings():
|
|
class Classic:
|
|
"A classic docstring."
|
|
vereq(Classic.__doc__, "A classic docstring.")
|
|
vereq(Classic.__dict__['__doc__'], "A classic docstring.")
|
|
|
|
class Classic2:
|
|
pass
|
|
verify(Classic2.__doc__ is None)
|
|
|
|
class NewStatic(object):
|
|
"Another docstring."
|
|
vereq(NewStatic.__doc__, "Another docstring.")
|
|
vereq(NewStatic.__dict__['__doc__'], "Another docstring.")
|
|
|
|
class NewStatic2(object):
|
|
pass
|
|
verify(NewStatic2.__doc__ is None)
|
|
|
|
class NewDynamic(object):
|
|
"Another docstring."
|
|
vereq(NewDynamic.__doc__, "Another docstring.")
|
|
vereq(NewDynamic.__dict__['__doc__'], "Another docstring.")
|
|
|
|
class NewDynamic2(object):
|
|
pass
|
|
verify(NewDynamic2.__doc__ is None)
|
|
|
|
def lists():
|
|
if verbose: print("Testing list operations...")
|
|
testbinop([1], [2], [1,2], "a+b", "__add__")
|
|
testbinop([1,2,3], 2, 1, "b in a", "__contains__")
|
|
testbinop([1,2,3], 4, 0, "b in a", "__contains__")
|
|
testbinop([1,2,3], 1, 2, "a[b]", "__getitem__")
|
|
testternop([1,2,3], 0, 2, [1,2], "a[b:c]", "__getslice__")
|
|
testsetop([1], [2], [1,2], "a+=b", "__iadd__")
|
|
testsetop([1,2], 3, [1,2,1,2,1,2], "a*=b", "__imul__")
|
|
testunop([1,2,3], 3, "len(a)", "__len__")
|
|
testbinop([1,2], 3, [1,2,1,2,1,2], "a*b", "__mul__")
|
|
testbinop([1,2], 3, [1,2,1,2,1,2], "b*a", "__rmul__")
|
|
testset2op([1,2], 1, 3, [1,3], "a[b]=c", "__setitem__")
|
|
testset3op([1,2,3,4], 1, 3, [5,6], [1,5,6,4], "a[b:c]=d", "__setslice__")
|
|
|
|
def dicts():
|
|
if verbose: print("Testing dict operations...")
|
|
##testbinop({1:2}, {2:1}, -1, "cmp(a,b)", "__cmp__")
|
|
testbinop({1:2,3:4}, 1, 1, "b in a", "__contains__")
|
|
testbinop({1:2,3:4}, 2, 0, "b in a", "__contains__")
|
|
testbinop({1:2,3:4}, 1, 2, "a[b]", "__getitem__")
|
|
d = {1:2,3:4}
|
|
l1 = []
|
|
for i in d.keys(): l1.append(i)
|
|
l = []
|
|
for i in iter(d): l.append(i)
|
|
vereq(l, l1)
|
|
l = []
|
|
for i in d.__iter__(): l.append(i)
|
|
vereq(l, l1)
|
|
l = []
|
|
for i in dict.__iter__(d): l.append(i)
|
|
vereq(l, l1)
|
|
d = {1:2, 3:4}
|
|
testunop(d, 2, "len(a)", "__len__")
|
|
vereq(eval(repr(d), {}), d)
|
|
vereq(eval(d.__repr__(), {}), d)
|
|
testset2op({1:2,3:4}, 2, 3, {1:2,2:3,3:4}, "a[b]=c", "__setitem__")
|
|
|
|
def dict_constructor():
|
|
if verbose:
|
|
print("Testing dict constructor ...")
|
|
d = dict()
|
|
vereq(d, {})
|
|
d = dict({})
|
|
vereq(d, {})
|
|
d = dict({1: 2, 'a': 'b'})
|
|
vereq(d, {1: 2, 'a': 'b'})
|
|
vereq(d, dict(d.items()))
|
|
vereq(d, dict(d.items()))
|
|
d = dict({'one':1, 'two':2})
|
|
vereq(d, dict(one=1, two=2))
|
|
vereq(d, dict(**d))
|
|
vereq(d, dict({"one": 1}, two=2))
|
|
vereq(d, dict([("two", 2)], one=1))
|
|
vereq(d, dict([("one", 100), ("two", 200)], **d))
|
|
verify(d is not dict(**d))
|
|
for badarg in 0, 0, 0j, "0", [0], (0,):
|
|
try:
|
|
dict(badarg)
|
|
except TypeError:
|
|
pass
|
|
except ValueError:
|
|
if badarg == "0":
|
|
# It's a sequence, and its elements are also sequences (gotta
|
|
# love strings <wink>), but they aren't of length 2, so this
|
|
# one seemed better as a ValueError than a TypeError.
|
|
pass
|
|
else:
|
|
raise TestFailed("no TypeError from dict(%r)" % badarg)
|
|
else:
|
|
raise TestFailed("no TypeError from dict(%r)" % badarg)
|
|
|
|
try:
|
|
dict({}, {})
|
|
except TypeError:
|
|
pass
|
|
else:
|
|
raise TestFailed("no TypeError from dict({}, {})")
|
|
|
|
class Mapping:
|
|
# Lacks a .keys() method; will be added later.
|
|
dict = {1:2, 3:4, 'a':1j}
|
|
|
|
try:
|
|
dict(Mapping())
|
|
except TypeError:
|
|
pass
|
|
else:
|
|
raise TestFailed("no TypeError from dict(incomplete mapping)")
|
|
|
|
Mapping.keys = lambda self: self.dict.keys()
|
|
Mapping.__getitem__ = lambda self, i: self.dict[i]
|
|
d = dict(Mapping())
|
|
vereq(d, Mapping.dict)
|
|
|
|
# Init from sequence of iterable objects, each producing a 2-sequence.
|
|
class AddressBookEntry:
|
|
def __init__(self, first, last):
|
|
self.first = first
|
|
self.last = last
|
|
def __iter__(self):
|
|
return iter([self.first, self.last])
|
|
|
|
d = dict([AddressBookEntry('Tim', 'Warsaw'),
|
|
AddressBookEntry('Barry', 'Peters'),
|
|
AddressBookEntry('Tim', 'Peters'),
|
|
AddressBookEntry('Barry', 'Warsaw')])
|
|
vereq(d, {'Barry': 'Warsaw', 'Tim': 'Peters'})
|
|
|
|
d = dict(zip(range(4), range(1, 5)))
|
|
vereq(d, dict([(i, i+1) for i in range(4)]))
|
|
|
|
# Bad sequence lengths.
|
|
for bad in [('tooshort',)], [('too', 'long', 'by 1')]:
|
|
try:
|
|
dict(bad)
|
|
except ValueError:
|
|
pass
|
|
else:
|
|
raise TestFailed("no ValueError from dict(%r)" % bad)
|
|
|
|
def test_dir():
|
|
if verbose:
|
|
print("Testing dir() ...")
|
|
junk = 12
|
|
vereq(dir(), ['junk'])
|
|
del junk
|
|
|
|
# Just make sure these don't blow up!
|
|
for arg in 2, 2, 2j, 2e0, [2], "2", u"2", (2,), {2:2}, type, test_dir:
|
|
dir(arg)
|
|
|
|
# Test dir on custom classes. Since these have object as a
|
|
# base class, a lot of stuff gets sucked in.
|
|
def interesting(strings):
|
|
return [s for s in strings if not s.startswith('_')]
|
|
|
|
class C(object):
|
|
Cdata = 1
|
|
def Cmethod(self): pass
|
|
|
|
cstuff = ['Cdata', 'Cmethod']
|
|
vereq(interesting(dir(C)), cstuff)
|
|
|
|
c = C()
|
|
vereq(interesting(dir(c)), cstuff)
|
|
verify('im_self' in dir(C.Cmethod))
|
|
|
|
c.cdata = 2
|
|
c.cmethod = lambda self: 0
|
|
vereq(interesting(dir(c)), cstuff + ['cdata', 'cmethod'])
|
|
verify('im_self' in dir(c.Cmethod))
|
|
|
|
class A(C):
|
|
Adata = 1
|
|
def Amethod(self): pass
|
|
|
|
astuff = ['Adata', 'Amethod'] + cstuff
|
|
vereq(interesting(dir(A)), astuff)
|
|
verify('im_self' in dir(A.Amethod))
|
|
a = A()
|
|
vereq(interesting(dir(a)), astuff)
|
|
a.adata = 42
|
|
a.amethod = lambda self: 3
|
|
vereq(interesting(dir(a)), astuff + ['adata', 'amethod'])
|
|
verify('im_self' in dir(a.Amethod))
|
|
|
|
# Try a module subclass.
|
|
import sys
|
|
class M(type(sys)):
|
|
pass
|
|
minstance = M("m")
|
|
minstance.b = 2
|
|
minstance.a = 1
|
|
names = [x for x in dir(minstance) if x not in ["__name__", "__doc__"]]
|
|
vereq(names, ['a', 'b'])
|
|
|
|
class M2(M):
|
|
def getdict(self):
|
|
return "Not a dict!"
|
|
__dict__ = property(getdict)
|
|
|
|
m2instance = M2("m2")
|
|
m2instance.b = 2
|
|
m2instance.a = 1
|
|
vereq(m2instance.__dict__, "Not a dict!")
|
|
try:
|
|
dir(m2instance)
|
|
except TypeError:
|
|
pass
|
|
|
|
# Two essentially featureless objects, just inheriting stuff from
|
|
# object.
|
|
vereq(dir(None), dir(Ellipsis))
|
|
|
|
# Nasty test case for proxied objects
|
|
class Wrapper(object):
|
|
def __init__(self, obj):
|
|
self.__obj = obj
|
|
def __repr__(self):
|
|
return "Wrapper(%s)" % repr(self.__obj)
|
|
def __getitem__(self, key):
|
|
return Wrapper(self.__obj[key])
|
|
def __len__(self):
|
|
return len(self.__obj)
|
|
def __getattr__(self, name):
|
|
return Wrapper(getattr(self.__obj, name))
|
|
|
|
class C(object):
|
|
def __getclass(self):
|
|
return Wrapper(type(self))
|
|
__class__ = property(__getclass)
|
|
|
|
dir(C()) # This used to segfault
|
|
|
|
binops = {
|
|
'add': '+',
|
|
'sub': '-',
|
|
'mul': '*',
|
|
'div': '/',
|
|
'mod': '%',
|
|
'divmod': 'divmod',
|
|
'pow': '**',
|
|
'lshift': '<<',
|
|
'rshift': '>>',
|
|
'and': '&',
|
|
'xor': '^',
|
|
'or': '|',
|
|
'cmp': 'cmp',
|
|
'lt': '<',
|
|
'le': '<=',
|
|
'eq': '==',
|
|
'ne': '!=',
|
|
'gt': '>',
|
|
'ge': '>=',
|
|
}
|
|
|
|
for name, expr in binops.items():
|
|
if expr.islower():
|
|
expr = expr + "(a, b)"
|
|
else:
|
|
expr = 'a %s b' % expr
|
|
binops[name] = expr
|
|
|
|
unops = {
|
|
'pos': '+',
|
|
'neg': '-',
|
|
'abs': 'abs',
|
|
'invert': '~',
|
|
'int': 'int',
|
|
'float': 'float',
|
|
'oct': 'oct',
|
|
'hex': 'hex',
|
|
}
|
|
|
|
for name, expr in unops.items():
|
|
if expr.islower():
|
|
expr = expr + "(a)"
|
|
else:
|
|
expr = '%s a' % expr
|
|
unops[name] = expr
|
|
|
|
def numops(a, b, skip=[]):
|
|
dict = {'a': a, 'b': b}
|
|
for name, expr in binops.items():
|
|
if name not in skip:
|
|
name = "__%s__" % name
|
|
if hasattr(a, name):
|
|
res = eval(expr, dict)
|
|
testbinop(a, b, res, expr, name)
|
|
for name, expr in unops.items():
|
|
if name not in skip:
|
|
name = "__%s__" % name
|
|
if hasattr(a, name):
|
|
res = eval(expr, dict)
|
|
testunop(a, res, expr, name)
|
|
|
|
def ints():
|
|
if verbose: print("Testing int operations...")
|
|
numops(100, 3)
|
|
# The following crashes in Python 2.2
|
|
vereq((1).__bool__(), True)
|
|
vereq((0).__bool__(), False)
|
|
# This returns 'NotImplemented' in Python 2.2
|
|
class C(int):
|
|
def __add__(self, other):
|
|
return NotImplemented
|
|
vereq(C(5), 5)
|
|
try:
|
|
C() + ""
|
|
except TypeError:
|
|
pass
|
|
else:
|
|
raise TestFailed, "NotImplemented should have caused TypeError"
|
|
|
|
def longs():
|
|
if verbose: print("Testing long operations...")
|
|
numops(100, 3)
|
|
|
|
def floats():
|
|
if verbose: print("Testing float operations...")
|
|
numops(100.0, 3.0)
|
|
|
|
def complexes():
|
|
if verbose: print("Testing complex operations...")
|
|
numops(100.0j, 3.0j, skip=['lt', 'le', 'gt', 'ge', 'int', 'long', 'float'])
|
|
class Number(complex):
|
|
__slots__ = ['prec']
|
|
def __new__(cls, *args, **kwds):
|
|
result = complex.__new__(cls, *args)
|
|
result.prec = kwds.get('prec', 12)
|
|
return result
|
|
def __repr__(self):
|
|
prec = self.prec
|
|
if self.imag == 0.0:
|
|
return "%.*g" % (prec, self.real)
|
|
if self.real == 0.0:
|
|
return "%.*gj" % (prec, self.imag)
|
|
return "(%.*g+%.*gj)" % (prec, self.real, prec, self.imag)
|
|
__str__ = __repr__
|
|
|
|
a = Number(3.14, prec=6)
|
|
vereq(repr(a), "3.14")
|
|
vereq(a.prec, 6)
|
|
|
|
a = Number(a, prec=2)
|
|
vereq(repr(a), "3.1")
|
|
vereq(a.prec, 2)
|
|
|
|
a = Number(234.5)
|
|
vereq(repr(a), "234.5")
|
|
vereq(a.prec, 12)
|
|
|
|
def spamlists():
|
|
if verbose: print("Testing spamlist operations...")
|
|
import copy, xxsubtype as spam
|
|
def spamlist(l, memo=None):
|
|
import xxsubtype as spam
|
|
return spam.spamlist(l)
|
|
# This is an ugly hack:
|
|
copy._deepcopy_dispatch[spam.spamlist] = spamlist
|
|
|
|
testbinop(spamlist([1]), spamlist([2]), spamlist([1,2]), "a+b", "__add__")
|
|
testbinop(spamlist([1,2,3]), 2, 1, "b in a", "__contains__")
|
|
testbinop(spamlist([1,2,3]), 4, 0, "b in a", "__contains__")
|
|
testbinop(spamlist([1,2,3]), 1, 2, "a[b]", "__getitem__")
|
|
testternop(spamlist([1,2,3]), 0, 2, spamlist([1,2]),
|
|
"a[b:c]", "__getslice__")
|
|
testsetop(spamlist([1]), spamlist([2]), spamlist([1,2]),
|
|
"a+=b", "__iadd__")
|
|
testsetop(spamlist([1,2]), 3, spamlist([1,2,1,2,1,2]), "a*=b", "__imul__")
|
|
testunop(spamlist([1,2,3]), 3, "len(a)", "__len__")
|
|
testbinop(spamlist([1,2]), 3, spamlist([1,2,1,2,1,2]), "a*b", "__mul__")
|
|
testbinop(spamlist([1,2]), 3, spamlist([1,2,1,2,1,2]), "b*a", "__rmul__")
|
|
testset2op(spamlist([1,2]), 1, 3, spamlist([1,3]), "a[b]=c", "__setitem__")
|
|
testset3op(spamlist([1,2,3,4]), 1, 3, spamlist([5,6]),
|
|
spamlist([1,5,6,4]), "a[b:c]=d", "__setslice__")
|
|
# Test subclassing
|
|
class C(spam.spamlist):
|
|
def foo(self): return 1
|
|
a = C()
|
|
vereq(a, [])
|
|
vereq(a.foo(), 1)
|
|
a.append(100)
|
|
vereq(a, [100])
|
|
vereq(a.getstate(), 0)
|
|
a.setstate(42)
|
|
vereq(a.getstate(), 42)
|
|
|
|
def spamdicts():
|
|
if verbose: print("Testing spamdict operations...")
|
|
import copy, xxsubtype as spam
|
|
def spamdict(d, memo=None):
|
|
import xxsubtype as spam
|
|
sd = spam.spamdict()
|
|
for k, v in d.items(): sd[k] = v
|
|
return sd
|
|
# This is an ugly hack:
|
|
copy._deepcopy_dispatch[spam.spamdict] = spamdict
|
|
|
|
##testbinop(spamdict({1:2}), spamdict({2:1}), -1, "cmp(a,b)", "__cmp__")
|
|
testbinop(spamdict({1:2,3:4}), 1, 1, "b in a", "__contains__")
|
|
testbinop(spamdict({1:2,3:4}), 2, 0, "b in a", "__contains__")
|
|
testbinop(spamdict({1:2,3:4}), 1, 2, "a[b]", "__getitem__")
|
|
d = spamdict({1:2,3:4})
|
|
l1 = []
|
|
for i in d.keys(): l1.append(i)
|
|
l = []
|
|
for i in iter(d): l.append(i)
|
|
vereq(l, l1)
|
|
l = []
|
|
for i in d.__iter__(): l.append(i)
|
|
vereq(l, l1)
|
|
l = []
|
|
for i in type(spamdict({})).__iter__(d): l.append(i)
|
|
vereq(l, l1)
|
|
straightd = {1:2, 3:4}
|
|
spamd = spamdict(straightd)
|
|
testunop(spamd, 2, "len(a)", "__len__")
|
|
testunop(spamd, repr(straightd), "repr(a)", "__repr__")
|
|
testset2op(spamdict({1:2,3:4}), 2, 3, spamdict({1:2,2:3,3:4}),
|
|
"a[b]=c", "__setitem__")
|
|
# Test subclassing
|
|
class C(spam.spamdict):
|
|
def foo(self): return 1
|
|
a = C()
|
|
vereq(list(a.items()), [])
|
|
vereq(a.foo(), 1)
|
|
a['foo'] = 'bar'
|
|
vereq(list(a.items()), [('foo', 'bar')])
|
|
vereq(a.getstate(), 0)
|
|
a.setstate(100)
|
|
vereq(a.getstate(), 100)
|
|
|
|
def pydicts():
|
|
if verbose: print("Testing Python subclass of dict...")
|
|
verify(issubclass(dict, dict))
|
|
verify(isinstance({}, dict))
|
|
d = dict()
|
|
vereq(d, {})
|
|
verify(d.__class__ is dict)
|
|
verify(isinstance(d, dict))
|
|
class C(dict):
|
|
state = -1
|
|
def __init__(self, *a, **kw):
|
|
if a:
|
|
vereq(len(a), 1)
|
|
self.state = a[0]
|
|
if kw:
|
|
for k, v in kw.items(): self[v] = k
|
|
def __getitem__(self, key):
|
|
return self.get(key, 0)
|
|
def __setitem__(self, key, value):
|
|
verify(isinstance(key, type(0)))
|
|
dict.__setitem__(self, key, value)
|
|
def setstate(self, state):
|
|
self.state = state
|
|
def getstate(self):
|
|
return self.state
|
|
verify(issubclass(C, dict))
|
|
a1 = C(12)
|
|
vereq(a1.state, 12)
|
|
a2 = C(foo=1, bar=2)
|
|
vereq(a2[1] == 'foo' and a2[2], 'bar')
|
|
a = C()
|
|
vereq(a.state, -1)
|
|
vereq(a.getstate(), -1)
|
|
a.setstate(0)
|
|
vereq(a.state, 0)
|
|
vereq(a.getstate(), 0)
|
|
a.setstate(10)
|
|
vereq(a.state, 10)
|
|
vereq(a.getstate(), 10)
|
|
vereq(a[42], 0)
|
|
a[42] = 24
|
|
vereq(a[42], 24)
|
|
if verbose: print("pydict stress test ...")
|
|
N = 50
|
|
for i in range(N):
|
|
a[i] = C()
|
|
for j in range(N):
|
|
a[i][j] = i*j
|
|
for i in range(N):
|
|
for j in range(N):
|
|
vereq(a[i][j], i*j)
|
|
|
|
def pylists():
|
|
if verbose: print("Testing Python subclass of list...")
|
|
class C(list):
|
|
def __getitem__(self, i):
|
|
return list.__getitem__(self, i) + 100
|
|
def __getslice__(self, i, j):
|
|
return (i, j)
|
|
a = C()
|
|
a.extend([0,1,2])
|
|
vereq(a[0], 100)
|
|
vereq(a[1], 101)
|
|
vereq(a[2], 102)
|
|
vereq(a[100:200], (100,200))
|
|
|
|
def metaclass():
|
|
if verbose: print("Testing metaclass...")
|
|
class C(metaclass=type):
|
|
def __init__(self):
|
|
self.__state = 0
|
|
def getstate(self):
|
|
return self.__state
|
|
def setstate(self, state):
|
|
self.__state = state
|
|
a = C()
|
|
vereq(a.getstate(), 0)
|
|
a.setstate(10)
|
|
vereq(a.getstate(), 10)
|
|
class _metaclass(type):
|
|
def myself(cls): return cls
|
|
class D(metaclass=_metaclass):
|
|
pass
|
|
vereq(D.myself(), D)
|
|
d = D()
|
|
verify(d.__class__ is D)
|
|
class M1(type):
|
|
def __new__(cls, name, bases, dict):
|
|
dict['__spam__'] = 1
|
|
return type.__new__(cls, name, bases, dict)
|
|
class C(metaclass=M1):
|
|
pass
|
|
vereq(C.__spam__, 1)
|
|
c = C()
|
|
vereq(c.__spam__, 1)
|
|
|
|
class _instance(object):
|
|
pass
|
|
class M2(object):
|
|
@staticmethod
|
|
def __new__(cls, name, bases, dict):
|
|
self = object.__new__(cls)
|
|
self.name = name
|
|
self.bases = bases
|
|
self.dict = dict
|
|
return self
|
|
def __call__(self):
|
|
it = _instance()
|
|
# Early binding of methods
|
|
for key in self.dict:
|
|
if key.startswith("__"):
|
|
continue
|
|
setattr(it, key, self.dict[key].__get__(it, self))
|
|
return it
|
|
class C(metaclass=M2):
|
|
def spam(self):
|
|
return 42
|
|
vereq(C.name, 'C')
|
|
vereq(C.bases, ())
|
|
verify('spam' in C.dict)
|
|
c = C()
|
|
vereq(c.spam(), 42)
|
|
|
|
# More metaclass examples
|
|
|
|
class autosuper(type):
|
|
# Automatically add __super to the class
|
|
# This trick only works for dynamic classes
|
|
def __new__(metaclass, name, bases, dict):
|
|
cls = super(autosuper, metaclass).__new__(metaclass,
|
|
name, bases, dict)
|
|
# Name mangling for __super removes leading underscores
|
|
while name[:1] == "_":
|
|
name = name[1:]
|
|
if name:
|
|
name = "_%s__super" % name
|
|
else:
|
|
name = "__super"
|
|
setattr(cls, name, super(cls))
|
|
return cls
|
|
class A(metaclass=autosuper):
|
|
def meth(self):
|
|
return "A"
|
|
class B(A):
|
|
def meth(self):
|
|
return "B" + self.__super.meth()
|
|
class C(A):
|
|
def meth(self):
|
|
return "C" + self.__super.meth()
|
|
class D(C, B):
|
|
def meth(self):
|
|
return "D" + self.__super.meth()
|
|
vereq(D().meth(), "DCBA")
|
|
class E(B, C):
|
|
def meth(self):
|
|
return "E" + self.__super.meth()
|
|
vereq(E().meth(), "EBCA")
|
|
|
|
class autoproperty(type):
|
|
# Automatically create property attributes when methods
|
|
# named _get_x and/or _set_x are found
|
|
def __new__(metaclass, name, bases, dict):
|
|
hits = {}
|
|
for key, val in dict.items():
|
|
if key.startswith("_get_"):
|
|
key = key[5:]
|
|
get, set = hits.get(key, (None, None))
|
|
get = val
|
|
hits[key] = get, set
|
|
elif key.startswith("_set_"):
|
|
key = key[5:]
|
|
get, set = hits.get(key, (None, None))
|
|
set = val
|
|
hits[key] = get, set
|
|
for key, (get, set) in hits.items():
|
|
dict[key] = property(get, set)
|
|
return super(autoproperty, metaclass).__new__(metaclass,
|
|
name, bases, dict)
|
|
class A(metaclass=autoproperty):
|
|
def _get_x(self):
|
|
return -self.__x
|
|
def _set_x(self, x):
|
|
self.__x = -x
|
|
a = A()
|
|
verify(not hasattr(a, "x"))
|
|
a.x = 12
|
|
vereq(a.x, 12)
|
|
vereq(a._A__x, -12)
|
|
|
|
class multimetaclass(autoproperty, autosuper):
|
|
# Merge of multiple cooperating metaclasses
|
|
pass
|
|
class A(metaclass=multimetaclass):
|
|
def _get_x(self):
|
|
return "A"
|
|
class B(A):
|
|
def _get_x(self):
|
|
return "B" + self.__super._get_x()
|
|
class C(A):
|
|
def _get_x(self):
|
|
return "C" + self.__super._get_x()
|
|
class D(C, B):
|
|
def _get_x(self):
|
|
return "D" + self.__super._get_x()
|
|
vereq(D().x, "DCBA")
|
|
|
|
# Make sure type(x) doesn't call x.__class__.__init__
|
|
class T(type):
|
|
counter = 0
|
|
def __init__(self, *args):
|
|
T.counter += 1
|
|
class C(metaclass=T):
|
|
pass
|
|
vereq(T.counter, 1)
|
|
a = C()
|
|
vereq(type(a), C)
|
|
vereq(T.counter, 1)
|
|
|
|
class C(object): pass
|
|
c = C()
|
|
try: c()
|
|
except TypeError: pass
|
|
else: raise TestFailed, "calling object w/o call method should raise TypeError"
|
|
|
|
# Testing code to find most derived baseclass
|
|
class A(type):
|
|
def __new__(*args, **kwargs):
|
|
return type.__new__(*args, **kwargs)
|
|
|
|
class B(object):
|
|
pass
|
|
|
|
class C(object, metaclass=A):
|
|
pass
|
|
|
|
# The most derived metaclass of D is A rather than type.
|
|
class D(B, C):
|
|
pass
|
|
|
|
|
|
def pymods():
|
|
if verbose: print("Testing Python subclass of module...")
|
|
log = []
|
|
import sys
|
|
MT = type(sys)
|
|
class MM(MT):
|
|
def __init__(self, name):
|
|
MT.__init__(self, name)
|
|
def __getattribute__(self, name):
|
|
log.append(("getattr", name))
|
|
return MT.__getattribute__(self, name)
|
|
def __setattr__(self, name, value):
|
|
log.append(("setattr", name, value))
|
|
MT.__setattr__(self, name, value)
|
|
def __delattr__(self, name):
|
|
log.append(("delattr", name))
|
|
MT.__delattr__(self, name)
|
|
a = MM("a")
|
|
a.foo = 12
|
|
x = a.foo
|
|
del a.foo
|
|
vereq(log, [("setattr", "foo", 12),
|
|
("getattr", "foo"),
|
|
("delattr", "foo")])
|
|
|
|
def multi():
|
|
if verbose: print("Testing multiple inheritance...")
|
|
class C(object):
|
|
def __init__(self):
|
|
self.__state = 0
|
|
def getstate(self):
|
|
return self.__state
|
|
def setstate(self, state):
|
|
self.__state = state
|
|
a = C()
|
|
vereq(a.getstate(), 0)
|
|
a.setstate(10)
|
|
vereq(a.getstate(), 10)
|
|
class D(dict, C):
|
|
def __init__(self):
|
|
type({}).__init__(self)
|
|
C.__init__(self)
|
|
d = D()
|
|
vereq(list(d.keys()), [])
|
|
d["hello"] = "world"
|
|
vereq(list(d.items()), [("hello", "world")])
|
|
vereq(d["hello"], "world")
|
|
vereq(d.getstate(), 0)
|
|
d.setstate(10)
|
|
vereq(d.getstate(), 10)
|
|
vereq(D.__mro__, (D, dict, C, object))
|
|
|
|
# SF bug #442833
|
|
class Node(object):
|
|
def __int__(self):
|
|
return int(self.foo())
|
|
def foo(self):
|
|
return "23"
|
|
class Frag(Node, list):
|
|
def foo(self):
|
|
return "42"
|
|
vereq(Node().__int__(), 23)
|
|
vereq(int(Node()), 23)
|
|
vereq(Frag().__int__(), 42)
|
|
vereq(int(Frag()), 42)
|
|
|
|
def diamond():
|
|
if verbose: print("Testing multiple inheritance special cases...")
|
|
class A(object):
|
|
def spam(self): return "A"
|
|
vereq(A().spam(), "A")
|
|
class B(A):
|
|
def boo(self): return "B"
|
|
def spam(self): return "B"
|
|
vereq(B().spam(), "B")
|
|
vereq(B().boo(), "B")
|
|
class C(A):
|
|
def boo(self): return "C"
|
|
vereq(C().spam(), "A")
|
|
vereq(C().boo(), "C")
|
|
class D(B, C): pass
|
|
vereq(D().spam(), "B")
|
|
vereq(D().boo(), "B")
|
|
vereq(D.__mro__, (D, B, C, A, object))
|
|
class E(C, B): pass
|
|
vereq(E().spam(), "B")
|
|
vereq(E().boo(), "C")
|
|
vereq(E.__mro__, (E, C, B, A, object))
|
|
# MRO order disagreement
|
|
try:
|
|
class F(D, E): pass
|
|
except TypeError:
|
|
pass
|
|
else:
|
|
raise TestFailed, "expected MRO order disagreement (F)"
|
|
try:
|
|
class G(E, D): pass
|
|
except TypeError:
|
|
pass
|
|
else:
|
|
raise TestFailed, "expected MRO order disagreement (G)"
|
|
|
|
|
|
# see thread python-dev/2002-October/029035.html
|
|
def ex5():
|
|
if verbose: print("Testing ex5 from C3 switch discussion...")
|
|
class A(object): pass
|
|
class B(object): pass
|
|
class C(object): pass
|
|
class X(A): pass
|
|
class Y(A): pass
|
|
class Z(X,B,Y,C): pass
|
|
vereq(Z.__mro__, (Z, X, B, Y, A, C, object))
|
|
|
|
# see "A Monotonic Superclass Linearization for Dylan",
|
|
# by Kim Barrett et al. (OOPSLA 1996)
|
|
def monotonicity():
|
|
if verbose: print("Testing MRO monotonicity...")
|
|
class Boat(object): pass
|
|
class DayBoat(Boat): pass
|
|
class WheelBoat(Boat): pass
|
|
class EngineLess(DayBoat): pass
|
|
class SmallMultihull(DayBoat): pass
|
|
class PedalWheelBoat(EngineLess,WheelBoat): pass
|
|
class SmallCatamaran(SmallMultihull): pass
|
|
class Pedalo(PedalWheelBoat,SmallCatamaran): pass
|
|
|
|
vereq(PedalWheelBoat.__mro__,
|
|
(PedalWheelBoat, EngineLess, DayBoat, WheelBoat, Boat,
|
|
object))
|
|
vereq(SmallCatamaran.__mro__,
|
|
(SmallCatamaran, SmallMultihull, DayBoat, Boat, object))
|
|
|
|
vereq(Pedalo.__mro__,
|
|
(Pedalo, PedalWheelBoat, EngineLess, SmallCatamaran,
|
|
SmallMultihull, DayBoat, WheelBoat, Boat, object))
|
|
|
|
# see "A Monotonic Superclass Linearization for Dylan",
|
|
# by Kim Barrett et al. (OOPSLA 1996)
|
|
def consistency_with_epg():
|
|
if verbose: print("Testing consistentcy with EPG...")
|
|
class Pane(object): pass
|
|
class ScrollingMixin(object): pass
|
|
class EditingMixin(object): pass
|
|
class ScrollablePane(Pane,ScrollingMixin): pass
|
|
class EditablePane(Pane,EditingMixin): pass
|
|
class EditableScrollablePane(ScrollablePane,EditablePane): pass
|
|
|
|
vereq(EditableScrollablePane.__mro__,
|
|
(EditableScrollablePane, ScrollablePane, EditablePane,
|
|
Pane, ScrollingMixin, EditingMixin, object))
|
|
|
|
mro_err_msg = """Cannot create a consistent method resolution
|
|
order (MRO) for bases """
|
|
|
|
def mro_disagreement():
|
|
if verbose: print("Testing error messages for MRO disagreement...")
|
|
def raises(exc, expected, callable, *args):
|
|
try:
|
|
callable(*args)
|
|
except exc as msg:
|
|
if not str(msg).startswith(expected):
|
|
raise TestFailed, "Message %r, expected %r" % (str(msg),
|
|
expected)
|
|
else:
|
|
raise TestFailed, "Expected %s" % exc
|
|
class A(object): pass
|
|
class B(A): pass
|
|
class C(object): pass
|
|
# Test some very simple errors
|
|
raises(TypeError, "duplicate base class A",
|
|
type, "X", (A, A), {})
|
|
raises(TypeError, mro_err_msg,
|
|
type, "X", (A, B), {})
|
|
raises(TypeError, mro_err_msg,
|
|
type, "X", (A, C, B), {})
|
|
# Test a slightly more complex error
|
|
class GridLayout(object): pass
|
|
class HorizontalGrid(GridLayout): pass
|
|
class VerticalGrid(GridLayout): pass
|
|
class HVGrid(HorizontalGrid, VerticalGrid): pass
|
|
class VHGrid(VerticalGrid, HorizontalGrid): pass
|
|
raises(TypeError, mro_err_msg,
|
|
type, "ConfusedGrid", (HVGrid, VHGrid), {})
|
|
|
|
def objects():
|
|
if verbose: print("Testing object class...")
|
|
a = object()
|
|
vereq(a.__class__, object)
|
|
vereq(type(a), object)
|
|
b = object()
|
|
verify(a is not b)
|
|
verify(not hasattr(a, "foo"))
|
|
try:
|
|
a.foo = 12
|
|
except (AttributeError, TypeError):
|
|
pass
|
|
else:
|
|
verify(0, "object() should not allow setting a foo attribute")
|
|
verify(not hasattr(object(), "__dict__"))
|
|
|
|
class Cdict(object):
|
|
pass
|
|
x = Cdict()
|
|
vereq(x.__dict__, {})
|
|
x.foo = 1
|
|
vereq(x.foo, 1)
|
|
vereq(x.__dict__, {'foo': 1})
|
|
|
|
def slots():
|
|
if verbose: print("Testing __slots__...")
|
|
class C0(object):
|
|
__slots__ = []
|
|
x = C0()
|
|
verify(not hasattr(x, "__dict__"))
|
|
verify(not hasattr(x, "foo"))
|
|
|
|
class C1(object):
|
|
__slots__ = ['a']
|
|
x = C1()
|
|
verify(not hasattr(x, "__dict__"))
|
|
verify(not hasattr(x, "a"))
|
|
x.a = 1
|
|
vereq(x.a, 1)
|
|
x.a = None
|
|
veris(x.a, None)
|
|
del x.a
|
|
verify(not hasattr(x, "a"))
|
|
|
|
class C3(object):
|
|
__slots__ = ['a', 'b', 'c']
|
|
x = C3()
|
|
verify(not hasattr(x, "__dict__"))
|
|
verify(not hasattr(x, 'a'))
|
|
verify(not hasattr(x, 'b'))
|
|
verify(not hasattr(x, 'c'))
|
|
x.a = 1
|
|
x.b = 2
|
|
x.c = 3
|
|
vereq(x.a, 1)
|
|
vereq(x.b, 2)
|
|
vereq(x.c, 3)
|
|
|
|
class C4(object):
|
|
"""Validate name mangling"""
|
|
__slots__ = ['__a']
|
|
def __init__(self, value):
|
|
self.__a = value
|
|
def get(self):
|
|
return self.__a
|
|
x = C4(5)
|
|
verify(not hasattr(x, '__dict__'))
|
|
verify(not hasattr(x, '__a'))
|
|
vereq(x.get(), 5)
|
|
try:
|
|
x.__a = 6
|
|
except AttributeError:
|
|
pass
|
|
else:
|
|
raise TestFailed, "Double underscored names not mangled"
|
|
|
|
# Make sure slot names are proper identifiers
|
|
try:
|
|
class C(object):
|
|
__slots__ = [None]
|
|
except TypeError:
|
|
pass
|
|
else:
|
|
raise TestFailed, "[None] slots not caught"
|
|
try:
|
|
class C(object):
|
|
__slots__ = ["foo bar"]
|
|
except TypeError:
|
|
pass
|
|
else:
|
|
raise TestFailed, "['foo bar'] slots not caught"
|
|
try:
|
|
class C(object):
|
|
__slots__ = ["foo\0bar"]
|
|
except TypeError:
|
|
pass
|
|
else:
|
|
raise TestFailed, "['foo\\0bar'] slots not caught"
|
|
try:
|
|
class C(object):
|
|
__slots__ = ["1"]
|
|
except TypeError:
|
|
pass
|
|
else:
|
|
raise TestFailed, "['1'] slots not caught"
|
|
try:
|
|
class C(object):
|
|
__slots__ = [""]
|
|
except TypeError:
|
|
pass
|
|
else:
|
|
raise TestFailed, "[''] slots not caught"
|
|
class C(object):
|
|
__slots__ = ["a", "a_b", "_a", "A0123456789Z"]
|
|
# XXX(nnorwitz): was there supposed to be something tested
|
|
# from the class above?
|
|
|
|
# Test a single string is not expanded as a sequence.
|
|
class C(object):
|
|
__slots__ = "abc"
|
|
c = C()
|
|
c.abc = 5
|
|
vereq(c.abc, 5)
|
|
|
|
# Test unicode slot names
|
|
try:
|
|
unicode
|
|
except NameError:
|
|
pass
|
|
else:
|
|
# Test a single unicode string is not expanded as a sequence.
|
|
class C(object):
|
|
__slots__ = unicode("abc")
|
|
c = C()
|
|
c.abc = 5
|
|
vereq(c.abc, 5)
|
|
|
|
# _unicode_to_string used to modify slots in certain circumstances
|
|
slots = (unicode("foo"), unicode("bar"))
|
|
class C(object):
|
|
__slots__ = slots
|
|
x = C()
|
|
x.foo = 5
|
|
vereq(x.foo, 5)
|
|
veris(type(slots[0]), unicode)
|
|
# this used to leak references
|
|
try:
|
|
class C(object):
|
|
__slots__ = [unichr(128)]
|
|
except (TypeError, UnicodeEncodeError):
|
|
pass
|
|
else:
|
|
raise TestFailed, "[unichr(128)] slots not caught"
|
|
|
|
# Test leaks
|
|
class Counted(object):
|
|
counter = 0 # counts the number of instances alive
|
|
def __init__(self):
|
|
Counted.counter += 1
|
|
def __del__(self):
|
|
Counted.counter -= 1
|
|
class C(object):
|
|
__slots__ = ['a', 'b', 'c']
|
|
x = C()
|
|
x.a = Counted()
|
|
x.b = Counted()
|
|
x.c = Counted()
|
|
vereq(Counted.counter, 3)
|
|
del x
|
|
vereq(Counted.counter, 0)
|
|
class D(C):
|
|
pass
|
|
x = D()
|
|
x.a = Counted()
|
|
x.z = Counted()
|
|
vereq(Counted.counter, 2)
|
|
del x
|
|
vereq(Counted.counter, 0)
|
|
class E(D):
|
|
__slots__ = ['e']
|
|
x = E()
|
|
x.a = Counted()
|
|
x.z = Counted()
|
|
x.e = Counted()
|
|
vereq(Counted.counter, 3)
|
|
del x
|
|
vereq(Counted.counter, 0)
|
|
|
|
# Test cyclical leaks [SF bug 519621]
|
|
class F(object):
|
|
__slots__ = ['a', 'b']
|
|
log = []
|
|
s = F()
|
|
s.a = [Counted(), s]
|
|
vereq(Counted.counter, 1)
|
|
s = None
|
|
import gc
|
|
gc.collect()
|
|
vereq(Counted.counter, 0)
|
|
|
|
# Test lookup leaks [SF bug 572567]
|
|
import sys,gc
|
|
class G(object):
|
|
def __cmp__(self, other):
|
|
return 0
|
|
g = G()
|
|
orig_objects = len(gc.get_objects())
|
|
for i in xrange(10):
|
|
g==g
|
|
new_objects = len(gc.get_objects())
|
|
vereq(orig_objects, new_objects)
|
|
class H(object):
|
|
__slots__ = ['a', 'b']
|
|
def __init__(self):
|
|
self.a = 1
|
|
self.b = 2
|
|
def __del__(self):
|
|
assert self.a == 1
|
|
assert self.b == 2
|
|
|
|
save_stderr = sys.stderr
|
|
sys.stderr = sys.stdout
|
|
h = H()
|
|
try:
|
|
del h
|
|
finally:
|
|
sys.stderr = save_stderr
|
|
|
|
def slotspecials():
|
|
if verbose: print("Testing __dict__ and __weakref__ in __slots__...")
|
|
|
|
class D(object):
|
|
__slots__ = ["__dict__"]
|
|
a = D()
|
|
verify(hasattr(a, "__dict__"))
|
|
verify(not hasattr(a, "__weakref__"))
|
|
a.foo = 42
|
|
vereq(a.__dict__, {"foo": 42})
|
|
|
|
class W(object):
|
|
__slots__ = ["__weakref__"]
|
|
a = W()
|
|
verify(hasattr(a, "__weakref__"))
|
|
verify(not hasattr(a, "__dict__"))
|
|
try:
|
|
a.foo = 42
|
|
except AttributeError:
|
|
pass
|
|
else:
|
|
raise TestFailed, "shouldn't be allowed to set a.foo"
|
|
|
|
class C1(W, D):
|
|
__slots__ = []
|
|
a = C1()
|
|
verify(hasattr(a, "__dict__"))
|
|
verify(hasattr(a, "__weakref__"))
|
|
a.foo = 42
|
|
vereq(a.__dict__, {"foo": 42})
|
|
|
|
class C2(D, W):
|
|
__slots__ = []
|
|
a = C2()
|
|
verify(hasattr(a, "__dict__"))
|
|
verify(hasattr(a, "__weakref__"))
|
|
a.foo = 42
|
|
vereq(a.__dict__, {"foo": 42})
|
|
|
|
# MRO order disagreement
|
|
#
|
|
# class C3(C1, C2):
|
|
# __slots__ = []
|
|
#
|
|
# class C4(C2, C1):
|
|
# __slots__ = []
|
|
|
|
def dynamics():
|
|
if verbose: print("Testing class attribute propagation...")
|
|
class D(object):
|
|
pass
|
|
class E(D):
|
|
pass
|
|
class F(D):
|
|
pass
|
|
D.foo = 1
|
|
vereq(D.foo, 1)
|
|
# Test that dynamic attributes are inherited
|
|
vereq(E.foo, 1)
|
|
vereq(F.foo, 1)
|
|
# Test dynamic instances
|
|
class C(object):
|
|
pass
|
|
a = C()
|
|
verify(not hasattr(a, "foobar"))
|
|
C.foobar = 2
|
|
vereq(a.foobar, 2)
|
|
C.method = lambda self: 42
|
|
vereq(a.method(), 42)
|
|
C.__repr__ = lambda self: "C()"
|
|
vereq(repr(a), "C()")
|
|
C.__int__ = lambda self: 100
|
|
vereq(int(a), 100)
|
|
vereq(a.foobar, 2)
|
|
verify(not hasattr(a, "spam"))
|
|
def mygetattr(self, name):
|
|
if name == "spam":
|
|
return "spam"
|
|
raise AttributeError
|
|
C.__getattr__ = mygetattr
|
|
vereq(a.spam, "spam")
|
|
a.new = 12
|
|
vereq(a.new, 12)
|
|
def mysetattr(self, name, value):
|
|
if name == "spam":
|
|
raise AttributeError
|
|
return object.__setattr__(self, name, value)
|
|
C.__setattr__ = mysetattr
|
|
try:
|
|
a.spam = "not spam"
|
|
except AttributeError:
|
|
pass
|
|
else:
|
|
verify(0, "expected AttributeError")
|
|
vereq(a.spam, "spam")
|
|
class D(C):
|
|
pass
|
|
d = D()
|
|
d.foo = 1
|
|
vereq(d.foo, 1)
|
|
|
|
# Test handling of int*seq and seq*int
|
|
class I(int):
|
|
pass
|
|
vereq("a"*I(2), "aa")
|
|
vereq(I(2)*"a", "aa")
|
|
vereq(2*I(3), 6)
|
|
vereq(I(3)*2, 6)
|
|
vereq(I(3)*I(2), 6)
|
|
|
|
# Test handling of long*seq and seq*long
|
|
class L(int):
|
|
pass
|
|
vereq("a"*L(2), "aa")
|
|
vereq(L(2)*"a", "aa")
|
|
vereq(2*L(3), 6)
|
|
vereq(L(3)*2, 6)
|
|
vereq(L(3)*L(2), 6)
|
|
|
|
# Test comparison of classes with dynamic metaclasses
|
|
class dynamicmetaclass(type):
|
|
pass
|
|
class someclass(metaclass=dynamicmetaclass):
|
|
pass
|
|
verify(someclass != object)
|
|
|
|
def errors():
|
|
if verbose: print("Testing errors...")
|
|
|
|
try:
|
|
class C(list, dict):
|
|
pass
|
|
except TypeError:
|
|
pass
|
|
else:
|
|
verify(0, "inheritance from both list and dict should be illegal")
|
|
|
|
try:
|
|
class C(object, None):
|
|
pass
|
|
except TypeError:
|
|
pass
|
|
else:
|
|
verify(0, "inheritance from non-type should be illegal")
|
|
class Classic:
|
|
pass
|
|
|
|
try:
|
|
class C(type(len)):
|
|
pass
|
|
except TypeError:
|
|
pass
|
|
else:
|
|
verify(0, "inheritance from CFunction should be illegal")
|
|
|
|
try:
|
|
class C(object):
|
|
__slots__ = 1
|
|
except TypeError:
|
|
pass
|
|
else:
|
|
verify(0, "__slots__ = 1 should be illegal")
|
|
|
|
try:
|
|
class C(object):
|
|
__slots__ = [1]
|
|
except TypeError:
|
|
pass
|
|
else:
|
|
verify(0, "__slots__ = [1] should be illegal")
|
|
|
|
class M1(type):
|
|
pass
|
|
class M2(type):
|
|
pass
|
|
class A1(object, metaclass=M1):
|
|
pass
|
|
class A2(object, metaclass=M2):
|
|
pass
|
|
try:
|
|
class B(A1, A2):
|
|
pass
|
|
except TypeError:
|
|
pass
|
|
else:
|
|
verify(0, "finding the most derived metaclass should have failed")
|
|
|
|
def classmethods():
|
|
if verbose: print("Testing class methods...")
|
|
class C(object):
|
|
def foo(*a): return a
|
|
goo = classmethod(foo)
|
|
c = C()
|
|
vereq(C.goo(1), (C, 1))
|
|
vereq(c.goo(1), (C, 1))
|
|
vereq(c.foo(1), (c, 1))
|
|
class D(C):
|
|
pass
|
|
d = D()
|
|
vereq(D.goo(1), (D, 1))
|
|
vereq(d.goo(1), (D, 1))
|
|
vereq(d.foo(1), (d, 1))
|
|
vereq(D.foo(d, 1), (d, 1))
|
|
# Test for a specific crash (SF bug 528132)
|
|
def f(cls, arg): return (cls, arg)
|
|
ff = classmethod(f)
|
|
vereq(ff.__get__(0, int)(42), (int, 42))
|
|
vereq(ff.__get__(0)(42), (int, 42))
|
|
|
|
# Test super() with classmethods (SF bug 535444)
|
|
veris(C.goo.im_self, C)
|
|
veris(D.goo.im_self, D)
|
|
veris(super(D,D).goo.im_self, D)
|
|
veris(super(D,d).goo.im_self, D)
|
|
vereq(super(D,D).goo(), (D,))
|
|
vereq(super(D,d).goo(), (D,))
|
|
|
|
# Verify that argument is checked for callability (SF bug 753451)
|
|
try:
|
|
classmethod(1).__get__(1)
|
|
except TypeError:
|
|
pass
|
|
else:
|
|
raise TestFailed, "classmethod should check for callability"
|
|
|
|
# Verify that classmethod() doesn't allow keyword args
|
|
try:
|
|
classmethod(f, kw=1)
|
|
except TypeError:
|
|
pass
|
|
else:
|
|
raise TestFailed, "classmethod shouldn't accept keyword args"
|
|
|
|
def classmethods_in_c():
|
|
if verbose: print("Testing C-based class methods...")
|
|
import xxsubtype as spam
|
|
a = (1, 2, 3)
|
|
d = {'abc': 123}
|
|
x, a1, d1 = spam.spamlist.classmeth(*a, **d)
|
|
veris(x, spam.spamlist)
|
|
vereq(a, a1)
|
|
vereq(d, d1)
|
|
x, a1, d1 = spam.spamlist().classmeth(*a, **d)
|
|
veris(x, spam.spamlist)
|
|
vereq(a, a1)
|
|
vereq(d, d1)
|
|
|
|
def staticmethods():
|
|
if verbose: print("Testing static methods...")
|
|
class C(object):
|
|
def foo(*a): return a
|
|
goo = staticmethod(foo)
|
|
c = C()
|
|
vereq(C.goo(1), (1,))
|
|
vereq(c.goo(1), (1,))
|
|
vereq(c.foo(1), (c, 1,))
|
|
class D(C):
|
|
pass
|
|
d = D()
|
|
vereq(D.goo(1), (1,))
|
|
vereq(d.goo(1), (1,))
|
|
vereq(d.foo(1), (d, 1))
|
|
vereq(D.foo(d, 1), (d, 1))
|
|
|
|
def staticmethods_in_c():
|
|
if verbose: print("Testing C-based static methods...")
|
|
import xxsubtype as spam
|
|
a = (1, 2, 3)
|
|
d = {"abc": 123}
|
|
x, a1, d1 = spam.spamlist.staticmeth(*a, **d)
|
|
veris(x, None)
|
|
vereq(a, a1)
|
|
vereq(d, d1)
|
|
x, a1, d2 = spam.spamlist().staticmeth(*a, **d)
|
|
veris(x, None)
|
|
vereq(a, a1)
|
|
vereq(d, d1)
|
|
|
|
def classic():
|
|
if verbose: print("Testing classic classes...")
|
|
class C:
|
|
def foo(*a): return a
|
|
goo = classmethod(foo)
|
|
c = C()
|
|
vereq(C.goo(1), (C, 1))
|
|
vereq(c.goo(1), (C, 1))
|
|
vereq(c.foo(1), (c, 1))
|
|
class D(C):
|
|
pass
|
|
d = D()
|
|
vereq(D.goo(1), (D, 1))
|
|
vereq(d.goo(1), (D, 1))
|
|
vereq(d.foo(1), (d, 1))
|
|
vereq(D.foo(d, 1), (d, 1))
|
|
class E: # *not* subclassing from C
|
|
foo = C.foo
|
|
vereq(E().foo, C.foo) # i.e., unbound
|
|
verify(repr(C.foo.__get__(C())).startswith("<bound method "))
|
|
|
|
def compattr():
|
|
if verbose: print("Testing computed attributes...")
|
|
class C(object):
|
|
class computed_attribute(object):
|
|
def __init__(self, get, set=None, delete=None):
|
|
self.__get = get
|
|
self.__set = set
|
|
self.__delete = delete
|
|
def __get__(self, obj, type=None):
|
|
return self.__get(obj)
|
|
def __set__(self, obj, value):
|
|
return self.__set(obj, value)
|
|
def __delete__(self, obj):
|
|
return self.__delete(obj)
|
|
def __init__(self):
|
|
self.__x = 0
|
|
def __get_x(self):
|
|
x = self.__x
|
|
self.__x = x+1
|
|
return x
|
|
def __set_x(self, x):
|
|
self.__x = x
|
|
def __delete_x(self):
|
|
del self.__x
|
|
x = computed_attribute(__get_x, __set_x, __delete_x)
|
|
a = C()
|
|
vereq(a.x, 0)
|
|
vereq(a.x, 1)
|
|
a.x = 10
|
|
vereq(a.x, 10)
|
|
vereq(a.x, 11)
|
|
del a.x
|
|
vereq(hasattr(a, 'x'), 0)
|
|
|
|
def newslot():
|
|
if verbose: print("Testing __new__ slot override...")
|
|
class C(list):
|
|
def __new__(cls):
|
|
self = list.__new__(cls)
|
|
self.foo = 1
|
|
return self
|
|
def __init__(self):
|
|
self.foo = self.foo + 2
|
|
a = C()
|
|
vereq(a.foo, 3)
|
|
verify(a.__class__ is C)
|
|
class D(C):
|
|
pass
|
|
b = D()
|
|
vereq(b.foo, 3)
|
|
verify(b.__class__ is D)
|
|
|
|
def altmro():
|
|
if verbose: print("Testing mro() and overriding it...")
|
|
class A(object):
|
|
def f(self): return "A"
|
|
class B(A):
|
|
pass
|
|
class C(A):
|
|
def f(self): return "C"
|
|
class D(B, C):
|
|
pass
|
|
vereq(D.mro(), [D, B, C, A, object])
|
|
vereq(D.__mro__, (D, B, C, A, object))
|
|
vereq(D().f(), "C")
|
|
|
|
class PerverseMetaType(type):
|
|
def mro(cls):
|
|
L = type.mro(cls)
|
|
L.reverse()
|
|
return L
|
|
class X(D,B,C,A, metaclass=PerverseMetaType):
|
|
pass
|
|
vereq(X.__mro__, (object, A, C, B, D, X))
|
|
vereq(X().f(), "A")
|
|
|
|
try:
|
|
class _metaclass(type):
|
|
def mro(self):
|
|
return [self, dict, object]
|
|
class X(object, metaclass=_metaclass):
|
|
pass
|
|
except TypeError:
|
|
pass
|
|
else:
|
|
raise TestFailed, "devious mro() return not caught"
|
|
|
|
try:
|
|
class _metaclass(type):
|
|
def mro(self):
|
|
return [1]
|
|
class X(object, metaclass=_metaclass):
|
|
pass
|
|
except TypeError:
|
|
pass
|
|
else:
|
|
raise TestFailed, "non-class mro() return not caught"
|
|
|
|
try:
|
|
class _metaclass(type):
|
|
def mro(self):
|
|
return 1
|
|
class X(object, metaclass=_metaclass):
|
|
pass
|
|
except TypeError:
|
|
pass
|
|
else:
|
|
raise TestFailed, "non-sequence mro() return not caught"
|
|
|
|
|
|
def overloading():
|
|
if verbose: print("Testing operator overloading...")
|
|
|
|
class B(object):
|
|
"Intermediate class because object doesn't have a __setattr__"
|
|
|
|
class C(B):
|
|
|
|
def __getattr__(self, name):
|
|
if name == "foo":
|
|
return ("getattr", name)
|
|
else:
|
|
raise AttributeError
|
|
def __setattr__(self, name, value):
|
|
if name == "foo":
|
|
self.setattr = (name, value)
|
|
else:
|
|
return B.__setattr__(self, name, value)
|
|
def __delattr__(self, name):
|
|
if name == "foo":
|
|
self.delattr = name
|
|
else:
|
|
return B.__delattr__(self, name)
|
|
|
|
def __getitem__(self, key):
|
|
return ("getitem", key)
|
|
def __setitem__(self, key, value):
|
|
self.setitem = (key, value)
|
|
def __delitem__(self, key):
|
|
self.delitem = key
|
|
|
|
def __getslice__(self, i, j):
|
|
return ("getslice", i, j)
|
|
def __setslice__(self, i, j, value):
|
|
self.setslice = (i, j, value)
|
|
def __delslice__(self, i, j):
|
|
self.delslice = (i, j)
|
|
|
|
a = C()
|
|
vereq(a.foo, ("getattr", "foo"))
|
|
a.foo = 12
|
|
vereq(a.setattr, ("foo", 12))
|
|
del a.foo
|
|
vereq(a.delattr, "foo")
|
|
|
|
vereq(a[12], ("getitem", 12))
|
|
a[12] = 21
|
|
vereq(a.setitem, (12, 21))
|
|
del a[12]
|
|
vereq(a.delitem, 12)
|
|
|
|
vereq(a[0:10], ("getslice", 0, 10))
|
|
a[0:10] = "foo"
|
|
vereq(a.setslice, (0, 10, "foo"))
|
|
del a[0:10]
|
|
vereq(a.delslice, (0, 10))
|
|
|
|
def methods():
|
|
if verbose: print("Testing methods...")
|
|
class C(object):
|
|
def __init__(self, x):
|
|
self.x = x
|
|
def foo(self):
|
|
return self.x
|
|
c1 = C(1)
|
|
vereq(c1.foo(), 1)
|
|
class D(C):
|
|
boo = C.foo
|
|
goo = c1.foo
|
|
d2 = D(2)
|
|
vereq(d2.foo(), 2)
|
|
vereq(d2.boo(), 2)
|
|
vereq(d2.goo(), 1)
|
|
class E(object):
|
|
foo = C.foo
|
|
vereq(E().foo, C.foo) # i.e., unbound
|
|
verify(repr(C.foo.__get__(C(1))).startswith("<bound method "))
|
|
|
|
def specials():
|
|
# Test operators like __hash__ for which a built-in default exists
|
|
if verbose: print("Testing special operators...")
|
|
# Test the default behavior for static classes
|
|
class C(object):
|
|
def __getitem__(self, i):
|
|
if 0 <= i < 10: return i
|
|
raise IndexError
|
|
c1 = C()
|
|
c2 = C()
|
|
verify(not not c1)
|
|
verify(id(c1) != id(c2))
|
|
hash(c1)
|
|
hash(c2)
|
|
##vereq(cmp(c1, c2), cmp(id(c1), id(c2)))
|
|
vereq(c1, c1)
|
|
verify(c1 != c2)
|
|
verify(not c1 != c1)
|
|
verify(not c1 == c2)
|
|
# Note that the module name appears in str/repr, and that varies
|
|
# depending on whether this test is run standalone or from a framework.
|
|
verify(str(c1).find('C object at ') >= 0)
|
|
vereq(str(c1), repr(c1))
|
|
verify(-1 not in c1)
|
|
for i in range(10):
|
|
verify(i in c1)
|
|
verify(10 not in c1)
|
|
# Test the default behavior for dynamic classes
|
|
class D(object):
|
|
def __getitem__(self, i):
|
|
if 0 <= i < 10: return i
|
|
raise IndexError
|
|
d1 = D()
|
|
d2 = D()
|
|
verify(not not d1)
|
|
verify(id(d1) != id(d2))
|
|
hash(d1)
|
|
hash(d2)
|
|
##vereq(cmp(d1, d2), cmp(id(d1), id(d2)))
|
|
vereq(d1, d1)
|
|
verify(d1 != d2)
|
|
verify(not d1 != d1)
|
|
verify(not d1 == d2)
|
|
# Note that the module name appears in str/repr, and that varies
|
|
# depending on whether this test is run standalone or from a framework.
|
|
verify(str(d1).find('D object at ') >= 0)
|
|
vereq(str(d1), repr(d1))
|
|
verify(-1 not in d1)
|
|
for i in range(10):
|
|
verify(i in d1)
|
|
verify(10 not in d1)
|
|
# Test overridden behavior for static classes
|
|
class Proxy(object):
|
|
def __init__(self, x):
|
|
self.x = x
|
|
def __bool__(self):
|
|
return not not self.x
|
|
def __hash__(self):
|
|
return hash(self.x)
|
|
def __eq__(self, other):
|
|
return self.x == other
|
|
def __ne__(self, other):
|
|
return self.x != other
|
|
def __cmp__(self, other):
|
|
return cmp(self.x, other.x)
|
|
def __str__(self):
|
|
return "Proxy:%s" % self.x
|
|
def __repr__(self):
|
|
return "Proxy(%r)" % self.x
|
|
def __contains__(self, value):
|
|
return value in self.x
|
|
p0 = Proxy(0)
|
|
p1 = Proxy(1)
|
|
p_1 = Proxy(-1)
|
|
verify(not p0)
|
|
verify(not not p1)
|
|
vereq(hash(p0), hash(0))
|
|
vereq(p0, p0)
|
|
verify(p0 != p1)
|
|
verify(not p0 != p0)
|
|
vereq(not p0, p1)
|
|
vereq(cmp(p0, p1), -1)
|
|
vereq(cmp(p0, p0), 0)
|
|
vereq(cmp(p0, p_1), 1)
|
|
vereq(str(p0), "Proxy:0")
|
|
vereq(repr(p0), "Proxy(0)")
|
|
p10 = Proxy(range(10))
|
|
verify(-1 not in p10)
|
|
for i in range(10):
|
|
verify(i in p10)
|
|
verify(10 not in p10)
|
|
# Test overridden behavior for dynamic classes
|
|
class DProxy(object):
|
|
def __init__(self, x):
|
|
self.x = x
|
|
def __bool__(self):
|
|
return not not self.x
|
|
def __hash__(self):
|
|
return hash(self.x)
|
|
def __eq__(self, other):
|
|
return self.x == other
|
|
def __ne__(self, other):
|
|
return self.x != other
|
|
def __cmp__(self, other):
|
|
return cmp(self.x, other.x)
|
|
def __str__(self):
|
|
return "DProxy:%s" % self.x
|
|
def __repr__(self):
|
|
return "DProxy(%r)" % self.x
|
|
def __contains__(self, value):
|
|
return value in self.x
|
|
p0 = DProxy(0)
|
|
p1 = DProxy(1)
|
|
p_1 = DProxy(-1)
|
|
verify(not p0)
|
|
verify(not not p1)
|
|
vereq(hash(p0), hash(0))
|
|
vereq(p0, p0)
|
|
verify(p0 != p1)
|
|
verify(not p0 != p0)
|
|
vereq(not p0, p1)
|
|
vereq(cmp(p0, p1), -1)
|
|
vereq(cmp(p0, p0), 0)
|
|
vereq(cmp(p0, p_1), 1)
|
|
vereq(str(p0), "DProxy:0")
|
|
vereq(repr(p0), "DProxy(0)")
|
|
p10 = DProxy(range(10))
|
|
verify(-1 not in p10)
|
|
for i in range(10):
|
|
verify(i in p10)
|
|
verify(10 not in p10)
|
|
## # Safety test for __cmp__
|
|
## def unsafecmp(a, b):
|
|
## try:
|
|
## a.__class__.__cmp__(a, b)
|
|
## except TypeError:
|
|
## pass
|
|
## else:
|
|
## raise TestFailed, "shouldn't allow %s.__cmp__(%r, %r)" % (
|
|
## a.__class__, a, b)
|
|
## unsafecmp(u"123", "123")
|
|
## unsafecmp("123", u"123")
|
|
## unsafecmp(1, 1.0)
|
|
## unsafecmp(1.0, 1)
|
|
## unsafecmp(1, 1L)
|
|
## unsafecmp(1L, 1)
|
|
|
|
class Letter(str):
|
|
def __new__(cls, letter):
|
|
if letter == 'EPS':
|
|
return str.__new__(cls)
|
|
return str.__new__(cls, letter)
|
|
def __str__(self):
|
|
if not self:
|
|
return 'EPS'
|
|
return self
|
|
|
|
# sys.stdout needs to be the original to trigger the recursion bug
|
|
import sys
|
|
test_stdout = sys.stdout
|
|
sys.stdout = get_original_stdout()
|
|
try:
|
|
# nothing should actually be printed, this should raise an exception
|
|
print(Letter('w'))
|
|
except RuntimeError:
|
|
pass
|
|
else:
|
|
raise TestFailed, "expected a RuntimeError for print recursion"
|
|
sys.stdout = test_stdout
|
|
|
|
def weakrefs():
|
|
if verbose: print("Testing weak references...")
|
|
import weakref
|
|
class C(object):
|
|
pass
|
|
c = C()
|
|
r = weakref.ref(c)
|
|
verify(r() is c)
|
|
del c
|
|
verify(r() is None)
|
|
del r
|
|
class NoWeak(object):
|
|
__slots__ = ['foo']
|
|
no = NoWeak()
|
|
try:
|
|
weakref.ref(no)
|
|
except TypeError as msg:
|
|
verify(str(msg).find("weak reference") >= 0)
|
|
else:
|
|
verify(0, "weakref.ref(no) should be illegal")
|
|
class Weak(object):
|
|
__slots__ = ['foo', '__weakref__']
|
|
yes = Weak()
|
|
r = weakref.ref(yes)
|
|
verify(r() is yes)
|
|
del yes
|
|
verify(r() is None)
|
|
del r
|
|
|
|
def properties():
|
|
if verbose: print("Testing property...")
|
|
class C(object):
|
|
def getx(self):
|
|
return self.__x
|
|
def setx(self, value):
|
|
self.__x = value
|
|
def delx(self):
|
|
del self.__x
|
|
x = property(getx, setx, delx, doc="I'm the x property.")
|
|
a = C()
|
|
verify(not hasattr(a, "x"))
|
|
a.x = 42
|
|
vereq(a._C__x, 42)
|
|
vereq(a.x, 42)
|
|
del a.x
|
|
verify(not hasattr(a, "x"))
|
|
verify(not hasattr(a, "_C__x"))
|
|
C.x.__set__(a, 100)
|
|
vereq(C.x.__get__(a), 100)
|
|
C.x.__delete__(a)
|
|
verify(not hasattr(a, "x"))
|
|
|
|
raw = C.__dict__['x']
|
|
verify(isinstance(raw, property))
|
|
|
|
attrs = dir(raw)
|
|
verify("__doc__" in attrs)
|
|
verify("fget" in attrs)
|
|
verify("fset" in attrs)
|
|
verify("fdel" in attrs)
|
|
|
|
vereq(raw.__doc__, "I'm the x property.")
|
|
verify(raw.fget is C.__dict__['getx'])
|
|
verify(raw.fset is C.__dict__['setx'])
|
|
verify(raw.fdel is C.__dict__['delx'])
|
|
|
|
for attr in "__doc__", "fget", "fset", "fdel":
|
|
try:
|
|
setattr(raw, attr, 42)
|
|
except AttributeError as msg:
|
|
if str(msg).find('readonly') < 0:
|
|
raise TestFailed("when setting readonly attr %r on a "
|
|
"property, got unexpected AttributeError "
|
|
"msg %r" % (attr, str(msg)))
|
|
else:
|
|
raise TestFailed("expected AttributeError from trying to set "
|
|
"readonly %r attr on a property" % attr)
|
|
|
|
class D(object):
|
|
__getitem__ = property(lambda s: 1/0)
|
|
|
|
d = D()
|
|
try:
|
|
for i in d:
|
|
str(i)
|
|
except ZeroDivisionError:
|
|
pass
|
|
else:
|
|
raise TestFailed, "expected ZeroDivisionError from bad property"
|
|
|
|
class E(object):
|
|
def getter(self):
|
|
"getter method"
|
|
return 0
|
|
def setter(self, value):
|
|
"setter method"
|
|
pass
|
|
prop = property(getter)
|
|
vereq(prop.__doc__, "getter method")
|
|
prop2 = property(fset=setter)
|
|
vereq(prop2.__doc__, None)
|
|
|
|
# this segfaulted in 2.5b2
|
|
try:
|
|
import _testcapi
|
|
except ImportError:
|
|
pass
|
|
else:
|
|
class X(object):
|
|
p = property(_testcapi.test_with_docstring)
|
|
|
|
|
|
def supers():
|
|
if verbose: print("Testing super...")
|
|
|
|
class A(object):
|
|
def meth(self, a):
|
|
return "A(%r)" % a
|
|
|
|
vereq(A().meth(1), "A(1)")
|
|
|
|
class B(A):
|
|
def __init__(self):
|
|
self.__super = super(B, self)
|
|
def meth(self, a):
|
|
return "B(%r)" % a + self.__super.meth(a)
|
|
|
|
vereq(B().meth(2), "B(2)A(2)")
|
|
|
|
class C(A):
|
|
def meth(self, a):
|
|
return "C(%r)" % a + self.__super.meth(a)
|
|
C._C__super = super(C)
|
|
|
|
vereq(C().meth(3), "C(3)A(3)")
|
|
|
|
class D(C, B):
|
|
def meth(self, a):
|
|
return "D(%r)" % a + super(D, self).meth(a)
|
|
|
|
vereq(D().meth(4), "D(4)C(4)B(4)A(4)")
|
|
|
|
# Test for subclassing super
|
|
|
|
class mysuper(super):
|
|
def __init__(self, *args):
|
|
return super(mysuper, self).__init__(*args)
|
|
|
|
class E(D):
|
|
def meth(self, a):
|
|
return "E(%r)" % a + mysuper(E, self).meth(a)
|
|
|
|
vereq(E().meth(5), "E(5)D(5)C(5)B(5)A(5)")
|
|
|
|
class F(E):
|
|
def meth(self, a):
|
|
s = self.__super # == mysuper(F, self)
|
|
return "F(%r)[%s]" % (a, s.__class__.__name__) + s.meth(a)
|
|
F._F__super = mysuper(F)
|
|
|
|
vereq(F().meth(6), "F(6)[mysuper]E(6)D(6)C(6)B(6)A(6)")
|
|
|
|
# Make sure certain errors are raised
|
|
|
|
try:
|
|
super(D, 42)
|
|
except TypeError:
|
|
pass
|
|
else:
|
|
raise TestFailed, "shouldn't allow super(D, 42)"
|
|
|
|
try:
|
|
super(D, C())
|
|
except TypeError:
|
|
pass
|
|
else:
|
|
raise TestFailed, "shouldn't allow super(D, C())"
|
|
|
|
try:
|
|
super(D).__get__(12)
|
|
except TypeError:
|
|
pass
|
|
else:
|
|
raise TestFailed, "shouldn't allow super(D).__get__(12)"
|
|
|
|
try:
|
|
super(D).__get__(C())
|
|
except TypeError:
|
|
pass
|
|
else:
|
|
raise TestFailed, "shouldn't allow super(D).__get__(C())"
|
|
|
|
# Make sure data descriptors can be overridden and accessed via super
|
|
# (new feature in Python 2.3)
|
|
|
|
class DDbase(object):
|
|
def getx(self): return 42
|
|
x = property(getx)
|
|
|
|
class DDsub(DDbase):
|
|
def getx(self): return "hello"
|
|
x = property(getx)
|
|
|
|
dd = DDsub()
|
|
vereq(dd.x, "hello")
|
|
vereq(super(DDsub, dd).x, 42)
|
|
|
|
# Ensure that super() lookup of descriptor from classmethod
|
|
# works (SF ID# 743627)
|
|
|
|
class Base(object):
|
|
aProp = property(lambda self: "foo")
|
|
|
|
class Sub(Base):
|
|
@classmethod
|
|
def test(klass):
|
|
return super(Sub,klass).aProp
|
|
|
|
veris(Sub.test(), Base.aProp)
|
|
|
|
# Verify that super() doesn't allow keyword args
|
|
try:
|
|
super(Base, kw=1)
|
|
except TypeError:
|
|
pass
|
|
else:
|
|
raise TestFailed, "super shouldn't accept keyword args"
|
|
|
|
def inherits():
|
|
if verbose: print("Testing inheritance from basic types...")
|
|
|
|
class hexint(int):
|
|
def __repr__(self):
|
|
return hex(self)
|
|
def __add__(self, other):
|
|
return hexint(int.__add__(self, other))
|
|
# (Note that overriding __radd__ doesn't work,
|
|
# because the int type gets first dibs.)
|
|
vereq(repr(hexint(7) + 9), "0x10")
|
|
vereq(repr(hexint(1000) + 7), "0x3ef")
|
|
a = hexint(12345)
|
|
vereq(a, 12345)
|
|
vereq(int(a), 12345)
|
|
verify(int(a).__class__ is int)
|
|
vereq(hash(a), hash(12345))
|
|
verify((+a).__class__ is int)
|
|
verify((a >> 0).__class__ is int)
|
|
verify((a << 0).__class__ is int)
|
|
verify((hexint(0) << 12).__class__ is int)
|
|
verify((hexint(0) >> 12).__class__ is int)
|
|
|
|
class octlong(int):
|
|
__slots__ = []
|
|
def __str__(self):
|
|
s = oct(self)
|
|
if s[-1] == 'L':
|
|
s = s[:-1]
|
|
return s
|
|
def __add__(self, other):
|
|
return self.__class__(super(octlong, self).__add__(other))
|
|
__radd__ = __add__
|
|
vereq(str(octlong(3) + 5), "010")
|
|
# (Note that overriding __radd__ here only seems to work
|
|
# because the example uses a short int left argument.)
|
|
vereq(str(5 + octlong(3000)), "05675")
|
|
a = octlong(12345)
|
|
vereq(a, 12345)
|
|
vereq(int(a), 12345)
|
|
vereq(hash(a), hash(12345))
|
|
verify(int(a).__class__ is int)
|
|
verify((+a).__class__ is int)
|
|
verify((-a).__class__ is int)
|
|
verify((-octlong(0)).__class__ is int)
|
|
verify((a >> 0).__class__ is int)
|
|
verify((a << 0).__class__ is int)
|
|
verify((a - 0).__class__ is int)
|
|
verify((a * 1).__class__ is int)
|
|
verify((a ** 1).__class__ is int)
|
|
verify((a // 1).__class__ is int)
|
|
verify((1 * a).__class__ is int)
|
|
verify((a | 0).__class__ is int)
|
|
verify((a ^ 0).__class__ is int)
|
|
verify((a & -1).__class__ is int)
|
|
verify((octlong(0) << 12).__class__ is int)
|
|
verify((octlong(0) >> 12).__class__ is int)
|
|
verify(abs(octlong(0)).__class__ is int)
|
|
|
|
# Because octlong overrides __add__, we can't check the absence of +0
|
|
# optimizations using octlong.
|
|
class longclone(int):
|
|
pass
|
|
a = longclone(1)
|
|
verify((a + 0).__class__ is int)
|
|
verify((0 + a).__class__ is int)
|
|
|
|
# Check that negative clones don't segfault
|
|
a = longclone(-1)
|
|
vereq(a.__dict__, {})
|
|
vereq(int(a), -1) # verify PyNumber_Long() copies the sign bit
|
|
|
|
class precfloat(float):
|
|
__slots__ = ['prec']
|
|
def __init__(self, value=0.0, prec=12):
|
|
self.prec = int(prec)
|
|
def __repr__(self):
|
|
return "%.*g" % (self.prec, self)
|
|
vereq(repr(precfloat(1.1)), "1.1")
|
|
a = precfloat(12345)
|
|
vereq(a, 12345.0)
|
|
vereq(float(a), 12345.0)
|
|
verify(float(a).__class__ is float)
|
|
vereq(hash(a), hash(12345.0))
|
|
verify((+a).__class__ is float)
|
|
|
|
class madcomplex(complex):
|
|
def __repr__(self):
|
|
return "%.17gj%+.17g" % (self.imag, self.real)
|
|
a = madcomplex(-3, 4)
|
|
vereq(repr(a), "4j-3")
|
|
base = complex(-3, 4)
|
|
veris(base.__class__, complex)
|
|
vereq(a, base)
|
|
vereq(complex(a), base)
|
|
veris(complex(a).__class__, complex)
|
|
a = madcomplex(a) # just trying another form of the constructor
|
|
vereq(repr(a), "4j-3")
|
|
vereq(a, base)
|
|
vereq(complex(a), base)
|
|
veris(complex(a).__class__, complex)
|
|
vereq(hash(a), hash(base))
|
|
veris((+a).__class__, complex)
|
|
veris((a + 0).__class__, complex)
|
|
vereq(a + 0, base)
|
|
veris((a - 0).__class__, complex)
|
|
vereq(a - 0, base)
|
|
veris((a * 1).__class__, complex)
|
|
vereq(a * 1, base)
|
|
veris((a / 1).__class__, complex)
|
|
vereq(a / 1, base)
|
|
|
|
class madtuple(tuple):
|
|
_rev = None
|
|
def rev(self):
|
|
if self._rev is not None:
|
|
return self._rev
|
|
L = list(self)
|
|
L.reverse()
|
|
self._rev = self.__class__(L)
|
|
return self._rev
|
|
a = madtuple((1,2,3,4,5,6,7,8,9,0))
|
|
vereq(a, (1,2,3,4,5,6,7,8,9,0))
|
|
vereq(a.rev(), madtuple((0,9,8,7,6,5,4,3,2,1)))
|
|
vereq(a.rev().rev(), madtuple((1,2,3,4,5,6,7,8,9,0)))
|
|
for i in range(512):
|
|
t = madtuple(range(i))
|
|
u = t.rev()
|
|
v = u.rev()
|
|
vereq(v, t)
|
|
a = madtuple((1,2,3,4,5))
|
|
vereq(tuple(a), (1,2,3,4,5))
|
|
verify(tuple(a).__class__ is tuple)
|
|
vereq(hash(a), hash((1,2,3,4,5)))
|
|
verify(a[:].__class__ is tuple)
|
|
verify((a * 1).__class__ is tuple)
|
|
verify((a * 0).__class__ is tuple)
|
|
verify((a + ()).__class__ is tuple)
|
|
a = madtuple(())
|
|
vereq(tuple(a), ())
|
|
verify(tuple(a).__class__ is tuple)
|
|
verify((a + a).__class__ is tuple)
|
|
verify((a * 0).__class__ is tuple)
|
|
verify((a * 1).__class__ is tuple)
|
|
verify((a * 2).__class__ is tuple)
|
|
verify(a[:].__class__ is tuple)
|
|
|
|
class madstring(str):
|
|
_rev = None
|
|
def rev(self):
|
|
if self._rev is not None:
|
|
return self._rev
|
|
L = list(self)
|
|
L.reverse()
|
|
self._rev = self.__class__("".join(L))
|
|
return self._rev
|
|
s = madstring("abcdefghijklmnopqrstuvwxyz")
|
|
vereq(s, "abcdefghijklmnopqrstuvwxyz")
|
|
vereq(s.rev(), madstring("zyxwvutsrqponmlkjihgfedcba"))
|
|
vereq(s.rev().rev(), madstring("abcdefghijklmnopqrstuvwxyz"))
|
|
for i in range(256):
|
|
s = madstring("".join(map(chr, range(i))))
|
|
t = s.rev()
|
|
u = t.rev()
|
|
vereq(u, s)
|
|
s = madstring("12345")
|
|
vereq(str(s), "12345")
|
|
verify(str(s).__class__ is str)
|
|
|
|
base = "\x00" * 5
|
|
s = madstring(base)
|
|
vereq(s, base)
|
|
vereq(str(s), base)
|
|
verify(str(s).__class__ is str)
|
|
vereq(hash(s), hash(base))
|
|
vereq({s: 1}[base], 1)
|
|
vereq({base: 1}[s], 1)
|
|
verify((s + "").__class__ is str)
|
|
vereq(s + "", base)
|
|
verify(("" + s).__class__ is str)
|
|
vereq("" + s, base)
|
|
verify((s * 0).__class__ is str)
|
|
vereq(s * 0, "")
|
|
verify((s * 1).__class__ is str)
|
|
vereq(s * 1, base)
|
|
verify((s * 2).__class__ is str)
|
|
vereq(s * 2, base + base)
|
|
verify(s[:].__class__ is str)
|
|
vereq(s[:], base)
|
|
verify(s[0:0].__class__ is str)
|
|
vereq(s[0:0], "")
|
|
verify(s.strip().__class__ is str)
|
|
vereq(s.strip(), base)
|
|
verify(s.lstrip().__class__ is str)
|
|
vereq(s.lstrip(), base)
|
|
verify(s.rstrip().__class__ is str)
|
|
vereq(s.rstrip(), base)
|
|
identitytab = ''.join([chr(i) for i in range(256)])
|
|
verify(s.translate(identitytab).__class__ is str)
|
|
vereq(s.translate(identitytab), base)
|
|
verify(s.translate(identitytab, "x").__class__ is str)
|
|
vereq(s.translate(identitytab, "x"), base)
|
|
vereq(s.translate(identitytab, "\x00"), "")
|
|
verify(s.replace("x", "x").__class__ is str)
|
|
vereq(s.replace("x", "x"), base)
|
|
verify(s.ljust(len(s)).__class__ is str)
|
|
vereq(s.ljust(len(s)), base)
|
|
verify(s.rjust(len(s)).__class__ is str)
|
|
vereq(s.rjust(len(s)), base)
|
|
verify(s.center(len(s)).__class__ is str)
|
|
vereq(s.center(len(s)), base)
|
|
verify(s.lower().__class__ is str)
|
|
vereq(s.lower(), base)
|
|
|
|
class madunicode(unicode):
|
|
_rev = None
|
|
def rev(self):
|
|
if self._rev is not None:
|
|
return self._rev
|
|
L = list(self)
|
|
L.reverse()
|
|
self._rev = self.__class__(u"".join(L))
|
|
return self._rev
|
|
u = madunicode("ABCDEF")
|
|
vereq(u, u"ABCDEF")
|
|
vereq(u.rev(), madunicode(u"FEDCBA"))
|
|
vereq(u.rev().rev(), madunicode(u"ABCDEF"))
|
|
base = u"12345"
|
|
u = madunicode(base)
|
|
vereq(unicode(u), base)
|
|
verify(unicode(u).__class__ is unicode)
|
|
vereq(hash(u), hash(base))
|
|
vereq({u: 1}[base], 1)
|
|
vereq({base: 1}[u], 1)
|
|
verify(u.strip().__class__ is unicode)
|
|
vereq(u.strip(), base)
|
|
verify(u.lstrip().__class__ is unicode)
|
|
vereq(u.lstrip(), base)
|
|
verify(u.rstrip().__class__ is unicode)
|
|
vereq(u.rstrip(), base)
|
|
verify(u.replace(u"x", u"x").__class__ is unicode)
|
|
vereq(u.replace(u"x", u"x"), base)
|
|
verify(u.replace(u"xy", u"xy").__class__ is unicode)
|
|
vereq(u.replace(u"xy", u"xy"), base)
|
|
verify(u.center(len(u)).__class__ is unicode)
|
|
vereq(u.center(len(u)), base)
|
|
verify(u.ljust(len(u)).__class__ is unicode)
|
|
vereq(u.ljust(len(u)), base)
|
|
verify(u.rjust(len(u)).__class__ is unicode)
|
|
vereq(u.rjust(len(u)), base)
|
|
verify(u.lower().__class__ is unicode)
|
|
vereq(u.lower(), base)
|
|
verify(u.upper().__class__ is unicode)
|
|
vereq(u.upper(), base)
|
|
verify(u.capitalize().__class__ is unicode)
|
|
vereq(u.capitalize(), base)
|
|
verify(u.title().__class__ is unicode)
|
|
vereq(u.title(), base)
|
|
verify((u + u"").__class__ is unicode)
|
|
vereq(u + u"", base)
|
|
verify((u"" + u).__class__ is unicode)
|
|
vereq(u"" + u, base)
|
|
verify((u * 0).__class__ is unicode)
|
|
vereq(u * 0, u"")
|
|
verify((u * 1).__class__ is unicode)
|
|
vereq(u * 1, base)
|
|
verify((u * 2).__class__ is unicode)
|
|
vereq(u * 2, base + base)
|
|
verify(u[:].__class__ is unicode)
|
|
vereq(u[:], base)
|
|
verify(u[0:0].__class__ is unicode)
|
|
vereq(u[0:0], u"")
|
|
|
|
class sublist(list):
|
|
pass
|
|
a = sublist(range(5))
|
|
vereq(a, range(5))
|
|
a.append("hello")
|
|
vereq(a, range(5) + ["hello"])
|
|
a[5] = 5
|
|
vereq(a, range(6))
|
|
a.extend(range(6, 20))
|
|
vereq(a, range(20))
|
|
a[-5:] = []
|
|
vereq(a, range(15))
|
|
del a[10:15]
|
|
vereq(len(a), 10)
|
|
vereq(a, range(10))
|
|
vereq(list(a), range(10))
|
|
vereq(a[0], 0)
|
|
vereq(a[9], 9)
|
|
vereq(a[-10], 0)
|
|
vereq(a[-1], 9)
|
|
vereq(a[:5], range(5))
|
|
|
|
class CountedInput(file):
|
|
"""Counts lines read by self.readline().
|
|
|
|
self.lineno is the 0-based ordinal of the last line read, up to
|
|
a maximum of one greater than the number of lines in the file.
|
|
|
|
self.ateof is true if and only if the final "" line has been read,
|
|
at which point self.lineno stops incrementing, and further calls
|
|
to readline() continue to return "".
|
|
"""
|
|
|
|
lineno = 0
|
|
ateof = 0
|
|
def readline(self):
|
|
if self.ateof:
|
|
return ""
|
|
s = file.readline(self)
|
|
# Next line works too.
|
|
# s = super(CountedInput, self).readline()
|
|
self.lineno += 1
|
|
if s == "":
|
|
self.ateof = 1
|
|
return s
|
|
|
|
f = open(name=TESTFN, mode='w')
|
|
lines = ['a\n', 'b\n', 'c\n']
|
|
try:
|
|
f.writelines(lines)
|
|
f.close()
|
|
f = CountedInput(TESTFN)
|
|
for (i, expected) in zip(range(1, 5) + [4], lines + 2 * [""]):
|
|
got = f.readline()
|
|
vereq(expected, got)
|
|
vereq(f.lineno, i)
|
|
vereq(f.ateof, (i > len(lines)))
|
|
f.close()
|
|
finally:
|
|
try:
|
|
f.close()
|
|
except:
|
|
pass
|
|
try:
|
|
import os
|
|
os.unlink(TESTFN)
|
|
except:
|
|
pass
|
|
|
|
def keywords():
|
|
if verbose:
|
|
print("Testing keyword args to basic type constructors ...")
|
|
vereq(int(x=1), 1)
|
|
vereq(float(x=2), 2.0)
|
|
vereq(int(x=3), 3)
|
|
vereq(complex(imag=42, real=666), complex(666, 42))
|
|
vereq(str(object=500), '500')
|
|
vereq(unicode(string='abc', errors='strict'), u'abc')
|
|
vereq(tuple(sequence=range(3)), (0, 1, 2))
|
|
vereq(list(sequence=(0, 1, 2)), range(3))
|
|
# note: as of Python 2.3, dict() no longer has an "items" keyword arg
|
|
|
|
for constructor in (int, float, int, complex, str, unicode,
|
|
tuple, list, file):
|
|
try:
|
|
constructor(bogus_keyword_arg=1)
|
|
except TypeError:
|
|
pass
|
|
else:
|
|
raise TestFailed("expected TypeError from bogus keyword "
|
|
"argument to %r" % constructor)
|
|
|
|
def restricted():
|
|
# XXX This test is disabled because rexec is not deemed safe
|
|
return
|
|
import rexec
|
|
if verbose:
|
|
print("Testing interaction with restricted execution ...")
|
|
|
|
sandbox = rexec.RExec()
|
|
|
|
code1 = """f = open(%r, 'w')""" % TESTFN
|
|
code2 = """f = open(%r, 'w')""" % TESTFN
|
|
code3 = """\
|
|
f = open(%r)
|
|
t = type(f) # a sneaky way to get the file() constructor
|
|
f.close()
|
|
f = t(%r, 'w') # rexec can't catch this by itself
|
|
""" % (TESTFN, TESTFN)
|
|
|
|
f = open(TESTFN, 'w') # Create the file so code3 can find it.
|
|
f.close()
|
|
|
|
try:
|
|
for code in code1, code2, code3:
|
|
try:
|
|
sandbox.r_exec(code)
|
|
except IOError as msg:
|
|
if str(msg).find("restricted") >= 0:
|
|
outcome = "OK"
|
|
else:
|
|
outcome = "got an exception, but not an expected one"
|
|
else:
|
|
outcome = "expected a restricted-execution exception"
|
|
|
|
if outcome != "OK":
|
|
raise TestFailed("%s, in %r" % (outcome, code))
|
|
|
|
finally:
|
|
try:
|
|
import os
|
|
os.unlink(TESTFN)
|
|
except:
|
|
pass
|
|
|
|
def str_subclass_as_dict_key():
|
|
if verbose:
|
|
print("Testing a str subclass used as dict key ..")
|
|
|
|
class cistr(str):
|
|
"""Sublcass of str that computes __eq__ case-insensitively.
|
|
|
|
Also computes a hash code of the string in canonical form.
|
|
"""
|
|
|
|
def __init__(self, value):
|
|
self.canonical = value.lower()
|
|
self.hashcode = hash(self.canonical)
|
|
|
|
def __eq__(self, other):
|
|
if not isinstance(other, cistr):
|
|
other = cistr(other)
|
|
return self.canonical == other.canonical
|
|
|
|
def __hash__(self):
|
|
return self.hashcode
|
|
|
|
vereq(cistr('ABC'), 'abc')
|
|
vereq('aBc', cistr('ABC'))
|
|
vereq(str(cistr('ABC')), 'ABC')
|
|
|
|
d = {cistr('one'): 1, cistr('two'): 2, cistr('tHree'): 3}
|
|
vereq(d[cistr('one')], 1)
|
|
vereq(d[cistr('tWo')], 2)
|
|
vereq(d[cistr('THrEE')], 3)
|
|
verify(cistr('ONe') in d)
|
|
vereq(d.get(cistr('thrEE')), 3)
|
|
|
|
def classic_comparisons():
|
|
if verbose: print("Testing classic comparisons...")
|
|
class classic:
|
|
pass
|
|
for base in (classic, int, object):
|
|
if verbose: print(" (base = %s)" % base)
|
|
class C(base):
|
|
def __init__(self, value):
|
|
self.value = int(value)
|
|
def __eq__(self, other):
|
|
if isinstance(other, C):
|
|
return self.value == other.value
|
|
if isinstance(other, int) or isinstance(other, int):
|
|
return self.value == other
|
|
return NotImplemented
|
|
def __ne__(self, other):
|
|
if isinstance(other, C):
|
|
return self.value != other.value
|
|
if isinstance(other, int) or isinstance(other, int):
|
|
return self.value != other
|
|
return NotImplemented
|
|
def __lt__(self, other):
|
|
if isinstance(other, C):
|
|
return self.value < other.value
|
|
if isinstance(other, int) or isinstance(other, int):
|
|
return self.value < other
|
|
return NotImplemented
|
|
def __le__(self, other):
|
|
if isinstance(other, C):
|
|
return self.value <= other.value
|
|
if isinstance(other, int) or isinstance(other, int):
|
|
return self.value <= other
|
|
return NotImplemented
|
|
def __gt__(self, other):
|
|
if isinstance(other, C):
|
|
return self.value > other.value
|
|
if isinstance(other, int) or isinstance(other, int):
|
|
return self.value > other
|
|
return NotImplemented
|
|
def __ge__(self, other):
|
|
if isinstance(other, C):
|
|
return self.value >= other.value
|
|
if isinstance(other, int) or isinstance(other, int):
|
|
return self.value >= other
|
|
return NotImplemented
|
|
|
|
c1 = C(1)
|
|
c2 = C(2)
|
|
c3 = C(3)
|
|
vereq(c1, 1)
|
|
c = {1: c1, 2: c2, 3: c3}
|
|
for x in 1, 2, 3:
|
|
for y in 1, 2, 3:
|
|
##verify(cmp(c[x], c[y]) == cmp(x, y), "x=%d, y=%d" % (x, y))
|
|
for op in "<", "<=", "==", "!=", ">", ">=":
|
|
verify(eval("c[x] %s c[y]" % op) == eval("x %s y" % op),
|
|
"x=%d, y=%d" % (x, y))
|
|
##verify(cmp(c[x], y) == cmp(x, y), "x=%d, y=%d" % (x, y))
|
|
##verify(cmp(x, c[y]) == cmp(x, y), "x=%d, y=%d" % (x, y))
|
|
|
|
def rich_comparisons():
|
|
if verbose:
|
|
print("Testing rich comparisons...")
|
|
class Z(complex):
|
|
pass
|
|
z = Z(1)
|
|
vereq(z, 1+0j)
|
|
vereq(1+0j, z)
|
|
class ZZ(complex):
|
|
def __eq__(self, other):
|
|
try:
|
|
return abs(self - other) <= 1e-6
|
|
except:
|
|
return NotImplemented
|
|
zz = ZZ(1.0000003)
|
|
vereq(zz, 1+0j)
|
|
vereq(1+0j, zz)
|
|
|
|
class classic:
|
|
pass
|
|
for base in (classic, int, object, list):
|
|
if verbose: print(" (base = %s)" % base)
|
|
class C(base):
|
|
def __init__(self, value):
|
|
self.value = int(value)
|
|
def __cmp__(self, other):
|
|
raise TestFailed, "shouldn't call __cmp__"
|
|
def __eq__(self, other):
|
|
if isinstance(other, C):
|
|
return self.value == other.value
|
|
if isinstance(other, int) or isinstance(other, int):
|
|
return self.value == other
|
|
return NotImplemented
|
|
def __ne__(self, other):
|
|
if isinstance(other, C):
|
|
return self.value != other.value
|
|
if isinstance(other, int) or isinstance(other, int):
|
|
return self.value != other
|
|
return NotImplemented
|
|
def __lt__(self, other):
|
|
if isinstance(other, C):
|
|
return self.value < other.value
|
|
if isinstance(other, int) or isinstance(other, int):
|
|
return self.value < other
|
|
return NotImplemented
|
|
def __le__(self, other):
|
|
if isinstance(other, C):
|
|
return self.value <= other.value
|
|
if isinstance(other, int) or isinstance(other, int):
|
|
return self.value <= other
|
|
return NotImplemented
|
|
def __gt__(self, other):
|
|
if isinstance(other, C):
|
|
return self.value > other.value
|
|
if isinstance(other, int) or isinstance(other, int):
|
|
return self.value > other
|
|
return NotImplemented
|
|
def __ge__(self, other):
|
|
if isinstance(other, C):
|
|
return self.value >= other.value
|
|
if isinstance(other, int) or isinstance(other, int):
|
|
return self.value >= other
|
|
return NotImplemented
|
|
c1 = C(1)
|
|
c2 = C(2)
|
|
c3 = C(3)
|
|
vereq(c1, 1)
|
|
c = {1: c1, 2: c2, 3: c3}
|
|
for x in 1, 2, 3:
|
|
for y in 1, 2, 3:
|
|
for op in "<", "<=", "==", "!=", ">", ">=":
|
|
verify(eval("c[x] %s c[y]" % op) == eval("x %s y" % op),
|
|
"x=%d, y=%d" % (x, y))
|
|
verify(eval("c[x] %s y" % op) == eval("x %s y" % op),
|
|
"x=%d, y=%d" % (x, y))
|
|
verify(eval("x %s c[y]" % op) == eval("x %s y" % op),
|
|
"x=%d, y=%d" % (x, y))
|
|
|
|
def descrdoc():
|
|
if verbose: print("Testing descriptor doc strings...")
|
|
def check(descr, what):
|
|
vereq(descr.__doc__, what)
|
|
check(file.closed, "True if the file is closed") # getset descriptor
|
|
check(file.name, "file name") # member descriptor
|
|
|
|
def setclass():
|
|
if verbose: print("Testing __class__ assignment...")
|
|
class C(object): pass
|
|
class D(object): pass
|
|
class E(object): pass
|
|
class F(D, E): pass
|
|
for cls in C, D, E, F:
|
|
for cls2 in C, D, E, F:
|
|
x = cls()
|
|
x.__class__ = cls2
|
|
verify(x.__class__ is cls2)
|
|
x.__class__ = cls
|
|
verify(x.__class__ is cls)
|
|
def cant(x, C):
|
|
try:
|
|
x.__class__ = C
|
|
except TypeError:
|
|
pass
|
|
else:
|
|
raise TestFailed, "shouldn't allow %r.__class__ = %r" % (x, C)
|
|
try:
|
|
delattr(x, "__class__")
|
|
except TypeError:
|
|
pass
|
|
else:
|
|
raise TestFailed, "shouldn't allow del %r.__class__" % x
|
|
cant(C(), list)
|
|
cant(list(), C)
|
|
cant(C(), 1)
|
|
cant(C(), object)
|
|
cant(object(), list)
|
|
cant(list(), object)
|
|
class Int(int): __slots__ = []
|
|
cant(2, Int)
|
|
cant(Int(), int)
|
|
cant(True, int)
|
|
cant(2, bool)
|
|
o = object()
|
|
cant(o, type(1))
|
|
cant(o, type(None))
|
|
del o
|
|
class G(object):
|
|
__slots__ = ["a", "b"]
|
|
class H(object):
|
|
__slots__ = ["b", "a"]
|
|
try:
|
|
unicode
|
|
except NameError:
|
|
class I(object):
|
|
__slots__ = ["a", "b"]
|
|
else:
|
|
class I(object):
|
|
__slots__ = [unicode("a"), unicode("b")]
|
|
class J(object):
|
|
__slots__ = ["c", "b"]
|
|
class K(object):
|
|
__slots__ = ["a", "b", "d"]
|
|
class L(H):
|
|
__slots__ = ["e"]
|
|
class M(I):
|
|
__slots__ = ["e"]
|
|
class N(J):
|
|
__slots__ = ["__weakref__"]
|
|
class P(J):
|
|
__slots__ = ["__dict__"]
|
|
class Q(J):
|
|
pass
|
|
class R(J):
|
|
__slots__ = ["__dict__", "__weakref__"]
|
|
|
|
for cls, cls2 in ((G, H), (G, I), (I, H), (Q, R), (R, Q)):
|
|
x = cls()
|
|
x.a = 1
|
|
x.__class__ = cls2
|
|
verify(x.__class__ is cls2,
|
|
"assigning %r as __class__ for %r silently failed" % (cls2, x))
|
|
vereq(x.a, 1)
|
|
x.__class__ = cls
|
|
verify(x.__class__ is cls,
|
|
"assigning %r as __class__ for %r silently failed" % (cls, x))
|
|
vereq(x.a, 1)
|
|
for cls in G, J, K, L, M, N, P, R, list, Int:
|
|
for cls2 in G, J, K, L, M, N, P, R, list, Int:
|
|
if cls is cls2:
|
|
continue
|
|
cant(cls(), cls2)
|
|
|
|
def setdict():
|
|
if verbose: print("Testing __dict__ assignment...")
|
|
class C(object): pass
|
|
a = C()
|
|
a.__dict__ = {'b': 1}
|
|
vereq(a.b, 1)
|
|
def cant(x, dict):
|
|
try:
|
|
x.__dict__ = dict
|
|
except (AttributeError, TypeError):
|
|
pass
|
|
else:
|
|
raise TestFailed, "shouldn't allow %r.__dict__ = %r" % (x, dict)
|
|
cant(a, None)
|
|
cant(a, [])
|
|
cant(a, 1)
|
|
del a.__dict__ # Deleting __dict__ is allowed
|
|
# Classes don't allow __dict__ assignment
|
|
cant(C, {})
|
|
|
|
def pickles():
|
|
if verbose:
|
|
print("Testing pickling and copying new-style classes and objects...")
|
|
import pickle
|
|
try:
|
|
import cPickle
|
|
except ImportError:
|
|
cPickle = None
|
|
|
|
def sorteditems(d):
|
|
return sorted(d.items())
|
|
|
|
global C
|
|
class C(object):
|
|
def __init__(self, a, b):
|
|
super(C, self).__init__()
|
|
self.a = a
|
|
self.b = b
|
|
def __repr__(self):
|
|
return "C(%r, %r)" % (self.a, self.b)
|
|
|
|
global C1
|
|
class C1(list):
|
|
def __new__(cls, a, b):
|
|
return super(C1, cls).__new__(cls)
|
|
def __getnewargs__(self):
|
|
return (self.a, self.b)
|
|
def __init__(self, a, b):
|
|
self.a = a
|
|
self.b = b
|
|
def __repr__(self):
|
|
return "C1(%r, %r)<%r>" % (self.a, self.b, list(self))
|
|
|
|
global C2
|
|
class C2(int):
|
|
def __new__(cls, a, b, val=0):
|
|
return super(C2, cls).__new__(cls, val)
|
|
def __getnewargs__(self):
|
|
return (self.a, self.b, int(self))
|
|
def __init__(self, a, b, val=0):
|
|
self.a = a
|
|
self.b = b
|
|
def __repr__(self):
|
|
return "C2(%r, %r)<%r>" % (self.a, self.b, int(self))
|
|
|
|
global C3
|
|
class C3(object):
|
|
def __init__(self, foo):
|
|
self.foo = foo
|
|
def __getstate__(self):
|
|
return self.foo
|
|
def __setstate__(self, foo):
|
|
self.foo = foo
|
|
|
|
global C4classic, C4
|
|
class C4classic: # classic
|
|
pass
|
|
class C4(C4classic, object): # mixed inheritance
|
|
pass
|
|
|
|
for p in pickle, cPickle:
|
|
if p is None:
|
|
continue # cPickle not found -- skip it
|
|
for bin in 0, 1:
|
|
if verbose:
|
|
print(p.__name__, ["text", "binary"][bin])
|
|
|
|
for cls in C, C1, C2:
|
|
s = p.dumps(cls, bin)
|
|
cls2 = p.loads(s)
|
|
verify(cls2 is cls)
|
|
|
|
a = C1(1, 2); a.append(42); a.append(24)
|
|
b = C2("hello", "world", 42)
|
|
s = p.dumps((a, b), bin)
|
|
x, y = p.loads(s)
|
|
vereq(x.__class__, a.__class__)
|
|
vereq(sorteditems(x.__dict__), sorteditems(a.__dict__))
|
|
vereq(y.__class__, b.__class__)
|
|
vereq(sorteditems(y.__dict__), sorteditems(b.__dict__))
|
|
vereq(repr(x), repr(a))
|
|
vereq(repr(y), repr(b))
|
|
if verbose:
|
|
print("a = x =", a)
|
|
print("b = y =", b)
|
|
# Test for __getstate__ and __setstate__ on new style class
|
|
u = C3(42)
|
|
s = p.dumps(u, bin)
|
|
v = p.loads(s)
|
|
veris(u.__class__, v.__class__)
|
|
vereq(u.foo, v.foo)
|
|
# Test for picklability of hybrid class
|
|
u = C4()
|
|
u.foo = 42
|
|
s = p.dumps(u, bin)
|
|
v = p.loads(s)
|
|
veris(u.__class__, v.__class__)
|
|
vereq(u.foo, v.foo)
|
|
|
|
# Testing copy.deepcopy()
|
|
if verbose:
|
|
print("deepcopy")
|
|
import copy
|
|
for cls in C, C1, C2:
|
|
cls2 = copy.deepcopy(cls)
|
|
verify(cls2 is cls)
|
|
|
|
a = C1(1, 2); a.append(42); a.append(24)
|
|
b = C2("hello", "world", 42)
|
|
x, y = copy.deepcopy((a, b))
|
|
vereq(x.__class__, a.__class__)
|
|
vereq(sorteditems(x.__dict__), sorteditems(a.__dict__))
|
|
vereq(y.__class__, b.__class__)
|
|
vereq(sorteditems(y.__dict__), sorteditems(b.__dict__))
|
|
vereq(repr(x), repr(a))
|
|
vereq(repr(y), repr(b))
|
|
if verbose:
|
|
print("a = x =", a)
|
|
print("b = y =", b)
|
|
|
|
def pickleslots():
|
|
if verbose: print("Testing pickling of classes with __slots__ ...")
|
|
import pickle, pickle as cPickle
|
|
# Pickling of classes with __slots__ but without __getstate__ should fail
|
|
global B, C, D, E
|
|
class B(object):
|
|
pass
|
|
for base in [object, B]:
|
|
class C(base):
|
|
__slots__ = ['a']
|
|
class D(C):
|
|
pass
|
|
try:
|
|
pickle.dumps(C())
|
|
except TypeError:
|
|
pass
|
|
else:
|
|
raise TestFailed, "should fail: pickle C instance - %s" % base
|
|
try:
|
|
cPickle.dumps(C())
|
|
except TypeError:
|
|
pass
|
|
else:
|
|
raise TestFailed, "should fail: cPickle C instance - %s" % base
|
|
try:
|
|
pickle.dumps(C())
|
|
except TypeError:
|
|
pass
|
|
else:
|
|
raise TestFailed, "should fail: pickle D instance - %s" % base
|
|
try:
|
|
cPickle.dumps(D())
|
|
except TypeError:
|
|
pass
|
|
else:
|
|
raise TestFailed, "should fail: cPickle D instance - %s" % base
|
|
# Give C a nice generic __getstate__ and __setstate__
|
|
class C(base):
|
|
__slots__ = ['a']
|
|
def __getstate__(self):
|
|
try:
|
|
d = self.__dict__.copy()
|
|
except AttributeError:
|
|
d = {}
|
|
for cls in self.__class__.__mro__:
|
|
for sn in cls.__dict__.get('__slots__', ()):
|
|
try:
|
|
d[sn] = getattr(self, sn)
|
|
except AttributeError:
|
|
pass
|
|
return d
|
|
def __setstate__(self, d):
|
|
for k, v in d.items():
|
|
setattr(self, k, v)
|
|
class D(C):
|
|
pass
|
|
# Now it should work
|
|
x = C()
|
|
y = pickle.loads(pickle.dumps(x))
|
|
vereq(hasattr(y, 'a'), 0)
|
|
y = cPickle.loads(cPickle.dumps(x))
|
|
vereq(hasattr(y, 'a'), 0)
|
|
x.a = 42
|
|
y = pickle.loads(pickle.dumps(x))
|
|
vereq(y.a, 42)
|
|
y = cPickle.loads(cPickle.dumps(x))
|
|
vereq(y.a, 42)
|
|
x = D()
|
|
x.a = 42
|
|
x.b = 100
|
|
y = pickle.loads(pickle.dumps(x))
|
|
vereq(y.a + y.b, 142)
|
|
y = cPickle.loads(cPickle.dumps(x))
|
|
vereq(y.a + y.b, 142)
|
|
# A subclass that adds a slot should also work
|
|
class E(C):
|
|
__slots__ = ['b']
|
|
x = E()
|
|
x.a = 42
|
|
x.b = "foo"
|
|
y = pickle.loads(pickle.dumps(x))
|
|
vereq(y.a, x.a)
|
|
vereq(y.b, x.b)
|
|
y = cPickle.loads(cPickle.dumps(x))
|
|
vereq(y.a, x.a)
|
|
vereq(y.b, x.b)
|
|
|
|
def copies():
|
|
if verbose: print("Testing copy.copy() and copy.deepcopy()...")
|
|
import copy
|
|
class C(object):
|
|
pass
|
|
|
|
a = C()
|
|
a.foo = 12
|
|
b = copy.copy(a)
|
|
vereq(b.__dict__, a.__dict__)
|
|
|
|
a.bar = [1,2,3]
|
|
c = copy.copy(a)
|
|
vereq(c.bar, a.bar)
|
|
verify(c.bar is a.bar)
|
|
|
|
d = copy.deepcopy(a)
|
|
vereq(d.__dict__, a.__dict__)
|
|
a.bar.append(4)
|
|
vereq(d.bar, [1,2,3])
|
|
|
|
def binopoverride():
|
|
if verbose: print("Testing overrides of binary operations...")
|
|
class I(int):
|
|
def __repr__(self):
|
|
return "I(%r)" % int(self)
|
|
def __add__(self, other):
|
|
return I(int(self) + int(other))
|
|
__radd__ = __add__
|
|
def __pow__(self, other, mod=None):
|
|
if mod is None:
|
|
return I(pow(int(self), int(other)))
|
|
else:
|
|
return I(pow(int(self), int(other), int(mod)))
|
|
def __rpow__(self, other, mod=None):
|
|
if mod is None:
|
|
return I(pow(int(other), int(self), mod))
|
|
else:
|
|
return I(pow(int(other), int(self), int(mod)))
|
|
|
|
vereq(repr(I(1) + I(2)), "I(3)")
|
|
vereq(repr(I(1) + 2), "I(3)")
|
|
vereq(repr(1 + I(2)), "I(3)")
|
|
vereq(repr(I(2) ** I(3)), "I(8)")
|
|
vereq(repr(2 ** I(3)), "I(8)")
|
|
vereq(repr(I(2) ** 3), "I(8)")
|
|
vereq(repr(pow(I(2), I(3), I(5))), "I(3)")
|
|
class S(str):
|
|
def __eq__(self, other):
|
|
return self.lower() == other.lower()
|
|
|
|
def subclasspropagation():
|
|
if verbose: print("Testing propagation of slot functions to subclasses...")
|
|
class A(object):
|
|
pass
|
|
class B(A):
|
|
pass
|
|
class C(A):
|
|
pass
|
|
class D(B, C):
|
|
pass
|
|
d = D()
|
|
orig_hash = hash(d) # related to id(d) in platform-dependent ways
|
|
A.__hash__ = lambda self: 42
|
|
vereq(hash(d), 42)
|
|
C.__hash__ = lambda self: 314
|
|
vereq(hash(d), 314)
|
|
B.__hash__ = lambda self: 144
|
|
vereq(hash(d), 144)
|
|
D.__hash__ = lambda self: 100
|
|
vereq(hash(d), 100)
|
|
del D.__hash__
|
|
vereq(hash(d), 144)
|
|
del B.__hash__
|
|
vereq(hash(d), 314)
|
|
del C.__hash__
|
|
vereq(hash(d), 42)
|
|
del A.__hash__
|
|
vereq(hash(d), orig_hash)
|
|
d.foo = 42
|
|
d.bar = 42
|
|
vereq(d.foo, 42)
|
|
vereq(d.bar, 42)
|
|
def __getattribute__(self, name):
|
|
if name == "foo":
|
|
return 24
|
|
return object.__getattribute__(self, name)
|
|
A.__getattribute__ = __getattribute__
|
|
vereq(d.foo, 24)
|
|
vereq(d.bar, 42)
|
|
def __getattr__(self, name):
|
|
if name in ("spam", "foo", "bar"):
|
|
return "hello"
|
|
raise AttributeError, name
|
|
B.__getattr__ = __getattr__
|
|
vereq(d.spam, "hello")
|
|
vereq(d.foo, 24)
|
|
vereq(d.bar, 42)
|
|
del A.__getattribute__
|
|
vereq(d.foo, 42)
|
|
del d.foo
|
|
vereq(d.foo, "hello")
|
|
vereq(d.bar, 42)
|
|
del B.__getattr__
|
|
try:
|
|
d.foo
|
|
except AttributeError:
|
|
pass
|
|
else:
|
|
raise TestFailed, "d.foo should be undefined now"
|
|
|
|
# Test a nasty bug in recurse_down_subclasses()
|
|
import gc
|
|
class A(object):
|
|
pass
|
|
class B(A):
|
|
pass
|
|
del B
|
|
gc.collect()
|
|
A.__setitem__ = lambda *a: None # crash
|
|
|
|
def buffer_inherit():
|
|
import binascii
|
|
# SF bug [#470040] ParseTuple t# vs subclasses.
|
|
if verbose:
|
|
print("Testing that buffer interface is inherited ...")
|
|
|
|
class MyStr(str):
|
|
pass
|
|
base = 'abc'
|
|
m = MyStr(base)
|
|
# b2a_hex uses the buffer interface to get its argument's value, via
|
|
# PyArg_ParseTuple 't#' code.
|
|
vereq(binascii.b2a_hex(m), binascii.b2a_hex(base))
|
|
|
|
# It's not clear that unicode will continue to support the character
|
|
# buffer interface, and this test will fail if that's taken away.
|
|
class MyUni(unicode):
|
|
pass
|
|
base = u'abc'
|
|
m = MyUni(base)
|
|
vereq(binascii.b2a_hex(m), binascii.b2a_hex(base))
|
|
|
|
class MyInt(int):
|
|
pass
|
|
m = MyInt(42)
|
|
try:
|
|
binascii.b2a_hex(m)
|
|
raise TestFailed('subclass of int should not have a buffer interface')
|
|
except TypeError:
|
|
pass
|
|
|
|
def str_of_str_subclass():
|
|
import binascii
|
|
import cStringIO
|
|
|
|
if verbose:
|
|
print("Testing __str__ defined in subclass of str ...")
|
|
|
|
class octetstring(str):
|
|
def __str__(self):
|
|
return binascii.b2a_hex(self)
|
|
def __repr__(self):
|
|
return self + " repr"
|
|
|
|
o = octetstring('A')
|
|
vereq(type(o), octetstring)
|
|
vereq(type(str(o)), str)
|
|
vereq(type(repr(o)), str)
|
|
vereq(ord(o), 0x41)
|
|
vereq(str(o), '41')
|
|
vereq(repr(o), 'A repr')
|
|
vereq(o.__str__(), '41')
|
|
vereq(o.__repr__(), 'A repr')
|
|
|
|
capture = cStringIO.StringIO()
|
|
# Calling str() or not exercises different internal paths.
|
|
print(o, file=capture)
|
|
print(str(o), file=capture)
|
|
vereq(capture.getvalue(), '41\n41\n')
|
|
capture.close()
|
|
|
|
def kwdargs():
|
|
if verbose: print("Testing keyword arguments to __init__, __call__...")
|
|
def f(a): return a
|
|
vereq(f.__call__(a=42), 42)
|
|
a = []
|
|
list.__init__(a, sequence=[0, 1, 2])
|
|
vereq(a, [0, 1, 2])
|
|
|
|
def recursive__call__():
|
|
if verbose: print(("Testing recursive __call__() by setting to instance of "
|
|
"class ..."))
|
|
class A(object):
|
|
pass
|
|
|
|
A.__call__ = A()
|
|
try:
|
|
A()()
|
|
except RuntimeError:
|
|
pass
|
|
else:
|
|
raise TestFailed("Recursion limit should have been reached for "
|
|
"__call__()")
|
|
|
|
def delhook():
|
|
if verbose: print("Testing __del__ hook...")
|
|
log = []
|
|
class C(object):
|
|
def __del__(self):
|
|
log.append(1)
|
|
c = C()
|
|
vereq(log, [])
|
|
del c
|
|
vereq(log, [1])
|
|
|
|
class D(object): pass
|
|
d = D()
|
|
try: del d[0]
|
|
except TypeError: pass
|
|
else: raise TestFailed, "invalid del() didn't raise TypeError"
|
|
|
|
def hashinherit():
|
|
if verbose: print("Testing hash of mutable subclasses...")
|
|
|
|
class mydict(dict):
|
|
pass
|
|
d = mydict()
|
|
try:
|
|
hash(d)
|
|
except TypeError:
|
|
pass
|
|
else:
|
|
raise TestFailed, "hash() of dict subclass should fail"
|
|
|
|
class mylist(list):
|
|
pass
|
|
d = mylist()
|
|
try:
|
|
hash(d)
|
|
except TypeError:
|
|
pass
|
|
else:
|
|
raise TestFailed, "hash() of list subclass should fail"
|
|
|
|
def strops():
|
|
try: 'a' + 5
|
|
except TypeError: pass
|
|
else: raise TestFailed, "'' + 5 doesn't raise TypeError"
|
|
|
|
try: ''.split('')
|
|
except ValueError: pass
|
|
else: raise TestFailed, "''.split('') doesn't raise ValueError"
|
|
|
|
try: ''.join([0])
|
|
except TypeError: pass
|
|
else: raise TestFailed, "''.join([0]) doesn't raise TypeError"
|
|
|
|
try: ''.rindex('5')
|
|
except ValueError: pass
|
|
else: raise TestFailed, "''.rindex('5') doesn't raise ValueError"
|
|
|
|
try: '%(n)s' % None
|
|
except TypeError: pass
|
|
else: raise TestFailed, "'%(n)s' % None doesn't raise TypeError"
|
|
|
|
try: '%(n' % {}
|
|
except ValueError: pass
|
|
else: raise TestFailed, "'%(n' % {} '' doesn't raise ValueError"
|
|
|
|
try: '%*s' % ('abc')
|
|
except TypeError: pass
|
|
else: raise TestFailed, "'%*s' % ('abc') doesn't raise TypeError"
|
|
|
|
try: '%*.*s' % ('abc', 5)
|
|
except TypeError: pass
|
|
else: raise TestFailed, "'%*.*s' % ('abc', 5) doesn't raise TypeError"
|
|
|
|
try: '%s' % (1, 2)
|
|
except TypeError: pass
|
|
else: raise TestFailed, "'%s' % (1, 2) doesn't raise TypeError"
|
|
|
|
try: '%' % None
|
|
except ValueError: pass
|
|
else: raise TestFailed, "'%' % None doesn't raise ValueError"
|
|
|
|
vereq('534253'.isdigit(), 1)
|
|
vereq('534253x'.isdigit(), 0)
|
|
vereq('%c' % 5, '\x05')
|
|
vereq('%c' % '5', '5')
|
|
|
|
def deepcopyrecursive():
|
|
if verbose: print("Testing deepcopy of recursive objects...")
|
|
class Node:
|
|
pass
|
|
a = Node()
|
|
b = Node()
|
|
a.b = b
|
|
b.a = a
|
|
z = deepcopy(a) # This blew up before
|
|
|
|
def modules():
|
|
if verbose: print("Testing uninitialized module objects...")
|
|
from types import ModuleType as M
|
|
m = M.__new__(M)
|
|
str(m)
|
|
vereq(hasattr(m, "__name__"), 0)
|
|
vereq(hasattr(m, "__file__"), 0)
|
|
vereq(hasattr(m, "foo"), 0)
|
|
vereq(m.__dict__, None)
|
|
m.foo = 1
|
|
vereq(m.__dict__, {"foo": 1})
|
|
|
|
def dictproxyiterkeys():
|
|
class C(object):
|
|
def meth(self):
|
|
pass
|
|
if verbose: print("Testing dict-proxy iterkeys...")
|
|
keys = [ key for key in C.__dict__.keys() ]
|
|
keys.sort()
|
|
vereq(keys, ['__dict__', '__doc__', '__module__', '__weakref__', 'meth'])
|
|
|
|
def dictproxyitervalues():
|
|
class C(object):
|
|
def meth(self):
|
|
pass
|
|
if verbose: print("Testing dict-proxy itervalues...")
|
|
values = [ values for values in C.__dict__.values() ]
|
|
vereq(len(values), 5)
|
|
|
|
def dictproxyiteritems():
|
|
class C(object):
|
|
def meth(self):
|
|
pass
|
|
if verbose: print("Testing dict-proxy iteritems...")
|
|
keys = [ key for (key, value) in C.__dict__.items() ]
|
|
keys.sort()
|
|
vereq(keys, ['__dict__', '__doc__', '__module__', '__weakref__', 'meth'])
|
|
|
|
def funnynew():
|
|
if verbose: print("Testing __new__ returning something unexpected...")
|
|
class C(object):
|
|
def __new__(cls, arg):
|
|
if isinstance(arg, str): return [1, 2, 3]
|
|
elif isinstance(arg, int): return object.__new__(D)
|
|
else: return object.__new__(cls)
|
|
class D(C):
|
|
def __init__(self, arg):
|
|
self.foo = arg
|
|
vereq(C("1"), [1, 2, 3])
|
|
vereq(D("1"), [1, 2, 3])
|
|
d = D(None)
|
|
veris(d.foo, None)
|
|
d = C(1)
|
|
vereq(isinstance(d, D), True)
|
|
vereq(d.foo, 1)
|
|
d = D(1)
|
|
vereq(isinstance(d, D), True)
|
|
vereq(d.foo, 1)
|
|
|
|
def imulbug():
|
|
# SF bug 544647
|
|
if verbose: print("Testing for __imul__ problems...")
|
|
class C(object):
|
|
def __imul__(self, other):
|
|
return (self, other)
|
|
x = C()
|
|
y = x
|
|
y *= 1.0
|
|
vereq(y, (x, 1.0))
|
|
y = x
|
|
y *= 2
|
|
vereq(y, (x, 2))
|
|
y = x
|
|
y *= 3
|
|
vereq(y, (x, 3))
|
|
y = x
|
|
y *= 1<<100
|
|
vereq(y, (x, 1<<100))
|
|
y = x
|
|
y *= None
|
|
vereq(y, (x, None))
|
|
y = x
|
|
y *= "foo"
|
|
vereq(y, (x, "foo"))
|
|
|
|
def docdescriptor():
|
|
# SF bug 542984
|
|
if verbose: print("Testing __doc__ descriptor...")
|
|
class DocDescr(object):
|
|
def __get__(self, object, otype):
|
|
if object:
|
|
object = object.__class__.__name__ + ' instance'
|
|
if otype:
|
|
otype = otype.__name__
|
|
return 'object=%s; type=%s' % (object, otype)
|
|
class OldClass:
|
|
__doc__ = DocDescr()
|
|
class NewClass(object):
|
|
__doc__ = DocDescr()
|
|
vereq(OldClass.__doc__, 'object=None; type=OldClass')
|
|
vereq(OldClass().__doc__, 'object=OldClass instance; type=OldClass')
|
|
vereq(NewClass.__doc__, 'object=None; type=NewClass')
|
|
vereq(NewClass().__doc__, 'object=NewClass instance; type=NewClass')
|
|
|
|
def copy_setstate():
|
|
if verbose:
|
|
print("Testing that copy.*copy() correctly uses __setstate__...")
|
|
import copy
|
|
class C(object):
|
|
def __init__(self, foo=None):
|
|
self.foo = foo
|
|
self.__foo = foo
|
|
def setfoo(self, foo=None):
|
|
self.foo = foo
|
|
def getfoo(self):
|
|
return self.__foo
|
|
def __getstate__(self):
|
|
return [self.foo]
|
|
def __setstate__(self, lst):
|
|
assert len(lst) == 1
|
|
self.__foo = self.foo = lst[0]
|
|
a = C(42)
|
|
a.setfoo(24)
|
|
vereq(a.foo, 24)
|
|
vereq(a.getfoo(), 42)
|
|
b = copy.copy(a)
|
|
vereq(b.foo, 24)
|
|
vereq(b.getfoo(), 24)
|
|
b = copy.deepcopy(a)
|
|
vereq(b.foo, 24)
|
|
vereq(b.getfoo(), 24)
|
|
|
|
def slices():
|
|
if verbose:
|
|
print("Testing cases with slices and overridden __getitem__ ...")
|
|
# Strings
|
|
vereq("hello"[:4], "hell")
|
|
vereq("hello"[slice(4)], "hell")
|
|
vereq(str.__getitem__("hello", slice(4)), "hell")
|
|
class S(str):
|
|
def __getitem__(self, x):
|
|
return str.__getitem__(self, x)
|
|
vereq(S("hello")[:4], "hell")
|
|
vereq(S("hello")[slice(4)], "hell")
|
|
vereq(S("hello").__getitem__(slice(4)), "hell")
|
|
# Tuples
|
|
vereq((1,2,3)[:2], (1,2))
|
|
vereq((1,2,3)[slice(2)], (1,2))
|
|
vereq(tuple.__getitem__((1,2,3), slice(2)), (1,2))
|
|
class T(tuple):
|
|
def __getitem__(self, x):
|
|
return tuple.__getitem__(self, x)
|
|
vereq(T((1,2,3))[:2], (1,2))
|
|
vereq(T((1,2,3))[slice(2)], (1,2))
|
|
vereq(T((1,2,3)).__getitem__(slice(2)), (1,2))
|
|
# Lists
|
|
vereq([1,2,3][:2], [1,2])
|
|
vereq([1,2,3][slice(2)], [1,2])
|
|
vereq(list.__getitem__([1,2,3], slice(2)), [1,2])
|
|
class L(list):
|
|
def __getitem__(self, x):
|
|
return list.__getitem__(self, x)
|
|
vereq(L([1,2,3])[:2], [1,2])
|
|
vereq(L([1,2,3])[slice(2)], [1,2])
|
|
vereq(L([1,2,3]).__getitem__(slice(2)), [1,2])
|
|
# Now do lists and __setitem__
|
|
a = L([1,2,3])
|
|
a[slice(1, 3)] = [3,2]
|
|
vereq(a, [1,3,2])
|
|
a[slice(0, 2, 1)] = [3,1]
|
|
vereq(a, [3,1,2])
|
|
a.__setitem__(slice(1, 3), [2,1])
|
|
vereq(a, [3,2,1])
|
|
a.__setitem__(slice(0, 2, 1), [2,3])
|
|
vereq(a, [2,3,1])
|
|
|
|
def subtype_resurrection():
|
|
if verbose:
|
|
print("Testing resurrection of new-style instance...")
|
|
|
|
class C(object):
|
|
container = []
|
|
|
|
def __del__(self):
|
|
# resurrect the instance
|
|
C.container.append(self)
|
|
|
|
c = C()
|
|
c.attr = 42
|
|
# The most interesting thing here is whether this blows up, due to flawed
|
|
# GC tracking logic in typeobject.c's call_finalizer() (a 2.2.1 bug).
|
|
del c
|
|
|
|
# If that didn't blow up, it's also interesting to see whether clearing
|
|
# the last container slot works: that will attempt to delete c again,
|
|
# which will cause c to get appended back to the container again "during"
|
|
# the del.
|
|
del C.container[-1]
|
|
vereq(len(C.container), 1)
|
|
vereq(C.container[-1].attr, 42)
|
|
|
|
# Make c mortal again, so that the test framework with -l doesn't report
|
|
# it as a leak.
|
|
del C.__del__
|
|
|
|
def slottrash():
|
|
# Deallocating deeply nested slotted trash caused stack overflows
|
|
if verbose:
|
|
print("Testing slot trash...")
|
|
class trash(object):
|
|
__slots__ = ['x']
|
|
def __init__(self, x):
|
|
self.x = x
|
|
o = None
|
|
for i in xrange(50000):
|
|
o = trash(o)
|
|
del o
|
|
|
|
def slotmultipleinheritance():
|
|
# SF bug 575229, multiple inheritance w/ slots dumps core
|
|
class A(object):
|
|
__slots__=()
|
|
class B(object):
|
|
pass
|
|
class C(A,B) :
|
|
__slots__=()
|
|
vereq(C.__basicsize__, B.__basicsize__)
|
|
verify(hasattr(C, '__dict__'))
|
|
verify(hasattr(C, '__weakref__'))
|
|
C().x = 2
|
|
|
|
def testrmul():
|
|
# SF patch 592646
|
|
if verbose:
|
|
print("Testing correct invocation of __rmul__...")
|
|
class C(object):
|
|
def __mul__(self, other):
|
|
return "mul"
|
|
def __rmul__(self, other):
|
|
return "rmul"
|
|
a = C()
|
|
vereq(a*2, "mul")
|
|
vereq(a*2.2, "mul")
|
|
vereq(2*a, "rmul")
|
|
vereq(2.2*a, "rmul")
|
|
|
|
def testipow():
|
|
# [SF bug 620179]
|
|
if verbose:
|
|
print("Testing correct invocation of __ipow__...")
|
|
class C(object):
|
|
def __ipow__(self, other):
|
|
pass
|
|
a = C()
|
|
a **= 2
|
|
|
|
def do_this_first():
|
|
if verbose:
|
|
print("Testing SF bug 551412 ...")
|
|
# This dumps core when SF bug 551412 isn't fixed --
|
|
# but only when test_descr.py is run separately.
|
|
# (That can't be helped -- as soon as PyType_Ready()
|
|
# is called for PyLong_Type, the bug is gone.)
|
|
class UserLong(object):
|
|
def __pow__(self, *args):
|
|
pass
|
|
try:
|
|
pow(0, UserLong(), 0)
|
|
except:
|
|
pass
|
|
|
|
if verbose:
|
|
print("Testing SF bug 570483...")
|
|
# Another segfault only when run early
|
|
# (before PyType_Ready(tuple) is called)
|
|
type.mro(tuple)
|
|
|
|
def test_mutable_bases():
|
|
if verbose:
|
|
print("Testing mutable bases...")
|
|
# stuff that should work:
|
|
class C(object):
|
|
pass
|
|
class C2(object):
|
|
def __getattribute__(self, attr):
|
|
if attr == 'a':
|
|
return 2
|
|
else:
|
|
return super(C2, self).__getattribute__(attr)
|
|
def meth(self):
|
|
return 1
|
|
class D(C):
|
|
pass
|
|
class E(D):
|
|
pass
|
|
d = D()
|
|
e = E()
|
|
D.__bases__ = (C,)
|
|
D.__bases__ = (C2,)
|
|
vereq(d.meth(), 1)
|
|
vereq(e.meth(), 1)
|
|
vereq(d.a, 2)
|
|
vereq(e.a, 2)
|
|
vereq(C2.__subclasses__(), [D])
|
|
|
|
# stuff that shouldn't:
|
|
class L(list):
|
|
pass
|
|
|
|
try:
|
|
L.__bases__ = (dict,)
|
|
except TypeError:
|
|
pass
|
|
else:
|
|
raise TestFailed, "shouldn't turn list subclass into dict subclass"
|
|
|
|
try:
|
|
list.__bases__ = (dict,)
|
|
except TypeError:
|
|
pass
|
|
else:
|
|
raise TestFailed, "shouldn't be able to assign to list.__bases__"
|
|
|
|
try:
|
|
D.__bases__ = (C2, list)
|
|
except TypeError:
|
|
pass
|
|
else:
|
|
assert 0, "best_base calculation found wanting"
|
|
|
|
try:
|
|
del D.__bases__
|
|
except TypeError:
|
|
pass
|
|
else:
|
|
raise TestFailed, "shouldn't be able to delete .__bases__"
|
|
|
|
try:
|
|
D.__bases__ = ()
|
|
except TypeError as msg:
|
|
if str(msg) == "a new-style class can't have only classic bases":
|
|
raise TestFailed, "wrong error message for .__bases__ = ()"
|
|
else:
|
|
raise TestFailed, "shouldn't be able to set .__bases__ to ()"
|
|
|
|
try:
|
|
D.__bases__ = (D,)
|
|
except TypeError:
|
|
pass
|
|
else:
|
|
# actually, we'll have crashed by here...
|
|
raise TestFailed, "shouldn't be able to create inheritance cycles"
|
|
|
|
try:
|
|
D.__bases__ = (C, C)
|
|
except TypeError:
|
|
pass
|
|
else:
|
|
raise TestFailed, "didn't detect repeated base classes"
|
|
|
|
try:
|
|
D.__bases__ = (E,)
|
|
except TypeError:
|
|
pass
|
|
else:
|
|
raise TestFailed, "shouldn't be able to create inheritance cycles"
|
|
|
|
def test_mutable_bases_with_failing_mro():
|
|
if verbose:
|
|
print("Testing mutable bases with failing mro...")
|
|
class WorkOnce(type):
|
|
def __new__(self, name, bases, ns):
|
|
self.flag = 0
|
|
return super(WorkOnce, self).__new__(WorkOnce, name, bases, ns)
|
|
def mro(self):
|
|
if self.flag > 0:
|
|
raise RuntimeError, "bozo"
|
|
else:
|
|
self.flag += 1
|
|
return type.mro(self)
|
|
|
|
class WorkAlways(type):
|
|
def mro(self):
|
|
# this is here to make sure that .mro()s aren't called
|
|
# with an exception set (which was possible at one point).
|
|
# An error message will be printed in a debug build.
|
|
# What's a good way to test for this?
|
|
return type.mro(self)
|
|
|
|
class C(object):
|
|
pass
|
|
|
|
class C2(object):
|
|
pass
|
|
|
|
class D(C):
|
|
pass
|
|
|
|
class E(D):
|
|
pass
|
|
|
|
class F(D, metaclass=WorkOnce):
|
|
pass
|
|
|
|
class G(D, metaclass=WorkAlways):
|
|
pass
|
|
|
|
# Immediate subclasses have their mro's adjusted in alphabetical
|
|
# order, so E's will get adjusted before adjusting F's fails. We
|
|
# check here that E's gets restored.
|
|
|
|
E_mro_before = E.__mro__
|
|
D_mro_before = D.__mro__
|
|
|
|
try:
|
|
D.__bases__ = (C2,)
|
|
except RuntimeError:
|
|
vereq(E.__mro__, E_mro_before)
|
|
vereq(D.__mro__, D_mro_before)
|
|
else:
|
|
raise TestFailed, "exception not propagated"
|
|
|
|
def test_mutable_bases_catch_mro_conflict():
|
|
if verbose:
|
|
print("Testing mutable bases catch mro conflict...")
|
|
class A(object):
|
|
pass
|
|
|
|
class B(object):
|
|
pass
|
|
|
|
class C(A, B):
|
|
pass
|
|
|
|
class D(A, B):
|
|
pass
|
|
|
|
class E(C, D):
|
|
pass
|
|
|
|
try:
|
|
C.__bases__ = (B, A)
|
|
except TypeError:
|
|
pass
|
|
else:
|
|
raise TestFailed, "didn't catch MRO conflict"
|
|
|
|
def mutable_names():
|
|
if verbose:
|
|
print("Testing mutable names...")
|
|
class C(object):
|
|
pass
|
|
|
|
# C.__module__ could be 'test_descr' or '__main__'
|
|
mod = C.__module__
|
|
|
|
C.__name__ = 'D'
|
|
vereq((C.__module__, C.__name__), (mod, 'D'))
|
|
|
|
C.__name__ = 'D.E'
|
|
vereq((C.__module__, C.__name__), (mod, 'D.E'))
|
|
|
|
def subclass_right_op():
|
|
if verbose:
|
|
print("Testing correct dispatch of subclass overloading __r<op>__...")
|
|
|
|
# This code tests various cases where right-dispatch of a subclass
|
|
# should be preferred over left-dispatch of a base class.
|
|
|
|
# Case 1: subclass of int; this tests code in abstract.c::binary_op1()
|
|
|
|
class B(int):
|
|
def __floordiv__(self, other):
|
|
return "B.__floordiv__"
|
|
def __rfloordiv__(self, other):
|
|
return "B.__rfloordiv__"
|
|
|
|
vereq(B(1) // 1, "B.__floordiv__")
|
|
vereq(1 // B(1), "B.__rfloordiv__")
|
|
|
|
# Case 2: subclass of object; this is just the baseline for case 3
|
|
|
|
class C(object):
|
|
def __floordiv__(self, other):
|
|
return "C.__floordiv__"
|
|
def __rfloordiv__(self, other):
|
|
return "C.__rfloordiv__"
|
|
|
|
vereq(C() // 1, "C.__floordiv__")
|
|
vereq(1 // C(), "C.__rfloordiv__")
|
|
|
|
# Case 3: subclass of new-style class; here it gets interesting
|
|
|
|
class D(C):
|
|
def __floordiv__(self, other):
|
|
return "D.__floordiv__"
|
|
def __rfloordiv__(self, other):
|
|
return "D.__rfloordiv__"
|
|
|
|
vereq(D() // C(), "D.__floordiv__")
|
|
vereq(C() // D(), "D.__rfloordiv__")
|
|
|
|
# Case 4: this didn't work right in 2.2.2 and 2.3a1
|
|
|
|
class E(C):
|
|
pass
|
|
|
|
vereq(E.__rfloordiv__, C.__rfloordiv__)
|
|
|
|
vereq(E() // 1, "C.__floordiv__")
|
|
vereq(1 // E(), "C.__rfloordiv__")
|
|
vereq(E() // C(), "C.__floordiv__")
|
|
vereq(C() // E(), "C.__floordiv__") # This one would fail
|
|
|
|
def dict_type_with_metaclass():
|
|
if verbose:
|
|
print("Testing type of __dict__ when metaclass set...")
|
|
|
|
class B(object):
|
|
pass
|
|
class M(type):
|
|
pass
|
|
class C(metaclass=M):
|
|
# In 2.3a1, C.__dict__ was a real dict rather than a dict proxy
|
|
pass
|
|
veris(type(C.__dict__), type(B.__dict__))
|
|
|
|
def meth_class_get():
|
|
# Full coverage of descrobject.c::classmethod_get()
|
|
if verbose:
|
|
print("Testing __get__ method of METH_CLASS C methods...")
|
|
# Baseline
|
|
arg = [1, 2, 3]
|
|
res = {1: None, 2: None, 3: None}
|
|
vereq(dict.fromkeys(arg), res)
|
|
vereq({}.fromkeys(arg), res)
|
|
# Now get the descriptor
|
|
descr = dict.__dict__["fromkeys"]
|
|
# More baseline using the descriptor directly
|
|
vereq(descr.__get__(None, dict)(arg), res)
|
|
vereq(descr.__get__({})(arg), res)
|
|
# Now check various error cases
|
|
try:
|
|
descr.__get__(None, None)
|
|
except TypeError:
|
|
pass
|
|
else:
|
|
raise TestFailed, "shouldn't have allowed descr.__get__(None, None)"
|
|
try:
|
|
descr.__get__(42)
|
|
except TypeError:
|
|
pass
|
|
else:
|
|
raise TestFailed, "shouldn't have allowed descr.__get__(42)"
|
|
try:
|
|
descr.__get__(None, 42)
|
|
except TypeError:
|
|
pass
|
|
else:
|
|
raise TestFailed, "shouldn't have allowed descr.__get__(None, 42)"
|
|
try:
|
|
descr.__get__(None, int)
|
|
except TypeError:
|
|
pass
|
|
else:
|
|
raise TestFailed, "shouldn't have allowed descr.__get__(None, int)"
|
|
|
|
def isinst_isclass():
|
|
if verbose:
|
|
print("Testing proxy isinstance() and isclass()...")
|
|
class Proxy(object):
|
|
def __init__(self, obj):
|
|
self.__obj = obj
|
|
def __getattribute__(self, name):
|
|
if name.startswith("_Proxy__"):
|
|
return object.__getattribute__(self, name)
|
|
else:
|
|
return getattr(self.__obj, name)
|
|
# Test with a classic class
|
|
class C:
|
|
pass
|
|
a = C()
|
|
pa = Proxy(a)
|
|
verify(isinstance(a, C)) # Baseline
|
|
verify(isinstance(pa, C)) # Test
|
|
# Test with a classic subclass
|
|
class D(C):
|
|
pass
|
|
a = D()
|
|
pa = Proxy(a)
|
|
verify(isinstance(a, C)) # Baseline
|
|
verify(isinstance(pa, C)) # Test
|
|
# Test with a new-style class
|
|
class C(object):
|
|
pass
|
|
a = C()
|
|
pa = Proxy(a)
|
|
verify(isinstance(a, C)) # Baseline
|
|
verify(isinstance(pa, C)) # Test
|
|
# Test with a new-style subclass
|
|
class D(C):
|
|
pass
|
|
a = D()
|
|
pa = Proxy(a)
|
|
verify(isinstance(a, C)) # Baseline
|
|
verify(isinstance(pa, C)) # Test
|
|
|
|
def proxysuper():
|
|
if verbose:
|
|
print("Testing super() for a proxy object...")
|
|
class Proxy(object):
|
|
def __init__(self, obj):
|
|
self.__obj = obj
|
|
def __getattribute__(self, name):
|
|
if name.startswith("_Proxy__"):
|
|
return object.__getattribute__(self, name)
|
|
else:
|
|
return getattr(self.__obj, name)
|
|
|
|
class B(object):
|
|
def f(self):
|
|
return "B.f"
|
|
|
|
class C(B):
|
|
def f(self):
|
|
return super(C, self).f() + "->C.f"
|
|
|
|
obj = C()
|
|
p = Proxy(obj)
|
|
vereq(C.__dict__["f"](p), "B.f->C.f")
|
|
|
|
def carloverre():
|
|
if verbose:
|
|
print("Testing prohibition of Carlo Verre's hack...")
|
|
try:
|
|
object.__setattr__(str, "foo", 42)
|
|
except TypeError:
|
|
pass
|
|
else:
|
|
raise TestFailed, "Carlo Verre __setattr__ suceeded!"
|
|
try:
|
|
object.__delattr__(str, "lower")
|
|
except TypeError:
|
|
pass
|
|
else:
|
|
raise TestFailed, "Carlo Verre __delattr__ succeeded!"
|
|
|
|
def weakref_segfault():
|
|
# SF 742911
|
|
if verbose:
|
|
print("Testing weakref segfault...")
|
|
|
|
import weakref
|
|
|
|
class Provoker:
|
|
def __init__(self, referrent):
|
|
self.ref = weakref.ref(referrent)
|
|
|
|
def __del__(self):
|
|
x = self.ref()
|
|
|
|
class Oops(object):
|
|
pass
|
|
|
|
o = Oops()
|
|
o.whatever = Provoker(o)
|
|
del o
|
|
|
|
def wrapper_segfault():
|
|
# SF 927248: deeply nested wrappers could cause stack overflow
|
|
f = lambda:None
|
|
for i in xrange(1000000):
|
|
f = f.__call__
|
|
f = None
|
|
|
|
# Fix SF #762455, segfault when sys.stdout is changed in getattr
|
|
def filefault():
|
|
if verbose:
|
|
print("Testing sys.stdout is changed in getattr...")
|
|
import sys
|
|
class StdoutGuard:
|
|
def __getattr__(self, attr):
|
|
sys.stdout = sys.__stdout__
|
|
raise RuntimeError("Premature access to sys.stdout.%s" % attr)
|
|
sys.stdout = StdoutGuard()
|
|
try:
|
|
print("Oops!")
|
|
except RuntimeError:
|
|
pass
|
|
|
|
def vicious_descriptor_nonsense():
|
|
# A potential segfault spotted by Thomas Wouters in mail to
|
|
# python-dev 2003-04-17, turned into an example & fixed by Michael
|
|
# Hudson just less than four months later...
|
|
if verbose:
|
|
print("Testing vicious_descriptor_nonsense...")
|
|
|
|
class Evil(object):
|
|
def __hash__(self):
|
|
return hash('attr')
|
|
def __eq__(self, other):
|
|
del C.attr
|
|
return 0
|
|
|
|
class Descr(object):
|
|
def __get__(self, ob, type=None):
|
|
return 1
|
|
|
|
class C(object):
|
|
attr = Descr()
|
|
|
|
c = C()
|
|
c.__dict__[Evil()] = 0
|
|
|
|
vereq(c.attr, 1)
|
|
# this makes a crash more likely:
|
|
import gc; gc.collect()
|
|
vereq(hasattr(c, 'attr'), False)
|
|
|
|
def test_init():
|
|
# SF 1155938
|
|
class Foo(object):
|
|
def __init__(self):
|
|
return 10
|
|
try:
|
|
Foo()
|
|
except TypeError:
|
|
pass
|
|
else:
|
|
raise TestFailed, "did not test __init__() for None return"
|
|
|
|
def methodwrapper():
|
|
# <type 'method-wrapper'> did not support any reflection before 2.5
|
|
if verbose:
|
|
print("Testing method-wrapper objects...")
|
|
|
|
return # XXX should methods really support __eq__?
|
|
|
|
l = []
|
|
vereq(l.__add__, l.__add__)
|
|
vereq(l.__add__, [].__add__)
|
|
verify(l.__add__ != [5].__add__)
|
|
verify(l.__add__ != l.__mul__)
|
|
verify(l.__add__.__name__ == '__add__')
|
|
verify(l.__add__.__self__ is l)
|
|
verify(l.__add__.__objclass__ is list)
|
|
vereq(l.__add__.__doc__, list.__add__.__doc__)
|
|
try:
|
|
hash(l.__add__)
|
|
except TypeError:
|
|
pass
|
|
else:
|
|
raise TestFailed("no TypeError from hash([].__add__)")
|
|
|
|
t = ()
|
|
t += (7,)
|
|
vereq(t.__add__, (7,).__add__)
|
|
vereq(hash(t.__add__), hash((7,).__add__))
|
|
|
|
def notimplemented():
|
|
# all binary methods should be able to return a NotImplemented
|
|
if verbose:
|
|
print("Testing NotImplemented...")
|
|
|
|
import sys
|
|
import types
|
|
import operator
|
|
|
|
def specialmethod(self, other):
|
|
return NotImplemented
|
|
|
|
def check(expr, x, y):
|
|
try:
|
|
exec(expr, {'x': x, 'y': y, 'operator': operator})
|
|
except TypeError:
|
|
pass
|
|
else:
|
|
raise TestFailed("no TypeError from %r" % (expr,))
|
|
|
|
N1 = sys.maxint + 1 # might trigger OverflowErrors instead of TypeErrors
|
|
N2 = sys.maxint # if sizeof(int) < sizeof(long), might trigger
|
|
# ValueErrors instead of TypeErrors
|
|
for metaclass in [type, types.ClassType]:
|
|
for name, expr, iexpr in [
|
|
('__add__', 'x + y', 'x += y'),
|
|
('__sub__', 'x - y', 'x -= y'),
|
|
('__mul__', 'x * y', 'x *= y'),
|
|
('__truediv__', 'x / y', None),
|
|
('__floordiv__', 'x // y', None),
|
|
('__mod__', 'x % y', 'x %= y'),
|
|
('__divmod__', 'divmod(x, y)', None),
|
|
('__pow__', 'x ** y', 'x **= y'),
|
|
('__lshift__', 'x << y', 'x <<= y'),
|
|
('__rshift__', 'x >> y', 'x >>= y'),
|
|
('__and__', 'x & y', 'x &= y'),
|
|
('__or__', 'x | y', 'x |= y'),
|
|
('__xor__', 'x ^ y', 'x ^= y'),
|
|
]:
|
|
rname = '__r' + name[2:]
|
|
A = metaclass('A', (), {name: specialmethod})
|
|
B = metaclass('B', (), {rname: specialmethod})
|
|
a = A()
|
|
b = B()
|
|
check(expr, a, a)
|
|
check(expr, a, b)
|
|
check(expr, b, a)
|
|
check(expr, b, b)
|
|
check(expr, a, N1)
|
|
check(expr, a, N2)
|
|
check(expr, N1, b)
|
|
check(expr, N2, b)
|
|
if iexpr:
|
|
check(iexpr, a, a)
|
|
check(iexpr, a, b)
|
|
check(iexpr, b, a)
|
|
check(iexpr, b, b)
|
|
check(iexpr, a, N1)
|
|
check(iexpr, a, N2)
|
|
iname = '__i' + name[2:]
|
|
C = metaclass('C', (), {iname: specialmethod})
|
|
c = C()
|
|
check(iexpr, c, a)
|
|
check(iexpr, c, b)
|
|
check(iexpr, c, N1)
|
|
check(iexpr, c, N2)
|
|
|
|
def test_assign_slice():
|
|
# ceval.c's assign_slice used to check for
|
|
# tp->tp_as_sequence->sq_slice instead of
|
|
# tp->tp_as_sequence->sq_ass_slice
|
|
|
|
class C(object):
|
|
def __setslice__(self, start, stop, value):
|
|
self.value = value
|
|
|
|
c = C()
|
|
c[1:2] = 3
|
|
vereq(c.value, 3)
|
|
|
|
def test_main():
|
|
weakref_segfault() # Must be first, somehow
|
|
wrapper_segfault()
|
|
do_this_first()
|
|
class_docstrings()
|
|
lists()
|
|
dicts()
|
|
dict_constructor()
|
|
test_dir()
|
|
ints()
|
|
longs()
|
|
floats()
|
|
complexes()
|
|
spamlists()
|
|
spamdicts()
|
|
pydicts()
|
|
pylists()
|
|
metaclass()
|
|
pymods()
|
|
multi()
|
|
mro_disagreement()
|
|
diamond()
|
|
ex5()
|
|
monotonicity()
|
|
consistency_with_epg()
|
|
objects()
|
|
slots()
|
|
slotspecials()
|
|
dynamics()
|
|
errors()
|
|
classmethods()
|
|
classmethods_in_c()
|
|
staticmethods()
|
|
staticmethods_in_c()
|
|
classic()
|
|
compattr()
|
|
newslot()
|
|
altmro()
|
|
overloading()
|
|
methods()
|
|
specials()
|
|
weakrefs()
|
|
properties()
|
|
supers()
|
|
inherits()
|
|
keywords()
|
|
restricted()
|
|
str_subclass_as_dict_key()
|
|
classic_comparisons()
|
|
rich_comparisons()
|
|
descrdoc()
|
|
setclass()
|
|
setdict()
|
|
pickles()
|
|
copies()
|
|
binopoverride()
|
|
subclasspropagation()
|
|
buffer_inherit()
|
|
str_of_str_subclass()
|
|
kwdargs()
|
|
recursive__call__()
|
|
delhook()
|
|
hashinherit()
|
|
strops()
|
|
deepcopyrecursive()
|
|
modules()
|
|
dictproxyiterkeys()
|
|
dictproxyitervalues()
|
|
dictproxyiteritems()
|
|
pickleslots()
|
|
funnynew()
|
|
imulbug()
|
|
docdescriptor()
|
|
copy_setstate()
|
|
slices()
|
|
subtype_resurrection()
|
|
slottrash()
|
|
slotmultipleinheritance()
|
|
testrmul()
|
|
testipow()
|
|
test_mutable_bases()
|
|
test_mutable_bases_with_failing_mro()
|
|
test_mutable_bases_catch_mro_conflict()
|
|
mutable_names()
|
|
subclass_right_op()
|
|
dict_type_with_metaclass()
|
|
meth_class_get()
|
|
isinst_isclass()
|
|
proxysuper()
|
|
carloverre()
|
|
filefault()
|
|
vicious_descriptor_nonsense()
|
|
test_init()
|
|
methodwrapper()
|
|
notimplemented()
|
|
test_assign_slice()
|
|
|
|
if verbose: print("All OK")
|
|
|
|
if __name__ == "__main__":
|
|
test_main()
|