mirror of
https://github.com/python/cpython.git
synced 2025-10-28 20:25:04 +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. ........
1765 lines
59 KiB
TeX
1765 lines
59 KiB
TeX
\chapter{Defining New Types
|
|
\label{defining-new-types}}
|
|
\sectionauthor{Michael Hudson}{mwh@python.net}
|
|
\sectionauthor{Dave Kuhlman}{dkuhlman@rexx.com}
|
|
\sectionauthor{Jim Fulton}{jim@zope.com}
|
|
|
|
As mentioned in the last chapter, Python allows the writer of an
|
|
extension module to define new types that can be manipulated from
|
|
Python code, much like strings and lists in core Python.
|
|
|
|
This is not hard; the code for all extension types follows a pattern,
|
|
but there are some details that you need to understand before you can
|
|
get started.
|
|
|
|
\begin{notice}
|
|
The way new types are defined changed dramatically (and for the
|
|
better) in Python 2.2. This document documents how to define new
|
|
types for Python 2.2 and later. If you need to support older
|
|
versions of Python, you will need to refer to
|
|
\ulink{older versions of this documentation}
|
|
{http://www.python.org/doc/versions/}.
|
|
\end{notice}
|
|
|
|
\section{The Basics
|
|
\label{dnt-basics}}
|
|
|
|
The Python runtime sees all Python objects as variables of type
|
|
\ctype{PyObject*}. A \ctype{PyObject} is not a very magnificent
|
|
object - it just contains the refcount and a pointer to the object's
|
|
``type object''. This is where the action is; the type object
|
|
determines which (C) functions get called when, for instance, an
|
|
attribute gets looked up on an object or it is multiplied by another
|
|
object. These C functions are called ``type methods'' to distinguish
|
|
them from things like \code{[].append} (which we call ``object
|
|
methods'').
|
|
|
|
So, if you want to define a new object type, you need to create a new
|
|
type object.
|
|
|
|
This sort of thing can only be explained by example, so here's a
|
|
minimal, but complete, module that defines a new type:
|
|
|
|
\verbatiminput{noddy.c}
|
|
|
|
Now that's quite a bit to take in at once, but hopefully bits will
|
|
seem familiar from the last chapter.
|
|
|
|
The first bit that will be new is:
|
|
|
|
\begin{verbatim}
|
|
typedef struct {
|
|
PyObject_HEAD
|
|
} noddy_NoddyObject;
|
|
\end{verbatim}
|
|
|
|
This is what a Noddy object will contain---in this case, nothing more
|
|
than every Python object contains, namely a refcount and a pointer to a type
|
|
object. These are the fields the \code{PyObject_HEAD} macro brings
|
|
in. The reason for the macro is to standardize the layout and to
|
|
enable special debugging fields in debug builds. Note that there is
|
|
no semicolon after the \code{PyObject_HEAD} macro; one is included in
|
|
the macro definition. Be wary of adding one by accident; it's easy to
|
|
do from habit, and your compiler might not complain, but someone
|
|
else's probably will! (On Windows, MSVC is known to call this an
|
|
error and refuse to compile the code.)
|
|
|
|
For contrast, let's take a look at the corresponding definition for
|
|
standard Python integers:
|
|
|
|
\begin{verbatim}
|
|
typedef struct {
|
|
PyObject_HEAD
|
|
long ob_ival;
|
|
} PyIntObject;
|
|
\end{verbatim}
|
|
|
|
Moving on, we come to the crunch --- the type object.
|
|
|
|
\begin{verbatim}
|
|
static PyTypeObject noddy_NoddyType = {
|
|
PyObject_HEAD_INIT(NULL)
|
|
0, /*ob_size*/
|
|
"noddy.Noddy", /*tp_name*/
|
|
sizeof(noddy_NoddyObject), /*tp_basicsize*/
|
|
0, /*tp_itemsize*/
|
|
0, /*tp_dealloc*/
|
|
0, /*tp_print*/
|
|
0, /*tp_getattr*/
|
|
0, /*tp_setattr*/
|
|
0, /*tp_compare*/
|
|
0, /*tp_repr*/
|
|
0, /*tp_as_number*/
|
|
0, /*tp_as_sequence*/
|
|
0, /*tp_as_mapping*/
|
|
0, /*tp_hash */
|
|
0, /*tp_call*/
|
|
0, /*tp_str*/
|
|
0, /*tp_getattro*/
|
|
0, /*tp_setattro*/
|
|
0, /*tp_as_buffer*/
|
|
Py_TPFLAGS_DEFAULT, /*tp_flags*/
|
|
"Noddy objects", /* tp_doc */
|
|
};
|
|
\end{verbatim}
|
|
|
|
Now if you go and look up the definition of \ctype{PyTypeObject} in
|
|
\file{object.h} you'll see that it has many more fields that the
|
|
definition above. The remaining fields will be filled with zeros by
|
|
the C compiler, and it's common practice to not specify them
|
|
explicitly unless you need them.
|
|
|
|
This is so important that we're going to pick the top of it apart still
|
|
further:
|
|
|
|
\begin{verbatim}
|
|
PyObject_HEAD_INIT(NULL)
|
|
\end{verbatim}
|
|
|
|
This line is a bit of a wart; what we'd like to write is:
|
|
|
|
\begin{verbatim}
|
|
PyObject_HEAD_INIT(&PyType_Type)
|
|
\end{verbatim}
|
|
|
|
as the type of a type object is ``type'', but this isn't strictly
|
|
conforming C and some compilers complain. Fortunately, this member
|
|
will be filled in for us by \cfunction{PyType_Ready()}.
|
|
|
|
\begin{verbatim}
|
|
0, /* ob_size */
|
|
\end{verbatim}
|
|
|
|
The \member{ob_size} field of the header is not used; its presence in
|
|
the type structure is a historical artifact that is maintained for
|
|
binary compatibility with extension modules compiled for older
|
|
versions of Python. Always set this field to zero.
|
|
|
|
\begin{verbatim}
|
|
"noddy.Noddy", /* tp_name */
|
|
\end{verbatim}
|
|
|
|
The name of our type. This will appear in the default textual
|
|
representation of our objects and in some error messages, for example:
|
|
|
|
\begin{verbatim}
|
|
>>> "" + noddy.new_noddy()
|
|
Traceback (most recent call last):
|
|
File "<stdin>", line 1, in ?
|
|
TypeError: cannot add type "noddy.Noddy" to string
|
|
\end{verbatim}
|
|
|
|
Note that the name is a dotted name that includes both the module name
|
|
and the name of the type within the module. The module in this case is
|
|
\module{noddy} and the type is \class{Noddy}, so we set the type name
|
|
to \class{noddy.Noddy}.
|
|
|
|
\begin{verbatim}
|
|
sizeof(noddy_NoddyObject), /* tp_basicsize */
|
|
\end{verbatim}
|
|
|
|
This is so that Python knows how much memory to allocate when you call
|
|
\cfunction{PyObject_New()}.
|
|
|
|
\note{If you want your type to be subclassable from Python, and your
|
|
type has the same \member{tp_basicsize} as its base type, you may
|
|
have problems with multiple inheritance. A Python subclass of your
|
|
type will have to list your type first in its \member{__bases__}, or
|
|
else it will not be able to call your type's \method{__new__} method
|
|
without getting an error. You can avoid this problem by ensuring
|
|
that your type has a larger value for \member{tp_basicsize} than
|
|
its base type does. Most of the time, this will be true anyway,
|
|
because either your base type will be \class{object}, or else you will
|
|
be adding data members to your base type, and therefore increasing its
|
|
size.}
|
|
|
|
\begin{verbatim}
|
|
0, /* tp_itemsize */
|
|
\end{verbatim}
|
|
|
|
This has to do with variable length objects like lists and strings.
|
|
Ignore this for now.
|
|
|
|
Skipping a number of type methods that we don't provide, we set the
|
|
class flags to \constant{Py_TPFLAGS_DEFAULT}.
|
|
|
|
\begin{verbatim}
|
|
Py_TPFLAGS_DEFAULT, /*tp_flags*/
|
|
\end{verbatim}
|
|
|
|
All types should include this constant in their flags. It enables all
|
|
of the members defined by the current version of Python.
|
|
|
|
We provide a doc string for the type in \member{tp_doc}.
|
|
|
|
\begin{verbatim}
|
|
"Noddy objects", /* tp_doc */
|
|
\end{verbatim}
|
|
|
|
Now we get into the type methods, the things that make your objects
|
|
different from the others. We aren't going to implement any of these
|
|
in this version of the module. We'll expand this example later to
|
|
have more interesting behavior.
|
|
|
|
For now, all we want to be able to do is to create new \class{Noddy}
|
|
objects. To enable object creation, we have to provide a
|
|
\member{tp_new} implementation. In this case, we can just use the
|
|
default implementation provided by the API function
|
|
\cfunction{PyType_GenericNew()}. We'd like to just assign this to the
|
|
\member{tp_new} slot, but we can't, for portability sake, On some
|
|
platforms or compilers, we can't statically initialize a structure
|
|
member with a function defined in another C module, so, instead, we'll
|
|
assign the \member{tp_new} slot in the module initialization function
|
|
just before calling \cfunction{PyType_Ready()}:
|
|
|
|
\begin{verbatim}
|
|
noddy_NoddyType.tp_new = PyType_GenericNew;
|
|
if (PyType_Ready(&noddy_NoddyType) < 0)
|
|
return;
|
|
\end{verbatim}
|
|
|
|
All the other type methods are \NULL, so we'll go over them later
|
|
--- that's for a later section!
|
|
|
|
Everything else in the file should be familiar, except for some code
|
|
in \cfunction{initnoddy()}:
|
|
|
|
\begin{verbatim}
|
|
if (PyType_Ready(&noddy_NoddyType) < 0)
|
|
return;
|
|
\end{verbatim}
|
|
|
|
This initializes the \class{Noddy} type, filing in a number of
|
|
members, including \member{ob_type} that we initially set to \NULL.
|
|
|
|
\begin{verbatim}
|
|
PyModule_AddObject(m, "Noddy", (PyObject *)&noddy_NoddyType);
|
|
\end{verbatim}
|
|
|
|
This adds the type to the module dictionary. This allows us to create
|
|
\class{Noddy} instances by calling the \class{Noddy} class:
|
|
|
|
\begin{verbatim}
|
|
>>> import noddy
|
|
>>> mynoddy = noddy.Noddy()
|
|
\end{verbatim}
|
|
|
|
That's it! All that remains is to build it; put the above code in a
|
|
file called \file{noddy.c} and
|
|
|
|
\begin{verbatim}
|
|
from distutils.core import setup, Extension
|
|
setup(name="noddy", version="1.0",
|
|
ext_modules=[Extension("noddy", ["noddy.c"])])
|
|
\end{verbatim}
|
|
|
|
in a file called \file{setup.py}; then typing
|
|
|
|
\begin{verbatim}
|
|
$ python setup.py build
|
|
\end{verbatim} %$ <-- bow to font-lock ;-(
|
|
|
|
at a shell should produce a file \file{noddy.so} in a subdirectory;
|
|
move to that directory and fire up Python --- you should be able to
|
|
\code{import noddy} and play around with Noddy objects.
|
|
|
|
That wasn't so hard, was it?
|
|
|
|
Of course, the current Noddy type is pretty uninteresting. It has no
|
|
data and doesn't do anything. It can't even be subclassed.
|
|
|
|
\subsection{Adding data and methods to the Basic example}
|
|
|
|
Let's expend the basic example to add some data and methods. Let's
|
|
also make the type usable as a base class. We'll create
|
|
a new module, \module{noddy2} that adds these capabilities:
|
|
|
|
\verbatiminput{noddy2.c}
|
|
|
|
This version of the module has a number of changes.
|
|
|
|
We've added an extra include:
|
|
|
|
\begin{verbatim}
|
|
#include "structmember.h"
|
|
\end{verbatim}
|
|
|
|
This include provides declarations that we use to handle attributes,
|
|
as described a bit later.
|
|
|
|
The name of the \class{Noddy} object structure has been shortened to
|
|
\class{Noddy}. The type object name has been shortened to
|
|
\class{NoddyType}.
|
|
|
|
The \class{Noddy} type now has three data attributes, \var{first},
|
|
\var{last}, and \var{number}. The \var{first} and \var{last}
|
|
variables are Python strings containing first and last names. The
|
|
\var{number} attribute is an integer.
|
|
|
|
The object structure is updated accordingly:
|
|
|
|
\begin{verbatim}
|
|
typedef struct {
|
|
PyObject_HEAD
|
|
PyObject *first;
|
|
PyObject *last;
|
|
int number;
|
|
} Noddy;
|
|
\end{verbatim}
|
|
|
|
Because we now have data to manage, we have to be more careful about
|
|
object allocation and deallocation. At a minimum, we need a
|
|
deallocation method:
|
|
|
|
\begin{verbatim}
|
|
static void
|
|
Noddy_dealloc(Noddy* self)
|
|
{
|
|
Py_XDECREF(self->first);
|
|
Py_XDECREF(self->last);
|
|
self->ob_type->tp_free((PyObject*)self);
|
|
}
|
|
\end{verbatim}
|
|
|
|
which is assigned to the \member{tp_dealloc} member:
|
|
|
|
\begin{verbatim}
|
|
(destructor)Noddy_dealloc, /*tp_dealloc*/
|
|
\end{verbatim}
|
|
|
|
This method decrements the reference counts of the two Python
|
|
attributes. We use \cfunction{Py_XDECREF()} here because the
|
|
\member{first} and \member{last} members could be \NULL. It then
|
|
calls the \member{tp_free} member of the object's type to free the
|
|
object's memory. Note that the object's type might not be
|
|
\class{NoddyType}, because the object may be an instance of a
|
|
subclass.
|
|
|
|
We want to make sure that the first and last names are initialized to
|
|
empty strings, so we provide a new method:
|
|
|
|
\begin{verbatim}
|
|
static PyObject *
|
|
Noddy_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
|
|
{
|
|
Noddy *self;
|
|
|
|
self = (Noddy *)type->tp_alloc(type, 0);
|
|
if (self != NULL) {
|
|
self->first = PyString_FromString("");
|
|
if (self->first == NULL)
|
|
{
|
|
Py_DECREF(self);
|
|
return NULL;
|
|
}
|
|
|
|
self->last = PyString_FromString("");
|
|
if (self->last == NULL)
|
|
{
|
|
Py_DECREF(self);
|
|
return NULL;
|
|
}
|
|
|
|
self->number = 0;
|
|
}
|
|
|
|
return (PyObject *)self;
|
|
}
|
|
\end{verbatim}
|
|
|
|
and install it in the \member{tp_new} member:
|
|
|
|
\begin{verbatim}
|
|
Noddy_new, /* tp_new */
|
|
\end{verbatim}
|
|
|
|
The new member is responsible for creating (as opposed to
|
|
initializing) objects of the type. It is exposed in Python as the
|
|
\method{__new__()} method. See the paper titled ``Unifying types and
|
|
classes in Python'' for a detailed discussion of the \method{__new__()}
|
|
method. One reason to implement a new method is to assure the initial
|
|
values of instance variables. In this case, we use the new method to
|
|
make sure that the initial values of the members \member{first} and
|
|
\member{last} are not \NULL. If we didn't care whether the initial
|
|
values were \NULL, we could have used \cfunction{PyType_GenericNew()} as
|
|
our new method, as we did before. \cfunction{PyType_GenericNew()}
|
|
initializes all of the instance variable members to \NULL.
|
|
|
|
The new method is a static method that is passed the type being
|
|
instantiated and any arguments passed when the type was called,
|
|
and that returns the new object created. New methods always accept
|
|
positional and keyword arguments, but they often ignore the arguments,
|
|
leaving the argument handling to initializer methods. Note that if the
|
|
type supports subclassing, the type passed may not be the type being
|
|
defined. The new method calls the tp_alloc slot to allocate memory.
|
|
We don't fill the \member{tp_alloc} slot ourselves. Rather
|
|
\cfunction{PyType_Ready()} fills it for us by inheriting it from our
|
|
base class, which is \class{object} by default. Most types use the
|
|
default allocation.
|
|
|
|
\note{If you are creating a co-operative \member{tp_new} (one that
|
|
calls a base type's \member{tp_new} or \method{__new__}), you
|
|
must \emph{not} try to determine what method to call using
|
|
method resolution order at runtime. Always statically determine
|
|
what type you are going to call, and call its \member{tp_new}
|
|
directly, or via \code{type->tp_base->tp_new}. If you do
|
|
not do this, Python subclasses of your type that also inherit
|
|
from other Python-defined classes may not work correctly.
|
|
(Specifically, you may not be able to create instances of
|
|
such subclasses without getting a \exception{TypeError}.)}
|
|
|
|
We provide an initialization function:
|
|
|
|
\begin{verbatim}
|
|
static int
|
|
Noddy_init(Noddy *self, PyObject *args, PyObject *kwds)
|
|
{
|
|
PyObject *first=NULL, *last=NULL, *tmp;
|
|
|
|
static char *kwlist[] = {"first", "last", "number", NULL};
|
|
|
|
if (! PyArg_ParseTupleAndKeywords(args, kwds, "|OOi", kwlist,
|
|
&first, &last,
|
|
&self->number))
|
|
return -1;
|
|
|
|
if (first) {
|
|
tmp = self->first;
|
|
Py_INCREF(first);
|
|
self->first = first;
|
|
Py_XDECREF(tmp);
|
|
}
|
|
|
|
if (last) {
|
|
tmp = self->last;
|
|
Py_INCREF(last);
|
|
self->last = last;
|
|
Py_XDECREF(tmp);
|
|
}
|
|
|
|
return 0;
|
|
}
|
|
\end{verbatim}
|
|
|
|
by filling the \member{tp_init} slot.
|
|
|
|
\begin{verbatim}
|
|
(initproc)Noddy_init, /* tp_init */
|
|
\end{verbatim}
|
|
|
|
The \member{tp_init} slot is exposed in Python as the
|
|
\method{__init__()} method. It is used to initialize an object after
|
|
it's created. Unlike the new method, we can't guarantee that the
|
|
initializer is called. The initializer isn't called when unpickling
|
|
objects and it can be overridden. Our initializer accepts arguments
|
|
to provide initial values for our instance. Initializers always accept
|
|
positional and keyword arguments.
|
|
|
|
Initializers can be called multiple times. Anyone can call the
|
|
\method{__init__()} method on our objects. For this reason, we have
|
|
to be extra careful when assigning the new values. We might be
|
|
tempted, for example to assign the \member{first} member like this:
|
|
|
|
\begin{verbatim}
|
|
if (first) {
|
|
Py_XDECREF(self->first);
|
|
Py_INCREF(first);
|
|
self->first = first;
|
|
}
|
|
\end{verbatim}
|
|
|
|
But this would be risky. Our type doesn't restrict the type of the
|
|
\member{first} member, so it could be any kind of object. It could
|
|
have a destructor that causes code to be executed that tries to
|
|
access the \member{first} member. To be paranoid and protect
|
|
ourselves against this possibility, we almost always reassign members
|
|
before decrementing their reference counts. When don't we have to do
|
|
this?
|
|
\begin{itemize}
|
|
\item when we absolutely know that the reference count is greater than
|
|
1
|
|
\item when we know that deallocation of the object\footnote{This is
|
|
true when we know that the object is a basic type, like a string or
|
|
a float.} will not cause any
|
|
calls back into our type's code
|
|
\item when decrementing a reference count in a \member{tp_dealloc}
|
|
handler when garbage-collections is not supported\footnote{We relied
|
|
on this in the \member{tp_dealloc} handler in this example, because
|
|
our type doesn't support garbage collection. Even if a type supports
|
|
garbage collection, there are calls that can be made to ``untrack''
|
|
the object from garbage collection, however, these calls are
|
|
advanced and not covered here.}
|
|
\end{itemize}
|
|
|
|
|
|
We want to want to expose our instance variables as attributes. There
|
|
are a number of ways to do that. The simplest way is to define member
|
|
definitions:
|
|
|
|
\begin{verbatim}
|
|
static PyMemberDef Noddy_members[] = {
|
|
{"first", T_OBJECT_EX, offsetof(Noddy, first), 0,
|
|
"first name"},
|
|
{"last", T_OBJECT_EX, offsetof(Noddy, last), 0,
|
|
"last name"},
|
|
{"number", T_INT, offsetof(Noddy, number), 0,
|
|
"noddy number"},
|
|
{NULL} /* Sentinel */
|
|
};
|
|
\end{verbatim}
|
|
|
|
and put the definitions in the \member{tp_members} slot:
|
|
|
|
\begin{verbatim}
|
|
Noddy_members, /* tp_members */
|
|
\end{verbatim}
|
|
|
|
Each member definition has a member name, type, offset, access flags
|
|
and documentation string. See the ``Generic Attribute Management''
|
|
section below for details.
|
|
|
|
A disadvantage of this approach is that it doesn't provide a way to
|
|
restrict the types of objects that can be assigned to the Python
|
|
attributes. We expect the first and last names to be strings, but any
|
|
Python objects can be assigned. Further, the attributes can be
|
|
deleted, setting the C pointers to \NULL. Even though we can make
|
|
sure the members are initialized to non-\NULL{} values, the members can
|
|
be set to \NULL{} if the attributes are deleted.
|
|
|
|
We define a single method, \method{name}, that outputs the objects
|
|
name as the concatenation of the first and last names.
|
|
|
|
\begin{verbatim}
|
|
static PyObject *
|
|
Noddy_name(Noddy* self)
|
|
{
|
|
static PyObject *format = NULL;
|
|
PyObject *args, *result;
|
|
|
|
if (format == NULL) {
|
|
format = PyString_FromString("%s %s");
|
|
if (format == NULL)
|
|
return NULL;
|
|
}
|
|
|
|
if (self->first == NULL) {
|
|
PyErr_SetString(PyExc_AttributeError, "first");
|
|
return NULL;
|
|
}
|
|
|
|
if (self->last == NULL) {
|
|
PyErr_SetString(PyExc_AttributeError, "last");
|
|
return NULL;
|
|
}
|
|
|
|
args = Py_BuildValue("OO", self->first, self->last);
|
|
if (args == NULL)
|
|
return NULL;
|
|
|
|
result = PyString_Format(format, args);
|
|
Py_DECREF(args);
|
|
|
|
return result;
|
|
}
|
|
\end{verbatim}
|
|
|
|
The method is implemented as a C function that takes a \class{Noddy} (or
|
|
\class{Noddy} subclass) instance as the first argument. Methods
|
|
always take an instance as the first argument. Methods often take
|
|
positional and keyword arguments as well, but in this cased we don't
|
|
take any and don't need to accept a positional argument tuple or
|
|
keyword argument dictionary. This method is equivalent to the Python
|
|
method:
|
|
|
|
\begin{verbatim}
|
|
def name(self):
|
|
return "%s %s" % (self.first, self.last)
|
|
\end{verbatim}
|
|
|
|
Note that we have to check for the possibility that our \member{first}
|
|
and \member{last} members are \NULL. This is because they can be
|
|
deleted, in which case they are set to \NULL. It would be better to
|
|
prevent deletion of these attributes and to restrict the attribute
|
|
values to be strings. We'll see how to do that in the next section.
|
|
|
|
Now that we've defined the method, we need to create an array of
|
|
method definitions:
|
|
|
|
\begin{verbatim}
|
|
static PyMethodDef Noddy_methods[] = {
|
|
{"name", (PyCFunction)Noddy_name, METH_NOARGS,
|
|
"Return the name, combining the first and last name"
|
|
},
|
|
{NULL} /* Sentinel */
|
|
};
|
|
\end{verbatim}
|
|
|
|
and assign them to the \member{tp_methods} slot:
|
|
|
|
\begin{verbatim}
|
|
Noddy_methods, /* tp_methods */
|
|
\end{verbatim}
|
|
|
|
Note that we used the \constant{METH_NOARGS} flag to indicate that the
|
|
method is passed no arguments.
|
|
|
|
Finally, we'll make our type usable as a base class. We've written
|
|
our methods carefully so far so that they don't make any assumptions
|
|
about the type of the object being created or used, so all we need to
|
|
do is to add the \constant{Py_TPFLAGS_BASETYPE} to our class flag
|
|
definition:
|
|
|
|
\begin{verbatim}
|
|
Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, /*tp_flags*/
|
|
\end{verbatim}
|
|
|
|
We rename \cfunction{initnoddy()} to \cfunction{initnoddy2()}
|
|
and update the module name passed to \cfunction{Py_InitModule3()}.
|
|
|
|
Finally, we update our \file{setup.py} file to build the new module:
|
|
|
|
\begin{verbatim}
|
|
from distutils.core import setup, Extension
|
|
setup(name="noddy", version="1.0",
|
|
ext_modules=[
|
|
Extension("noddy", ["noddy.c"]),
|
|
Extension("noddy2", ["noddy2.c"]),
|
|
])
|
|
\end{verbatim}
|
|
|
|
\subsection{Providing finer control over data attributes}
|
|
|
|
In this section, we'll provide finer control over how the
|
|
\member{first} and \member{last} attributes are set in the
|
|
\class{Noddy} example. In the previous version of our module, the
|
|
instance variables \member{first} and \member{last} could be set to
|
|
non-string values or even deleted. We want to make sure that these
|
|
attributes always contain strings.
|
|
|
|
\verbatiminput{noddy3.c}
|
|
|
|
To provide greater control, over the \member{first} and \member{last}
|
|
attributes, we'll use custom getter and setter functions. Here are
|
|
the functions for getting and setting the \member{first} attribute:
|
|
|
|
\begin{verbatim}
|
|
Noddy_getfirst(Noddy *self, void *closure)
|
|
{
|
|
Py_INCREF(self->first);
|
|
return self->first;
|
|
}
|
|
|
|
static int
|
|
Noddy_setfirst(Noddy *self, PyObject *value, void *closure)
|
|
{
|
|
if (value == NULL) {
|
|
PyErr_SetString(PyExc_TypeError, "Cannot delete the first attribute");
|
|
return -1;
|
|
}
|
|
|
|
if (! PyString_Check(value)) {
|
|
PyErr_SetString(PyExc_TypeError,
|
|
"The first attribute value must be a string");
|
|
return -1;
|
|
}
|
|
|
|
Py_DECREF(self->first);
|
|
Py_INCREF(value);
|
|
self->first = value;
|
|
|
|
return 0;
|
|
}
|
|
\end{verbatim}
|
|
|
|
The getter function is passed a \class{Noddy} object and a
|
|
``closure'', which is void pointer. In this case, the closure is
|
|
ignored. (The closure supports an advanced usage in which definition
|
|
data is passed to the getter and setter. This could, for example, be
|
|
used to allow a single set of getter and setter functions that decide
|
|
the attribute to get or set based on data in the closure.)
|
|
|
|
The setter function is passed the \class{Noddy} object, the new value,
|
|
and the closure. The new value may be \NULL, in which case the
|
|
attribute is being deleted. In our setter, we raise an error if the
|
|
attribute is deleted or if the attribute value is not a string.
|
|
|
|
We create an array of \ctype{PyGetSetDef} structures:
|
|
|
|
\begin{verbatim}
|
|
static PyGetSetDef Noddy_getseters[] = {
|
|
{"first",
|
|
(getter)Noddy_getfirst, (setter)Noddy_setfirst,
|
|
"first name",
|
|
NULL},
|
|
{"last",
|
|
(getter)Noddy_getlast, (setter)Noddy_setlast,
|
|
"last name",
|
|
NULL},
|
|
{NULL} /* Sentinel */
|
|
};
|
|
\end{verbatim}
|
|
|
|
and register it in the \member{tp_getset} slot:
|
|
|
|
\begin{verbatim}
|
|
Noddy_getseters, /* tp_getset */
|
|
\end{verbatim}
|
|
|
|
to register out attribute getters and setters.
|
|
|
|
The last item in a \ctype{PyGetSetDef} structure is the closure
|
|
mentioned above. In this case, we aren't using the closure, so we just
|
|
pass \NULL.
|
|
|
|
We also remove the member definitions for these attributes:
|
|
|
|
\begin{verbatim}
|
|
static PyMemberDef Noddy_members[] = {
|
|
{"number", T_INT, offsetof(Noddy, number), 0,
|
|
"noddy number"},
|
|
{NULL} /* Sentinel */
|
|
};
|
|
\end{verbatim}
|
|
|
|
We also need to update the \member{tp_init} handler to only allow
|
|
strings\footnote{We now know that the first and last members are strings,
|
|
so perhaps we could be less careful about decrementing their
|
|
reference counts, however, we accept instances of string subclasses.
|
|
Even though deallocating normal strings won't call back into our
|
|
objects, we can't guarantee that deallocating an instance of a string
|
|
subclass won't. call back into out objects.} to be passed:
|
|
|
|
\begin{verbatim}
|
|
static int
|
|
Noddy_init(Noddy *self, PyObject *args, PyObject *kwds)
|
|
{
|
|
PyObject *first=NULL, *last=NULL, *tmp;
|
|
|
|
static char *kwlist[] = {"first", "last", "number", NULL};
|
|
|
|
if (! PyArg_ParseTupleAndKeywords(args, kwds, "|SSi", kwlist,
|
|
&first, &last,
|
|
&self->number))
|
|
return -1;
|
|
|
|
if (first) {
|
|
tmp = self->first;
|
|
Py_INCREF(first);
|
|
self->first = first;
|
|
Py_DECREF(tmp);
|
|
}
|
|
|
|
if (last) {
|
|
tmp = self->last;
|
|
Py_INCREF(last);
|
|
self->last = last;
|
|
Py_DECREF(tmp);
|
|
}
|
|
|
|
return 0;
|
|
}
|
|
\end{verbatim}
|
|
|
|
With these changes, we can assure that the \member{first} and
|
|
\member{last} members are never \NULL{} so we can remove checks for \NULL{}
|
|
values in almost all cases. This means that most of the
|
|
\cfunction{Py_XDECREF()} calls can be converted to \cfunction{Py_DECREF()}
|
|
calls. The only place we can't change these calls is in the
|
|
deallocator, where there is the possibility that the initialization of
|
|
these members failed in the constructor.
|
|
|
|
We also rename the module initialization function and module name in
|
|
the initialization function, as we did before, and we add an extra
|
|
definition to the \file{setup.py} file.
|
|
|
|
\subsection{Supporting cyclic garbage collection}
|
|
|
|
Python has a cyclic-garbage collector that can identify unneeded
|
|
objects even when their reference counts are not zero. This can happen
|
|
when objects are involved in cycles. For example, consider:
|
|
|
|
\begin{verbatim}
|
|
>>> l = []
|
|
>>> l.append(l)
|
|
>>> del l
|
|
\end{verbatim}
|
|
|
|
In this example, we create a list that contains itself. When we delete
|
|
it, it still has a reference from itself. Its reference count doesn't
|
|
drop to zero. Fortunately, Python's cyclic-garbage collector will
|
|
eventually figure out that the list is garbage and free it.
|
|
|
|
In the second version of the \class{Noddy} example, we allowed any
|
|
kind of object to be stored in the \member{first} or \member{last}
|
|
attributes.\footnote{Even in the third version, we aren't guaranteed to
|
|
avoid cycles. Instances of string subclasses are allowed and string
|
|
subclasses could allow cycles even if normal strings don't.} This
|
|
means that \class{Noddy} objects can participate in cycles:
|
|
|
|
\begin{verbatim}
|
|
>>> import noddy2
|
|
>>> n = noddy2.Noddy()
|
|
>>> l = [n]
|
|
>>> n.first = l
|
|
\end{verbatim}
|
|
|
|
This is pretty silly, but it gives us an excuse to add support for the
|
|
cyclic-garbage collector to the \class{Noddy} example. To support
|
|
cyclic garbage collection, types need to fill two slots and set a
|
|
class flag that enables these slots:
|
|
|
|
\verbatiminput{noddy4.c}
|
|
|
|
The traversal method provides access to subobjects that
|
|
could participate in cycles:
|
|
|
|
\begin{verbatim}
|
|
static int
|
|
Noddy_traverse(Noddy *self, visitproc visit, void *arg)
|
|
{
|
|
int vret;
|
|
|
|
if (self->first) {
|
|
vret = visit(self->first, arg);
|
|
if (vret != 0)
|
|
return vret;
|
|
}
|
|
if (self->last) {
|
|
vret = visit(self->last, arg);
|
|
if (vret != 0)
|
|
return vret;
|
|
}
|
|
|
|
return 0;
|
|
}
|
|
\end{verbatim}
|
|
|
|
For each subobject that can participate in cycles, we need to call the
|
|
\cfunction{visit()} function, which is passed to the traversal method.
|
|
The \cfunction{visit()} function takes as arguments the subobject and
|
|
the extra argument \var{arg} passed to the traversal method. It
|
|
returns an integer value that must be returned if it is non-zero.
|
|
|
|
|
|
Python 2.4 and higher provide a \cfunction{Py_VISIT()} macro that automates
|
|
calling visit functions. With \cfunction{Py_VISIT()},
|
|
\cfunction{Noddy_traverse()} can be simplified:
|
|
|
|
|
|
\begin{verbatim}
|
|
static int
|
|
Noddy_traverse(Noddy *self, visitproc visit, void *arg)
|
|
{
|
|
Py_VISIT(self->first);
|
|
Py_VISIT(self->last);
|
|
return 0;
|
|
}
|
|
\end{verbatim}
|
|
|
|
\note{Note that the \member{tp_traverse} implementation must name its
|
|
arguments exactly \var{visit} and \var{arg} in order to use
|
|
\cfunction{Py_VISIT()}. This is to encourage uniformity
|
|
across these boring implementations.}
|
|
|
|
We also need to provide a method for clearing any subobjects that can
|
|
participate in cycles. We implement the method and reimplement the
|
|
deallocator to use it:
|
|
|
|
\begin{verbatim}
|
|
static int
|
|
Noddy_clear(Noddy *self)
|
|
{
|
|
PyObject *tmp;
|
|
|
|
tmp = self->first;
|
|
self->first = NULL;
|
|
Py_XDECREF(tmp);
|
|
|
|
tmp = self->last;
|
|
self->last = NULL;
|
|
Py_XDECREF(tmp);
|
|
|
|
return 0;
|
|
}
|
|
|
|
static void
|
|
Noddy_dealloc(Noddy* self)
|
|
{
|
|
Noddy_clear(self);
|
|
self->ob_type->tp_free((PyObject*)self);
|
|
}
|
|
\end{verbatim}
|
|
|
|
Notice the use of a temporary variable in \cfunction{Noddy_clear()}.
|
|
We use the temporary variable so that we can set each member to \NULL{}
|
|
before decrementing its reference count. We do this because, as was
|
|
discussed earlier, if the reference count drops to zero, we might
|
|
cause code to run that calls back into the object. In addition,
|
|
because we now support garbage collection, we also have to worry about
|
|
code being run that triggers garbage collection. If garbage
|
|
collection is run, our \member{tp_traverse} handler could get called.
|
|
We can't take a chance of having \cfunction{Noddy_traverse()} called
|
|
when a member's reference count has dropped to zero and its value
|
|
hasn't been set to \NULL.
|
|
|
|
Python 2.4 and higher provide a \cfunction{Py_CLEAR()} that automates
|
|
the careful decrementing of reference counts. With
|
|
\cfunction{Py_CLEAR()}, the \cfunction{Noddy_clear()} function can be
|
|
simplified:
|
|
|
|
\begin{verbatim}
|
|
static int
|
|
Noddy_clear(Noddy *self)
|
|
{
|
|
Py_CLEAR(self->first);
|
|
Py_CLEAR(self->last);
|
|
return 0;
|
|
}
|
|
\end{verbatim}
|
|
|
|
Finally, we add the \constant{Py_TPFLAGS_HAVE_GC} flag to the class
|
|
flags:
|
|
|
|
\begin{verbatim}
|
|
Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE | Py_TPFLAGS_HAVE_GC, /*tp_flags*/
|
|
\end{verbatim}
|
|
|
|
That's pretty much it. If we had written custom \member{tp_alloc} or
|
|
\member{tp_free} slots, we'd need to modify them for cyclic-garbage
|
|
collection. Most extensions will use the versions automatically
|
|
provided.
|
|
|
|
\subsection{Subclassing other types}
|
|
|
|
It is possible to create new extension types that are derived from existing
|
|
types. It is easiest to inherit from the built in types, since an extension
|
|
can easily use the \class{PyTypeObject} it needs. It can be difficult to
|
|
share these \class{PyTypeObject} structures between extension modules.
|
|
|
|
In this example we will create a \class{Shoddy} type that inherits from
|
|
the builtin \class{list} type. The new type will be completely compatible
|
|
with regular lists, but will have an additional \method{increment()} method
|
|
that increases an internal counter.
|
|
|
|
\begin{verbatim}
|
|
>>> import shoddy
|
|
>>> s = shoddy.Shoddy(range(3))
|
|
>>> s.extend(s)
|
|
>>> print len(s)
|
|
6
|
|
>>> print s.increment()
|
|
1
|
|
>>> print s.increment()
|
|
2
|
|
\end{verbatim}
|
|
|
|
\verbatiminput{shoddy.c}
|
|
|
|
As you can see, the source code closely resembles the \class{Noddy} examples in previous
|
|
sections. We will break down the main differences between them.
|
|
|
|
\begin{verbatim}
|
|
typedef struct {
|
|
PyListObject list;
|
|
int state;
|
|
} Shoddy;
|
|
\end{verbatim}
|
|
|
|
The primary difference for derived type objects is that the base type's
|
|
object structure must be the first value. The base type will already
|
|
include the \cfunction{PyObject_HEAD} at the beginning of its structure.
|
|
|
|
When a Python object is a \class{Shoddy} instance, its \var{PyObject*} pointer
|
|
can be safely cast to both \var{PyListObject*} and \var{Shoddy*}.
|
|
|
|
\begin{verbatim}
|
|
static int
|
|
Shoddy_init(Shoddy *self, PyObject *args, PyObject *kwds)
|
|
{
|
|
if (PyList_Type.tp_init((PyObject *)self, args, kwds) < 0)
|
|
return -1;
|
|
self->state = 0;
|
|
return 0;
|
|
}
|
|
\end{verbatim}
|
|
|
|
In the \member{__init__} method for our type, we can see how to call through
|
|
to the \member{__init__} method of the base type.
|
|
|
|
This pattern is important when writing a type with custom \member{new} and
|
|
\member{dealloc} methods. The \member{new} method should not actually create the
|
|
memory for the object with \member{tp_alloc}, that will be handled by
|
|
the base class when calling its \member{tp_new}.
|
|
|
|
When filling out the \cfunction{PyTypeObject} for the \class{Shoddy} type,
|
|
you see a slot for \cfunction{tp_base}. Due to cross platform compiler
|
|
issues, you can't fill that field directly with the \cfunction{PyList_Type};
|
|
it can be done later in the module's \cfunction{init} function.
|
|
|
|
\begin{verbatim}
|
|
PyMODINIT_FUNC
|
|
initshoddy(void)
|
|
{
|
|
PyObject *m;
|
|
|
|
ShoddyType.tp_base = &PyList_Type;
|
|
if (PyType_Ready(&ShoddyType) < 0)
|
|
return;
|
|
|
|
m = Py_InitModule3("shoddy", NULL, "Shoddy module");
|
|
if (m == NULL)
|
|
return;
|
|
|
|
Py_INCREF(&ShoddyType);
|
|
PyModule_AddObject(m, "Shoddy", (PyObject *) &ShoddyType);
|
|
}
|
|
\end{verbatim}
|
|
|
|
Before calling \cfunction{PyType_Ready}, the type structure must have the
|
|
\member{tp_base} slot filled in. When we are deriving a new type, it is
|
|
not necessary to fill out the \member{tp_alloc} slot with
|
|
\cfunction{PyType_GenericNew} -- the allocate function from the base type
|
|
will be inherited.
|
|
|
|
After that, calling \cfunction{PyType_Ready} and adding the type object
|
|
to the module is the same as with the basic \class{Noddy} examples.
|
|
|
|
|
|
\section{Type Methods
|
|
\label{dnt-type-methods}}
|
|
|
|
This section aims to give a quick fly-by on the various type methods
|
|
you can implement and what they do.
|
|
|
|
Here is the definition of \ctype{PyTypeObject}, with some fields only
|
|
used in debug builds omitted:
|
|
|
|
\verbatiminput{typestruct.h}
|
|
|
|
Now that's a \emph{lot} of methods. Don't worry too much though - if
|
|
you have a type you want to define, the chances are very good that you
|
|
will only implement a handful of these.
|
|
|
|
As you probably expect by now, we're going to go over this and give
|
|
more information about the various handlers. We won't go in the order
|
|
they are defined in the structure, because there is a lot of
|
|
historical baggage that impacts the ordering of the fields; be sure
|
|
your type initialization keeps the fields in the right order! It's
|
|
often easiest to find an example that includes all the fields you need
|
|
(even if they're initialized to \code{0}) and then change the values
|
|
to suit your new type.
|
|
|
|
\begin{verbatim}
|
|
char *tp_name; /* For printing */
|
|
\end{verbatim}
|
|
|
|
The name of the type - as mentioned in the last section, this will
|
|
appear in various places, almost entirely for diagnostic purposes.
|
|
Try to choose something that will be helpful in such a situation!
|
|
|
|
\begin{verbatim}
|
|
int tp_basicsize, tp_itemsize; /* For allocation */
|
|
\end{verbatim}
|
|
|
|
These fields tell the runtime how much memory to allocate when new
|
|
objects of this type are created. Python has some built-in support
|
|
for variable length structures (think: strings, lists) which is where
|
|
the \member{tp_itemsize} field comes in. This will be dealt with
|
|
later.
|
|
|
|
\begin{verbatim}
|
|
char *tp_doc;
|
|
\end{verbatim}
|
|
|
|
Here you can put a string (or its address) that you want returned when
|
|
the Python script references \code{obj.__doc__} to retrieve the
|
|
doc string.
|
|
|
|
Now we come to the basic type methods---the ones most extension types
|
|
will implement.
|
|
|
|
|
|
\subsection{Finalization and De-allocation}
|
|
|
|
\index{object!deallocation}
|
|
\index{deallocation, object}
|
|
\index{object!finalization}
|
|
\index{finalization, of objects}
|
|
|
|
\begin{verbatim}
|
|
destructor tp_dealloc;
|
|
\end{verbatim}
|
|
|
|
This function is called when the reference count of the instance of
|
|
your type is reduced to zero and the Python interpreter wants to
|
|
reclaim it. If your type has memory to free or other clean-up to
|
|
perform, put it here. The object itself needs to be freed here as
|
|
well. Here is an example of this function:
|
|
|
|
\begin{verbatim}
|
|
static void
|
|
newdatatype_dealloc(newdatatypeobject * obj)
|
|
{
|
|
free(obj->obj_UnderlyingDatatypePtr);
|
|
obj->ob_type->tp_free(obj);
|
|
}
|
|
\end{verbatim}
|
|
|
|
One important requirement of the deallocator function is that it
|
|
leaves any pending exceptions alone. This is important since
|
|
deallocators are frequently called as the interpreter unwinds the
|
|
Python stack; when the stack is unwound due to an exception (rather
|
|
than normal returns), nothing is done to protect the deallocators from
|
|
seeing that an exception has already been set. Any actions which a
|
|
deallocator performs which may cause additional Python code to be
|
|
executed may detect that an exception has been set. This can lead to
|
|
misleading errors from the interpreter. The proper way to protect
|
|
against this is to save a pending exception before performing the
|
|
unsafe action, and restoring it when done. This can be done using the
|
|
\cfunction{PyErr_Fetch()}\ttindex{PyErr_Fetch()} and
|
|
\cfunction{PyErr_Restore()}\ttindex{PyErr_Restore()} functions:
|
|
|
|
\begin{verbatim}
|
|
static void
|
|
my_dealloc(PyObject *obj)
|
|
{
|
|
MyObject *self = (MyObject *) obj;
|
|
PyObject *cbresult;
|
|
|
|
if (self->my_callback != NULL) {
|
|
PyObject *err_type, *err_value, *err_traceback;
|
|
int have_error = PyErr_Occurred() ? 1 : 0;
|
|
|
|
if (have_error)
|
|
PyErr_Fetch(&err_type, &err_value, &err_traceback);
|
|
|
|
cbresult = PyObject_CallObject(self->my_callback, NULL);
|
|
if (cbresult == NULL)
|
|
PyErr_WriteUnraisable(self->my_callback);
|
|
else
|
|
Py_DECREF(cbresult);
|
|
|
|
if (have_error)
|
|
PyErr_Restore(err_type, err_value, err_traceback);
|
|
|
|
Py_DECREF(self->my_callback);
|
|
}
|
|
obj->ob_type->tp_free((PyObject*)self);
|
|
}
|
|
\end{verbatim}
|
|
|
|
|
|
\subsection{Object Presentation}
|
|
|
|
In Python, there are three ways to generate a textual representation
|
|
of an object: the \function{repr()}\bifuncindex{repr} function (or
|
|
equivalent back-tick syntax), the \function{str()}\bifuncindex{str}
|
|
function, and the \keyword{print} statement. For most objects, the
|
|
\keyword{print} statement is equivalent to the \function{str()}
|
|
function, but it is possible to special-case printing to a
|
|
\ctype{FILE*} if necessary; this should only be done if efficiency is
|
|
identified as a problem and profiling suggests that creating a
|
|
temporary string object to be written to a file is too expensive.
|
|
|
|
These handlers are all optional, and most types at most need to
|
|
implement the \member{tp_str} and \member{tp_repr} handlers.
|
|
|
|
\begin{verbatim}
|
|
reprfunc tp_repr;
|
|
reprfunc tp_str;
|
|
printfunc tp_print;
|
|
\end{verbatim}
|
|
|
|
The \member{tp_repr} handler should return a string object containing
|
|
a representation of the instance for which it is called. Here is a
|
|
simple example:
|
|
|
|
\begin{verbatim}
|
|
static PyObject *
|
|
newdatatype_repr(newdatatypeobject * obj)
|
|
{
|
|
return PyString_FromFormat("Repr-ified_newdatatype{{size:\%d}}",
|
|
obj->obj_UnderlyingDatatypePtr->size);
|
|
}
|
|
\end{verbatim}
|
|
|
|
If no \member{tp_repr} handler is specified, the interpreter will
|
|
supply a representation that uses the type's \member{tp_name} and a
|
|
uniquely-identifying value for the object.
|
|
|
|
The \member{tp_str} handler is to \function{str()} what the
|
|
\member{tp_repr} handler described above is to \function{repr()}; that
|
|
is, it is called when Python code calls \function{str()} on an
|
|
instance of your object. Its implementation is very similar to the
|
|
\member{tp_repr} function, but the resulting string is intended for
|
|
human consumption. If \member{tp_str} is not specified, the
|
|
\member{tp_repr} handler is used instead.
|
|
|
|
Here is a simple example:
|
|
|
|
\begin{verbatim}
|
|
static PyObject *
|
|
newdatatype_str(newdatatypeobject * obj)
|
|
{
|
|
return PyString_FromFormat("Stringified_newdatatype{{size:\%d}}",
|
|
obj->obj_UnderlyingDatatypePtr->size);
|
|
}
|
|
\end{verbatim}
|
|
|
|
The print function will be called whenever Python needs to "print" an
|
|
instance of the type. For example, if 'node' is an instance of type
|
|
TreeNode, then the print function is called when Python code calls:
|
|
|
|
\begin{verbatim}
|
|
print node
|
|
\end{verbatim}
|
|
|
|
There is a flags argument and one flag, \constant{Py_PRINT_RAW}, and
|
|
it suggests that you print without string quotes and possibly without
|
|
interpreting escape sequences.
|
|
|
|
The print function receives a file object as an argument. You will
|
|
likely want to write to that file object.
|
|
|
|
Here is a sample print function:
|
|
|
|
\begin{verbatim}
|
|
static int
|
|
newdatatype_print(newdatatypeobject *obj, FILE *fp, int flags)
|
|
{
|
|
if (flags & Py_PRINT_RAW) {
|
|
fprintf(fp, "<{newdatatype object--size: %d}>",
|
|
obj->obj_UnderlyingDatatypePtr->size);
|
|
}
|
|
else {
|
|
fprintf(fp, "\"<{newdatatype object--size: %d}>\"",
|
|
obj->obj_UnderlyingDatatypePtr->size);
|
|
}
|
|
return 0;
|
|
}
|
|
\end{verbatim}
|
|
|
|
|
|
\subsection{Attribute Management}
|
|
|
|
For every object which can support attributes, the corresponding type
|
|
must provide the functions that control how the attributes are
|
|
resolved. There needs to be a function which can retrieve attributes
|
|
(if any are defined), and another to set attributes (if setting
|
|
attributes is allowed). Removing an attribute is a special case, for
|
|
which the new value passed to the handler is \NULL.
|
|
|
|
Python supports two pairs of attribute handlers; a type that supports
|
|
attributes only needs to implement the functions for one pair. The
|
|
difference is that one pair takes the name of the attribute as a
|
|
\ctype{char*}, while the other accepts a \ctype{PyObject*}. Each type
|
|
can use whichever pair makes more sense for the implementation's
|
|
convenience.
|
|
|
|
\begin{verbatim}
|
|
getattrfunc tp_getattr; /* char * version */
|
|
setattrfunc tp_setattr;
|
|
/* ... */
|
|
getattrofunc tp_getattrofunc; /* PyObject * version */
|
|
setattrofunc tp_setattrofunc;
|
|
\end{verbatim}
|
|
|
|
If accessing attributes of an object is always a simple operation
|
|
(this will be explained shortly), there are generic implementations
|
|
which can be used to provide the \ctype{PyObject*} version of the
|
|
attribute management functions. The actual need for type-specific
|
|
attribute handlers almost completely disappeared starting with Python
|
|
2.2, though there are many examples which have not been updated to use
|
|
some of the new generic mechanism that is available.
|
|
|
|
|
|
\subsubsection{Generic Attribute Management}
|
|
|
|
\versionadded{2.2}
|
|
|
|
Most extension types only use \emph{simple} attributes. So, what
|
|
makes the attributes simple? There are only a couple of conditions
|
|
that must be met:
|
|
|
|
\begin{enumerate}
|
|
\item The name of the attributes must be known when
|
|
\cfunction{PyType_Ready()} is called.
|
|
|
|
\item No special processing is needed to record that an attribute
|
|
was looked up or set, nor do actions need to be taken based
|
|
on the value.
|
|
\end{enumerate}
|
|
|
|
Note that this list does not place any restrictions on the values of
|
|
the attributes, when the values are computed, or how relevant data is
|
|
stored.
|
|
|
|
When \cfunction{PyType_Ready()} is called, it uses three tables
|
|
referenced by the type object to create \emph{descriptors} which are
|
|
placed in the dictionary of the type object. Each descriptor controls
|
|
access to one attribute of the instance object. Each of the tables is
|
|
optional; if all three are \NULL, instances of the type will only have
|
|
attributes that are inherited from their base type, and should leave
|
|
the \member{tp_getattro} and \member{tp_setattro} fields \NULL{} as
|
|
well, allowing the base type to handle attributes.
|
|
|
|
The tables are declared as three fields of the type object:
|
|
|
|
\begin{verbatim}
|
|
struct PyMethodDef *tp_methods;
|
|
struct PyMemberDef *tp_members;
|
|
struct PyGetSetDef *tp_getset;
|
|
\end{verbatim}
|
|
|
|
If \member{tp_methods} is not \NULL, it must refer to an array of
|
|
\ctype{PyMethodDef} structures. Each entry in the table is an
|
|
instance of this structure:
|
|
|
|
\begin{verbatim}
|
|
typedef struct PyMethodDef {
|
|
char *ml_name; /* method name */
|
|
PyCFunction ml_meth; /* implementation function */
|
|
int ml_flags; /* flags */
|
|
char *ml_doc; /* docstring */
|
|
} PyMethodDef;
|
|
\end{verbatim}
|
|
|
|
One entry should be defined for each method provided by the type; no
|
|
entries are needed for methods inherited from a base type. One
|
|
additional entry is needed at the end; it is a sentinel that marks the
|
|
end of the array. The \member{ml_name} field of the sentinel must be
|
|
\NULL.
|
|
|
|
XXX Need to refer to some unified discussion of the structure fields,
|
|
shared with the next section.
|
|
|
|
The second table is used to define attributes which map directly to
|
|
data stored in the instance. A variety of primitive C types are
|
|
supported, and access may be read-only or read-write. The structures
|
|
in the table are defined as:
|
|
|
|
\begin{verbatim}
|
|
typedef struct PyMemberDef {
|
|
char *name;
|
|
int type;
|
|
int offset;
|
|
int flags;
|
|
char *doc;
|
|
} PyMemberDef;
|
|
\end{verbatim}
|
|
|
|
For each entry in the table, a descriptor will be constructed and
|
|
added to the type which will be able to extract a value from the
|
|
instance structure. The \member{type} field should contain one of the
|
|
type codes defined in the \file{structmember.h} header; the value will
|
|
be used to determine how to convert Python values to and from C
|
|
values. The \member{flags} field is used to store flags which control
|
|
how the attribute can be accessed.
|
|
|
|
XXX Need to move some of this to a shared section!
|
|
|
|
The following flag constants are defined in \file{structmember.h};
|
|
they may be combined using bitwise-OR.
|
|
|
|
\begin{tableii}{l|l}{constant}{Constant}{Meaning}
|
|
\lineii{READONLY \ttindex{READONLY}}
|
|
{Never writable.}
|
|
\lineii{RO \ttindex{RO}}
|
|
{Shorthand for \constant{READONLY}.}
|
|
\lineii{READ_RESTRICTED \ttindex{READ_RESTRICTED}}
|
|
{Not readable in restricted mode.}
|
|
\lineii{WRITE_RESTRICTED \ttindex{WRITE_RESTRICTED}}
|
|
{Not writable in restricted mode.}
|
|
\lineii{RESTRICTED \ttindex{RESTRICTED}}
|
|
{Not readable or writable in restricted mode.}
|
|
\end{tableii}
|
|
|
|
An interesting advantage of using the \member{tp_members} table to
|
|
build descriptors that are used at runtime is that any attribute
|
|
defined this way can have an associated doc string simply by providing
|
|
the text in the table. An application can use the introspection API
|
|
to retrieve the descriptor from the class object, and get the
|
|
doc string using its \member{__doc__} attribute.
|
|
|
|
As with the \member{tp_methods} table, a sentinel entry with a
|
|
\member{name} value of \NULL{} is required.
|
|
|
|
|
|
% XXX Descriptors need to be explained in more detail somewhere, but
|
|
% not here.
|
|
%
|
|
% Descriptor objects have two handler functions which correspond to
|
|
% the \member{tp_getattro} and \member{tp_setattro} handlers. The
|
|
% \method{__get__()} handler is a function which is passed the
|
|
% descriptor, instance, and type objects, and returns the value of the
|
|
% attribute, or it returns \NULL{} and sets an exception. The
|
|
% \method{__set__()} handler is passed the descriptor, instance, type,
|
|
% and new value;
|
|
|
|
|
|
\subsubsection{Type-specific Attribute Management}
|
|
|
|
For simplicity, only the \ctype{char*} version will be demonstrated
|
|
here; the type of the name parameter is the only difference between
|
|
the \ctype{char*} and \ctype{PyObject*} flavors of the interface.
|
|
This example effectively does the same thing as the generic example
|
|
above, but does not use the generic support added in Python 2.2. The
|
|
value in showing this is two-fold: it demonstrates how basic attribute
|
|
management can be done in a way that is portable to older versions of
|
|
Python, and explains how the handler functions are called, so that if
|
|
you do need to extend their functionality, you'll understand what
|
|
needs to be done.
|
|
|
|
The \member{tp_getattr} handler is called when the object requires an
|
|
attribute look-up. It is called in the same situations where the
|
|
\method{__getattr__()} method of a class would be called.
|
|
|
|
A likely way to handle this is (1) to implement a set of functions
|
|
(such as \cfunction{newdatatype_getSize()} and
|
|
\cfunction{newdatatype_setSize()} in the example below), (2) provide a
|
|
method table listing these functions, and (3) provide a getattr
|
|
function that returns the result of a lookup in that table. The
|
|
method table uses the same structure as the \member{tp_methods} field
|
|
of the type object.
|
|
|
|
Here is an example:
|
|
|
|
\begin{verbatim}
|
|
static PyMethodDef newdatatype_methods[] = {
|
|
{"getSize", (PyCFunction)newdatatype_getSize, METH_VARARGS,
|
|
"Return the current size."},
|
|
{"setSize", (PyCFunction)newdatatype_setSize, METH_VARARGS,
|
|
"Set the size."},
|
|
{NULL, NULL, 0, NULL} /* sentinel */
|
|
};
|
|
|
|
static PyObject *
|
|
newdatatype_getattr(newdatatypeobject *obj, char *name)
|
|
{
|
|
return Py_FindMethod(newdatatype_methods, (PyObject *)obj, name);
|
|
}
|
|
\end{verbatim}
|
|
|
|
The \member{tp_setattr} handler is called when the
|
|
\method{__setattr__()} or \method{__delattr__()} method of a class
|
|
instance would be called. When an attribute should be deleted, the
|
|
third parameter will be \NULL. Here is an example that simply raises
|
|
an exception; if this were really all you wanted, the
|
|
\member{tp_setattr} handler should be set to \NULL.
|
|
|
|
\begin{verbatim}
|
|
static int
|
|
newdatatype_setattr(newdatatypeobject *obj, char *name, PyObject *v)
|
|
{
|
|
(void)PyErr_Format(PyExc_RuntimeError, "Read-only attribute: \%s", name);
|
|
return -1;
|
|
}
|
|
\end{verbatim}
|
|
|
|
|
|
\subsection{Object Comparison}
|
|
|
|
\begin{verbatim}
|
|
cmpfunc tp_compare;
|
|
\end{verbatim}
|
|
|
|
The \member{tp_compare} handler is called when comparisons are needed
|
|
and the object does not implement the specific rich comparison method
|
|
which matches the requested comparison. (It is always used if defined
|
|
and the \cfunction{PyObject_Compare()} or \cfunction{PyObject_Cmp()}
|
|
functions are used, or if \function{cmp()} is used from Python.)
|
|
It is analogous to the \method{__cmp__()} method. This function
|
|
should return \code{-1} if \var{obj1} is less than
|
|
\var{obj2}, \code{0} if they are equal, and \code{1} if
|
|
\var{obj1} is greater than
|
|
\var{obj2}.
|
|
(It was previously allowed to return arbitrary negative or positive
|
|
integers for less than and greater than, respectively; as of Python
|
|
2.2, this is no longer allowed. In the future, other return values
|
|
may be assigned a different meaning.)
|
|
|
|
A \member{tp_compare} handler may raise an exception. In this case it
|
|
should return a negative value. The caller has to test for the
|
|
exception using \cfunction{PyErr_Occurred()}.
|
|
|
|
|
|
Here is a sample implementation:
|
|
|
|
\begin{verbatim}
|
|
static int
|
|
newdatatype_compare(newdatatypeobject * obj1, newdatatypeobject * obj2)
|
|
{
|
|
long result;
|
|
|
|
if (obj1->obj_UnderlyingDatatypePtr->size <
|
|
obj2->obj_UnderlyingDatatypePtr->size) {
|
|
result = -1;
|
|
}
|
|
else if (obj1->obj_UnderlyingDatatypePtr->size >
|
|
obj2->obj_UnderlyingDatatypePtr->size) {
|
|
result = 1;
|
|
}
|
|
else {
|
|
result = 0;
|
|
}
|
|
return result;
|
|
}
|
|
\end{verbatim}
|
|
|
|
|
|
\subsection{Abstract Protocol Support}
|
|
|
|
Python supports a variety of \emph{abstract} `protocols;' the specific
|
|
interfaces provided to use these interfaces are documented in the
|
|
\citetitle[../api/api.html]{Python/C API Reference Manual} in the
|
|
chapter ``\ulink{Abstract Objects Layer}{../api/abstract.html}.''
|
|
|
|
A number of these abstract interfaces were defined early in the
|
|
development of the Python implementation. In particular, the number,
|
|
mapping, and sequence protocols have been part of Python since the
|
|
beginning. Other protocols have been added over time. For protocols
|
|
which depend on several handler routines from the type implementation,
|
|
the older protocols have been defined as optional blocks of handlers
|
|
referenced by the type object. For newer protocols there are
|
|
additional slots in the main type object, with a flag bit being set to
|
|
indicate that the slots are present and should be checked by the
|
|
interpreter. (The flag bit does not indicate that the slot values are
|
|
non-\NULL. The flag may be set to indicate the presence of a slot,
|
|
but a slot may still be unfilled.)
|
|
|
|
\begin{verbatim}
|
|
PyNumberMethods tp_as_number;
|
|
PySequenceMethods tp_as_sequence;
|
|
PyMappingMethods tp_as_mapping;
|
|
\end{verbatim}
|
|
|
|
If you wish your object to be able to act like a number, a sequence,
|
|
or a mapping object, then you place the address of a structure that
|
|
implements the C type \ctype{PyNumberMethods},
|
|
\ctype{PySequenceMethods}, or \ctype{PyMappingMethods}, respectively.
|
|
It is up to you to fill in this structure with appropriate values. You
|
|
can find examples of the use of each of these in the \file{Objects}
|
|
directory of the Python source distribution.
|
|
|
|
|
|
\begin{verbatim}
|
|
hashfunc tp_hash;
|
|
\end{verbatim}
|
|
|
|
This function, if you choose to provide it, should return a hash
|
|
number for an instance of your data type. Here is a moderately
|
|
pointless example:
|
|
|
|
\begin{verbatim}
|
|
static long
|
|
newdatatype_hash(newdatatypeobject *obj)
|
|
{
|
|
long result;
|
|
result = obj->obj_UnderlyingDatatypePtr->size;
|
|
result = result * 3;
|
|
return result;
|
|
}
|
|
\end{verbatim}
|
|
|
|
\begin{verbatim}
|
|
ternaryfunc tp_call;
|
|
\end{verbatim}
|
|
|
|
This function is called when an instance of your data type is "called",
|
|
for example, if \code{obj1} is an instance of your data type and the Python
|
|
script contains \code{obj1('hello')}, the \member{tp_call} handler is
|
|
invoked.
|
|
|
|
This function takes three arguments:
|
|
|
|
\begin{enumerate}
|
|
\item
|
|
\var{arg1} is the instance of the data type which is the subject of
|
|
the call. If the call is \code{obj1('hello')}, then \var{arg1} is
|
|
\code{obj1}.
|
|
|
|
\item
|
|
\var{arg2} is a tuple containing the arguments to the call. You
|
|
can use \cfunction{PyArg_ParseTuple()} to extract the arguments.
|
|
|
|
\item
|
|
\var{arg3} is a dictionary of keyword arguments that were passed.
|
|
If this is non-\NULL{} and you support keyword arguments, use
|
|
\cfunction{PyArg_ParseTupleAndKeywords()} to extract the
|
|
arguments. If you do not want to support keyword arguments and
|
|
this is non-\NULL, raise a \exception{TypeError} with a message
|
|
saying that keyword arguments are not supported.
|
|
\end{enumerate}
|
|
|
|
Here is a desultory example of the implementation of the call function.
|
|
|
|
\begin{verbatim}
|
|
/* Implement the call function.
|
|
* obj1 is the instance receiving the call.
|
|
* obj2 is a tuple containing the arguments to the call, in this
|
|
* case 3 strings.
|
|
*/
|
|
static PyObject *
|
|
newdatatype_call(newdatatypeobject *obj, PyObject *args, PyObject *other)
|
|
{
|
|
PyObject *result;
|
|
char *arg1;
|
|
char *arg2;
|
|
char *arg3;
|
|
|
|
if (!PyArg_ParseTuple(args, "sss:call", &arg1, &arg2, &arg3)) {
|
|
return NULL;
|
|
}
|
|
result = PyString_FromFormat(
|
|
"Returning -- value: [\%d] arg1: [\%s] arg2: [\%s] arg3: [\%s]\n",
|
|
obj->obj_UnderlyingDatatypePtr->size,
|
|
arg1, arg2, arg3);
|
|
printf("\%s", PyString_AS_STRING(result));
|
|
return result;
|
|
}
|
|
\end{verbatim}
|
|
|
|
XXX some fields need to be added here...
|
|
|
|
|
|
\begin{verbatim}
|
|
/* Added in release 2.2 */
|
|
/* Iterators */
|
|
getiterfunc tp_iter;
|
|
iternextfunc tp_iternext;
|
|
\end{verbatim}
|
|
|
|
These functions provide support for the iterator protocol. Any object
|
|
which wishes to support iteration over its contents (which may be
|
|
generated during iteration) must implement the \code{tp_iter}
|
|
handler. Objects which are returned by a \code{tp_iter} handler must
|
|
implement both the \code{tp_iter} and \code{tp_iternext} handlers.
|
|
Both handlers take exactly one parameter, the instance for which they
|
|
are being called, and return a new reference. In the case of an
|
|
error, they should set an exception and return \NULL.
|
|
|
|
For an object which represents an iterable collection, the
|
|
\code{tp_iter} handler must return an iterator object. The iterator
|
|
object is responsible for maintaining the state of the iteration. For
|
|
collections which can support multiple iterators which do not
|
|
interfere with each other (as lists and tuples do), a new iterator
|
|
should be created and returned. Objects which can only be iterated
|
|
over once (usually due to side effects of iteration) should implement
|
|
this handler by returning a new reference to themselves, and should
|
|
also implement the \code{tp_iternext} handler. File objects are an
|
|
example of such an iterator.
|
|
|
|
Iterator objects should implement both handlers. The \code{tp_iter}
|
|
handler should return a new reference to the iterator (this is the
|
|
same as the \code{tp_iter} handler for objects which can only be
|
|
iterated over destructively). The \code{tp_iternext} handler should
|
|
return a new reference to the next object in the iteration if there is
|
|
one. If the iteration has reached the end, it may return \NULL{}
|
|
without setting an exception or it may set \exception{StopIteration};
|
|
avoiding the exception can yield slightly better performance. If an
|
|
actual error occurs, it should set an exception and return \NULL.
|
|
|
|
|
|
\subsection{Weak Reference Support\label{weakref-support}}
|
|
|
|
One of the goals of Python's weak-reference implementation is to allow
|
|
any type to participate in the weak reference mechanism without
|
|
incurring the overhead on those objects which do not benefit by weak
|
|
referencing (such as numbers).
|
|
|
|
For an object to be weakly referencable, the extension must include a
|
|
\ctype{PyObject*} field in the instance structure for the use of the
|
|
weak reference mechanism; it must be initialized to \NULL{} by the
|
|
object's constructor. It must also set the \member{tp_weaklistoffset}
|
|
field of the corresponding type object to the offset of the field.
|
|
For example, the instance type is defined with the following
|
|
structure:
|
|
|
|
\begin{verbatim}
|
|
typedef struct {
|
|
PyObject_HEAD
|
|
PyClassObject *in_class; /* The class object */
|
|
PyObject *in_dict; /* A dictionary */
|
|
PyObject *in_weakreflist; /* List of weak references */
|
|
} PyInstanceObject;
|
|
\end{verbatim}
|
|
|
|
The statically-declared type object for instances is defined this way:
|
|
|
|
\begin{verbatim}
|
|
PyTypeObject PyInstance_Type = {
|
|
PyObject_HEAD_INIT(&PyType_Type)
|
|
0,
|
|
"module.instance",
|
|
|
|
/* Lots of stuff omitted for brevity... */
|
|
|
|
Py_TPFLAGS_DEFAULT, /* tp_flags */
|
|
0, /* tp_doc */
|
|
0, /* tp_traverse */
|
|
0, /* tp_clear */
|
|
0, /* tp_richcompare */
|
|
offsetof(PyInstanceObject, in_weakreflist), /* tp_weaklistoffset */
|
|
};
|
|
\end{verbatim}
|
|
|
|
The type constructor is responsible for initializing the weak reference
|
|
list to \NULL:
|
|
|
|
\begin{verbatim}
|
|
static PyObject *
|
|
instance_new() {
|
|
/* Other initialization stuff omitted for brevity */
|
|
|
|
self->in_weakreflist = NULL;
|
|
|
|
return (PyObject *) self;
|
|
}
|
|
\end{verbatim}
|
|
|
|
The only further addition is that the destructor needs to call the
|
|
weak reference manager to clear any weak references. This should be
|
|
done before any other parts of the destruction have occurred, but is
|
|
only required if the weak reference list is non-\NULL:
|
|
|
|
\begin{verbatim}
|
|
static void
|
|
instance_dealloc(PyInstanceObject *inst)
|
|
{
|
|
/* Allocate temporaries if needed, but do not begin
|
|
destruction just yet.
|
|
*/
|
|
|
|
if (inst->in_weakreflist != NULL)
|
|
PyObject_ClearWeakRefs((PyObject *) inst);
|
|
|
|
/* Proceed with object destruction normally. */
|
|
}
|
|
\end{verbatim}
|
|
|
|
|
|
\subsection{More Suggestions}
|
|
|
|
Remember that you can omit most of these functions, in which case you
|
|
provide \code{0} as a value. There are type definitions for each of
|
|
the functions you must provide. They are in \file{object.h} in the
|
|
Python include directory that comes with the source distribution of
|
|
Python.
|
|
|
|
In order to learn how to implement any specific method for your new
|
|
data type, do the following: Download and unpack the Python source
|
|
distribution. Go the \file{Objects} directory, then search the
|
|
C source files for \code{tp_} plus the function you want (for
|
|
example, \code{tp_print} or \code{tp_compare}). You will find
|
|
examples of the function you want to implement.
|
|
|
|
When you need to verify that an object is an instance of the type
|
|
you are implementing, use the \cfunction{PyObject_TypeCheck} function.
|
|
A sample of its use might be something like the following:
|
|
|
|
\begin{verbatim}
|
|
if (! PyObject_TypeCheck(some_object, &MyType)) {
|
|
PyErr_SetString(PyExc_TypeError, "arg #1 not a mything");
|
|
return NULL;
|
|
}
|
|
\end{verbatim}
|