mirror of
https://github.com/python/cpython.git
synced 2025-10-29 20:51:26 +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. ........
1780 lines
76 KiB
TeX
1780 lines
76 KiB
TeX
\chapter{Object Implementation Support \label{newTypes}}
|
|
|
|
|
|
This chapter describes the functions, types, and macros used when
|
|
defining new object types.
|
|
|
|
|
|
\section{Allocating Objects on the Heap
|
|
\label{allocating-objects}}
|
|
|
|
\begin{cfuncdesc}{PyObject*}{_PyObject_New}{PyTypeObject *type}
|
|
\end{cfuncdesc}
|
|
|
|
\begin{cfuncdesc}{PyVarObject*}{_PyObject_NewVar}{PyTypeObject *type, Py_ssize_t size}
|
|
\end{cfuncdesc}
|
|
|
|
\begin{cfuncdesc}{void}{_PyObject_Del}{PyObject *op}
|
|
\end{cfuncdesc}
|
|
|
|
\begin{cfuncdesc}{PyObject*}{PyObject_Init}{PyObject *op,
|
|
PyTypeObject *type}
|
|
Initialize a newly-allocated object \var{op} with its type and
|
|
initial reference. Returns the initialized object. If \var{type}
|
|
indicates that the object participates in the cyclic garbage
|
|
detector, it is added to the detector's set of observed objects.
|
|
Other fields of the object are not affected.
|
|
\end{cfuncdesc}
|
|
|
|
\begin{cfuncdesc}{PyVarObject*}{PyObject_InitVar}{PyVarObject *op,
|
|
PyTypeObject *type, Py_ssize_t size}
|
|
This does everything \cfunction{PyObject_Init()} does, and also
|
|
initializes the length information for a variable-size object.
|
|
\end{cfuncdesc}
|
|
|
|
\begin{cfuncdesc}{\var{TYPE}*}{PyObject_New}{TYPE, PyTypeObject *type}
|
|
Allocate a new Python object using the C structure type \var{TYPE}
|
|
and the Python type object \var{type}. Fields not defined by the
|
|
Python object header are not initialized; the object's reference
|
|
count will be one. The size of the memory
|
|
allocation is determined from the \member{tp_basicsize} field of the
|
|
type object.
|
|
\end{cfuncdesc}
|
|
|
|
\begin{cfuncdesc}{\var{TYPE}*}{PyObject_NewVar}{TYPE, PyTypeObject *type,
|
|
Py_ssize_t size}
|
|
Allocate a new Python object using the C structure type \var{TYPE}
|
|
and the Python type object \var{type}. Fields not defined by the
|
|
Python object header are not initialized. The allocated memory
|
|
allows for the \var{TYPE} structure plus \var{size} fields of the
|
|
size given by the \member{tp_itemsize} field of \var{type}. This is
|
|
useful for implementing objects like tuples, which are able to
|
|
determine their size at construction time. Embedding the array of
|
|
fields into the same allocation decreases the number of allocations,
|
|
improving the memory management efficiency.
|
|
\end{cfuncdesc}
|
|
|
|
\begin{cfuncdesc}{void}{PyObject_Del}{PyObject *op}
|
|
Releases memory allocated to an object using
|
|
\cfunction{PyObject_New()} or \cfunction{PyObject_NewVar()}. This
|
|
is normally called from the \member{tp_dealloc} handler specified in
|
|
the object's type. The fields of the object should not be accessed
|
|
after this call as the memory is no longer a valid Python object.
|
|
\end{cfuncdesc}
|
|
|
|
\begin{cfuncdesc}{PyObject*}{Py_InitModule}{char *name,
|
|
PyMethodDef *methods}
|
|
Create a new module object based on a name and table of functions,
|
|
returning the new module object.
|
|
|
|
\versionchanged[Older versions of Python did not support \NULL{} as
|
|
the value for the \var{methods} argument]{2.3}
|
|
\end{cfuncdesc}
|
|
|
|
\begin{cfuncdesc}{PyObject*}{Py_InitModule3}{char *name,
|
|
PyMethodDef *methods,
|
|
char *doc}
|
|
Create a new module object based on a name and table of functions,
|
|
returning the new module object. If \var{doc} is non-\NULL, it will
|
|
be used to define the docstring for the module.
|
|
|
|
\versionchanged[Older versions of Python did not support \NULL{} as
|
|
the value for the \var{methods} argument]{2.3}
|
|
\end{cfuncdesc}
|
|
|
|
\begin{cfuncdesc}{PyObject*}{Py_InitModule4}{char *name,
|
|
PyMethodDef *methods,
|
|
char *doc, PyObject *self,
|
|
int apiver}
|
|
Create a new module object based on a name and table of functions,
|
|
returning the new module object. If \var{doc} is non-\NULL, it will
|
|
be used to define the docstring for the module. If \var{self} is
|
|
non-\NULL, it will passed to the functions of the module as their
|
|
(otherwise \NULL) first parameter. (This was added as an
|
|
experimental feature, and there are no known uses in the current
|
|
version of Python.) For \var{apiver}, the only value which should
|
|
be passed is defined by the constant \constant{PYTHON_API_VERSION}.
|
|
|
|
\note{Most uses of this function should probably be using
|
|
the \cfunction{Py_InitModule3()} instead; only use this if you are
|
|
sure you need it.}
|
|
|
|
\versionchanged[Older versions of Python did not support \NULL{} as
|
|
the value for the \var{methods} argument]{2.3}
|
|
\end{cfuncdesc}
|
|
|
|
\begin{cvardesc}{PyObject}{_Py_NoneStruct}
|
|
Object which is visible in Python as \code{None}. This should only
|
|
be accessed using the \code{Py_None} macro, which evaluates to a
|
|
pointer to this object.
|
|
\end{cvardesc}
|
|
|
|
|
|
\section{Common Object Structures \label{common-structs}}
|
|
|
|
There are a large number of structures which are used in the
|
|
definition of object types for Python. This section describes these
|
|
structures and how they are used.
|
|
|
|
All Python objects ultimately share a small number of fields at the
|
|
beginning of the object's representation in memory. These are
|
|
represented by the \ctype{PyObject} and \ctype{PyVarObject} types,
|
|
which are defined, in turn, by the expansions of some macros also
|
|
used, whether directly or indirectly, in the definition of all other
|
|
Python objects.
|
|
|
|
\begin{ctypedesc}{PyObject}
|
|
All object types are extensions of this type. This is a type which
|
|
contains the information Python needs to treat a pointer to an
|
|
object as an object. In a normal ``release'' build, it contains
|
|
only the objects reference count and a pointer to the corresponding
|
|
type object. It corresponds to the fields defined by the
|
|
expansion of the \code{PyObject_HEAD} macro.
|
|
\end{ctypedesc}
|
|
|
|
\begin{ctypedesc}{PyVarObject}
|
|
This is an extension of \ctype{PyObject} that adds the
|
|
\member{ob_size} field. This is only used for objects that have
|
|
some notion of \emph{length}. This type does not often appear in
|
|
the Python/C API. It corresponds to the fields defined by the
|
|
expansion of the \code{PyObject_VAR_HEAD} macro.
|
|
\end{ctypedesc}
|
|
|
|
These macros are used in the definition of \ctype{PyObject} and
|
|
\ctype{PyVarObject}:
|
|
|
|
\begin{csimplemacrodesc}{PyObject_HEAD}
|
|
This is a macro which expands to the declarations of the fields of
|
|
the \ctype{PyObject} type; it is used when declaring new types which
|
|
represent objects without a varying length. The specific fields it
|
|
expands to depend on the definition of
|
|
\csimplemacro{Py_TRACE_REFS}. By default, that macro is not
|
|
defined, and \csimplemacro{PyObject_HEAD} expands to:
|
|
\begin{verbatim}
|
|
Py_ssize_t ob_refcnt;
|
|
PyTypeObject *ob_type;
|
|
\end{verbatim}
|
|
When \csimplemacro{Py_TRACE_REFS} is defined, it expands to:
|
|
\begin{verbatim}
|
|
PyObject *_ob_next, *_ob_prev;
|
|
Py_ssize_t ob_refcnt;
|
|
PyTypeObject *ob_type;
|
|
\end{verbatim}
|
|
\end{csimplemacrodesc}
|
|
|
|
\begin{csimplemacrodesc}{PyObject_VAR_HEAD}
|
|
This is a macro which expands to the declarations of the fields of
|
|
the \ctype{PyVarObject} type; it is used when declaring new types which
|
|
represent objects with a length that varies from instance to
|
|
instance. This macro always expands to:
|
|
\begin{verbatim}
|
|
PyObject_HEAD
|
|
Py_ssize_t ob_size;
|
|
\end{verbatim}
|
|
Note that \csimplemacro{PyObject_HEAD} is part of the expansion, and
|
|
that its own expansion varies depending on the definition of
|
|
\csimplemacro{Py_TRACE_REFS}.
|
|
\end{csimplemacrodesc}
|
|
|
|
PyObject_HEAD_INIT
|
|
|
|
\begin{ctypedesc}{PyCFunction}
|
|
Type of the functions used to implement most Python callables in C.
|
|
Functions of this type take two \ctype{PyObject*} parameters and
|
|
return one such value. If the return value is \NULL, an exception
|
|
shall have been set. If not \NULL, the return value is interpreted
|
|
as the return value of the function as exposed in Python. The
|
|
function must return a new reference.
|
|
\end{ctypedesc}
|
|
|
|
\begin{ctypedesc}{PyMethodDef}
|
|
Structure used to describe a method of an extension type. This
|
|
structure has four fields:
|
|
|
|
\begin{tableiii}{l|l|l}{member}{Field}{C Type}{Meaning}
|
|
\lineiii{ml_name}{char *}{name of the method}
|
|
\lineiii{ml_meth}{PyCFunction}{pointer to the C implementation}
|
|
\lineiii{ml_flags}{int}{flag bits indicating how the call should be
|
|
constructed}
|
|
\lineiii{ml_doc}{char *}{points to the contents of the docstring}
|
|
\end{tableiii}
|
|
\end{ctypedesc}
|
|
|
|
The \member{ml_meth} is a C function pointer. The functions may be of
|
|
different types, but they always return \ctype{PyObject*}. If the
|
|
function is not of the \ctype{PyCFunction}, the compiler will require
|
|
a cast in the method table. Even though \ctype{PyCFunction} defines
|
|
the first parameter as \ctype{PyObject*}, it is common that the method
|
|
implementation uses a the specific C type of the \var{self} object.
|
|
|
|
The \member{ml_flags} field is a bitfield which can include the
|
|
following flags. The individual flags indicate either a calling
|
|
convention or a binding convention. Of the calling convention flags,
|
|
only \constant{METH_VARARGS} and \constant{METH_KEYWORDS} can be
|
|
combined (but note that \constant{METH_KEYWORDS} alone is equivalent
|
|
to \code{\constant{METH_VARARGS} | \constant{METH_KEYWORDS}}).
|
|
Any of the calling convention flags can be combined with a
|
|
binding flag.
|
|
|
|
\begin{datadesc}{METH_VARARGS}
|
|
This is the typical calling convention, where the methods have the
|
|
type \ctype{PyCFunction}. The function expects two
|
|
\ctype{PyObject*} values. The first one is the \var{self} object for
|
|
methods; for module functions, it has the value given to
|
|
\cfunction{Py_InitModule4()} (or \NULL{} if
|
|
\cfunction{Py_InitModule()} was used). The second parameter
|
|
(often called \var{args}) is a tuple object representing all
|
|
arguments. This parameter is typically processed using
|
|
\cfunction{PyArg_ParseTuple()} or \cfunction{PyArg_UnpackTuple}.
|
|
\end{datadesc}
|
|
|
|
\begin{datadesc}{METH_KEYWORDS}
|
|
Methods with these flags must be of type
|
|
\ctype{PyCFunctionWithKeywords}. The function expects three
|
|
parameters: \var{self}, \var{args}, and a dictionary of all the
|
|
keyword arguments. The flag is typically combined with
|
|
\constant{METH_VARARGS}, and the parameters are typically processed
|
|
using \cfunction{PyArg_ParseTupleAndKeywords()}.
|
|
\end{datadesc}
|
|
|
|
\begin{datadesc}{METH_NOARGS}
|
|
Methods without parameters don't need to check whether arguments are
|
|
given if they are listed with the \constant{METH_NOARGS} flag. They
|
|
need to be of type \ctype{PyCFunction}. When used with object
|
|
methods, the first parameter is typically named \code{self} and will
|
|
hold a reference to the object instance. In all cases the second
|
|
parameter will be \NULL.
|
|
\end{datadesc}
|
|
|
|
\begin{datadesc}{METH_O}
|
|
Methods with a single object argument can be listed with the
|
|
\constant{METH_O} flag, instead of invoking
|
|
\cfunction{PyArg_ParseTuple()} with a \code{"O"} argument. They have
|
|
the type \ctype{PyCFunction}, with the \var{self} parameter, and a
|
|
\ctype{PyObject*} parameter representing the single argument.
|
|
\end{datadesc}
|
|
|
|
\begin{datadesc}{METH_OLDARGS}
|
|
This calling convention is deprecated. The method must be of type
|
|
\ctype{PyCFunction}. The second argument is \NULL{} if no arguments
|
|
are given, a single object if exactly one argument is given, and a
|
|
tuple of objects if more than one argument is given. There is no
|
|
way for a function using this convention to distinguish between a
|
|
call with multiple arguments and a call with a tuple as the only
|
|
argument.
|
|
\end{datadesc}
|
|
|
|
These two constants are not used to indicate the calling convention
|
|
but the binding when use with methods of classes. These may not be
|
|
used for functions defined for modules. At most one of these flags
|
|
may be set for any given method.
|
|
|
|
\begin{datadesc}{METH_CLASS}
|
|
The method will be passed the type object as the first parameter
|
|
rather than an instance of the type. This is used to create
|
|
\emph{class methods}, similar to what is created when using the
|
|
\function{classmethod()}\bifuncindex{classmethod} built-in
|
|
function.
|
|
\versionadded{2.3}
|
|
\end{datadesc}
|
|
|
|
\begin{datadesc}{METH_STATIC}
|
|
The method will be passed \NULL{} as the first parameter rather than
|
|
an instance of the type. This is used to create \emph{static
|
|
methods}, similar to what is created when using the
|
|
\function{staticmethod()}\bifuncindex{staticmethod} built-in
|
|
function.
|
|
\versionadded{2.3}
|
|
\end{datadesc}
|
|
|
|
One other constant controls whether a method is loaded in place of
|
|
another definition with the same method name.
|
|
|
|
\begin{datadesc}{METH_COEXIST}
|
|
The method will be loaded in place of existing definitions. Without
|
|
\var{METH_COEXIST}, the default is to skip repeated definitions. Since
|
|
slot wrappers are loaded before the method table, the existence of a
|
|
\var{sq_contains} slot, for example, would generate a wrapped method
|
|
named \method{__contains__()} and preclude the loading of a
|
|
corresponding PyCFunction with the same name. With the flag defined,
|
|
the PyCFunction will be loaded in place of the wrapper object and will
|
|
co-exist with the slot. This is helpful because calls to PyCFunctions
|
|
are optimized more than wrapper object calls.
|
|
\versionadded{2.4}
|
|
\end{datadesc}
|
|
|
|
\begin{cfuncdesc}{PyObject*}{Py_FindMethod}{PyMethodDef table[],
|
|
PyObject *ob, char *name}
|
|
Return a bound method object for an extension type implemented in
|
|
C. This can be useful in the implementation of a
|
|
\member{tp_getattro} or \member{tp_getattr} handler that does not
|
|
use the \cfunction{PyObject_GenericGetAttr()} function.
|
|
\end{cfuncdesc}
|
|
|
|
|
|
\section{Type Objects \label{type-structs}}
|
|
|
|
Perhaps one of the most important structures of the Python object
|
|
system is the structure that defines a new type: the
|
|
\ctype{PyTypeObject} structure. Type objects can be handled using any
|
|
of the \cfunction{PyObject_*()} or \cfunction{PyType_*()} functions,
|
|
but do not offer much that's interesting to most Python applications.
|
|
These objects are fundamental to how objects behave, so they are very
|
|
important to the interpreter itself and to any extension module that
|
|
implements new types.
|
|
|
|
Type objects are fairly large compared to most of the standard types.
|
|
The reason for the size is that each type object stores a large number
|
|
of values, mostly C function pointers, each of which implements a
|
|
small part of the type's functionality. The fields of the type object
|
|
are examined in detail in this section. The fields will be described
|
|
in the order in which they occur in the structure.
|
|
|
|
Typedefs:
|
|
unaryfunc, binaryfunc, ternaryfunc, inquiry, coercion, intargfunc,
|
|
intintargfunc, intobjargproc, intintobjargproc, objobjargproc,
|
|
destructor, freefunc, printfunc, getattrfunc, getattrofunc, setattrfunc,
|
|
setattrofunc, cmpfunc, reprfunc, hashfunc
|
|
|
|
The structure definition for \ctype{PyTypeObject} can be found in
|
|
\file{Include/object.h}. For convenience of reference, this repeats
|
|
the definition found there:
|
|
|
|
\verbatiminput{typestruct.h}
|
|
|
|
The type object structure extends the \ctype{PyVarObject} structure.
|
|
The \member{ob_size} field is used for dynamic types (created
|
|
by \function{type_new()}, usually called from a class statement).
|
|
Note that \cdata{PyType_Type} (the metatype) initializes
|
|
\member{tp_itemsize}, which means that its instances (i.e. type
|
|
objects) \emph{must} have the \member{ob_size} field.
|
|
|
|
\begin{cmemberdesc}{PyObject}{PyObject*}{_ob_next}
|
|
\cmemberline{PyObject}{PyObject*}{_ob_prev}
|
|
These fields are only present when the macro \code{Py_TRACE_REFS} is
|
|
defined. Their initialization to \NULL{} is taken care of by the
|
|
\code{PyObject_HEAD_INIT} macro. For statically allocated objects,
|
|
these fields always remain \NULL. For dynamically allocated
|
|
objects, these two fields are used to link the object into a
|
|
doubly-linked list of \emph{all} live objects on the heap. This
|
|
could be used for various debugging purposes; currently the only use
|
|
is to print the objects that are still alive at the end of a run
|
|
when the environment variable \envvar{PYTHONDUMPREFS} is set.
|
|
|
|
These fields are not inherited by subtypes.
|
|
\end{cmemberdesc}
|
|
|
|
\begin{cmemberdesc}{PyObject}{Py_ssize_t}{ob_refcnt}
|
|
This is the type object's reference count, initialized to \code{1}
|
|
by the \code{PyObject_HEAD_INIT} macro. Note that for statically
|
|
allocated type objects, the type's instances (objects whose
|
|
\member{ob_type} points back to the type) do \emph{not} count as
|
|
references. But for dynamically allocated type objects, the
|
|
instances \emph{do} count as references.
|
|
|
|
This field is not inherited by subtypes.
|
|
\end{cmemberdesc}
|
|
|
|
\begin{cmemberdesc}{PyObject}{PyTypeObject*}{ob_type}
|
|
This is the type's type, in other words its metatype. It is
|
|
initialized by the argument to the \code{PyObject_HEAD_INIT} macro,
|
|
and its value should normally be \code{\&PyType_Type}. However, for
|
|
dynamically loadable extension modules that must be usable on
|
|
Windows (at least), the compiler complains that this is not a valid
|
|
initializer. Therefore, the convention is to pass \NULL{} to the
|
|
\code{PyObject_HEAD_INIT} macro and to initialize this field
|
|
explicitly at the start of the module's initialization function,
|
|
before doing anything else. This is typically done like this:
|
|
|
|
\begin{verbatim}
|
|
Foo_Type.ob_type = &PyType_Type;
|
|
\end{verbatim}
|
|
|
|
This should be done before any instances of the type are created.
|
|
\cfunction{PyType_Ready()} checks if \member{ob_type} is \NULL, and
|
|
if so, initializes it: in Python 2.2, it is set to
|
|
\code{\&PyType_Type}; in Python 2.2.1 and later it is
|
|
initialized to the \member{ob_type} field of the base class.
|
|
\cfunction{PyType_Ready()} will not change this field if it is
|
|
non-zero.
|
|
|
|
In Python 2.2, this field is not inherited by subtypes. In 2.2.1,
|
|
and in 2.3 and beyond, it is inherited by subtypes.
|
|
\end{cmemberdesc}
|
|
|
|
\begin{cmemberdesc}{PyVarObject}{Py_ssize_t}{ob_size}
|
|
For statically allocated type objects, this should be initialized
|
|
to zero. For dynamically allocated type objects, this field has a
|
|
special internal meaning.
|
|
|
|
This field is not inherited by subtypes.
|
|
\end{cmemberdesc}
|
|
|
|
\begin{cmemberdesc}{PyTypeObject}{char*}{tp_name}
|
|
Pointer to a NUL-terminated string containing the name of the type.
|
|
For types that are accessible as module globals, the string should
|
|
be the full module name, followed by a dot, followed by the type
|
|
name; for built-in types, it should be just the type name. If the
|
|
module is a submodule of a package, the full package name is part of
|
|
the full module name. For example, a type named \class{T} defined
|
|
in module \module{M} in subpackage \module{Q} in package \module{P}
|
|
should have the \member{tp_name} initializer \code{"P.Q.M.T"}.
|
|
|
|
For dynamically allocated type objects, this should just be the type
|
|
name, and the module name explicitly stored in the type dict as the
|
|
value for key \code{'__module__'}.
|
|
|
|
For statically allocated type objects, the tp_name field should
|
|
contain a dot. Everything before the last dot is made accessible as
|
|
the \member{__module__} attribute, and everything after the last dot
|
|
is made accessible as the \member{__name__} attribute.
|
|
|
|
If no dot is present, the entire \member{tp_name} field is made
|
|
accessible as the \member{__name__} attribute, and the
|
|
\member{__module__} attribute is undefined (unless explicitly set in
|
|
the dictionary, as explained above). This means your type will be
|
|
impossible to pickle.
|
|
|
|
This field is not inherited by subtypes.
|
|
\end{cmemberdesc}
|
|
|
|
\begin{cmemberdesc}{PyTypeObject}{Py_ssize_t}{tp_basicsize}
|
|
\cmemberline{PyTypeObject}{Py_ssize_t}{tp_itemsize}
|
|
These fields allow calculating the size in bytes of instances of
|
|
the type.
|
|
|
|
There are two kinds of types: types with fixed-length instances have
|
|
a zero \member{tp_itemsize} field, types with variable-length
|
|
instances have a non-zero \member{tp_itemsize} field. For a type
|
|
with fixed-length instances, all instances have the same size,
|
|
given in \member{tp_basicsize}.
|
|
|
|
For a type with variable-length instances, the instances must have
|
|
an \member{ob_size} field, and the instance size is
|
|
\member{tp_basicsize} plus N times \member{tp_itemsize}, where N is
|
|
the ``length'' of the object. The value of N is typically stored in
|
|
the instance's \member{ob_size} field. There are exceptions: for
|
|
example, long ints use a negative \member{ob_size} to indicate a
|
|
negative number, and N is \code{abs(\member{ob_size})} there. Also,
|
|
the presence of an \member{ob_size} field in the instance layout
|
|
doesn't mean that the instance structure is variable-length (for
|
|
example, the structure for the list type has fixed-length instances,
|
|
yet those instances have a meaningful \member{ob_size} field).
|
|
|
|
The basic size includes the fields in the instance declared by the
|
|
macro \csimplemacro{PyObject_HEAD} or
|
|
\csimplemacro{PyObject_VAR_HEAD} (whichever is used to declare the
|
|
instance struct) and this in turn includes the \member{_ob_prev} and
|
|
\member{_ob_next} fields if they are present. This means that the
|
|
only correct way to get an initializer for the \member{tp_basicsize}
|
|
is to use the \keyword{sizeof} operator on the struct used to
|
|
declare the instance layout. The basic size does not include the GC
|
|
header size (this is new in Python 2.2; in 2.1 and 2.0, the GC
|
|
header size was included in \member{tp_basicsize}).
|
|
|
|
These fields are inherited separately by subtypes. If the base type
|
|
has a non-zero \member{tp_itemsize}, it is generally not safe to set
|
|
\member{tp_itemsize} to a different non-zero value in a subtype
|
|
(though this depends on the implementation of the base type).
|
|
|
|
A note about alignment: if the variable items require a particular
|
|
alignment, this should be taken care of by the value of
|
|
\member{tp_basicsize}. Example: suppose a type implements an array
|
|
of \code{double}. \member{tp_itemsize} is \code{sizeof(double)}.
|
|
It is the programmer's responsibility that \member{tp_basicsize} is
|
|
a multiple of \code{sizeof(double)} (assuming this is the alignment
|
|
requirement for \code{double}).
|
|
\end{cmemberdesc}
|
|
|
|
\begin{cmemberdesc}{PyTypeObject}{destructor}{tp_dealloc}
|
|
A pointer to the instance destructor function. This function must
|
|
be defined unless the type guarantees that its instances will never
|
|
be deallocated (as is the case for the singletons \code{None} and
|
|
\code{Ellipsis}).
|
|
|
|
The destructor function is called by the \cfunction{Py_DECREF()} and
|
|
\cfunction{Py_XDECREF()} macros when the new reference count is
|
|
zero. At this point, the instance is still in existence, but there
|
|
are no references to it. The destructor function should free all
|
|
references which the instance owns, free all memory buffers owned by
|
|
the instance (using the freeing function corresponding to the
|
|
allocation function used to allocate the buffer), and finally (as
|
|
its last action) call the type's \member{tp_free} function. If the
|
|
type is not subtypable (doesn't have the
|
|
\constant{Py_TPFLAGS_BASETYPE} flag bit set), it is permissible to
|
|
call the object deallocator directly instead of via
|
|
\member{tp_free}. The object deallocator should be the one used to
|
|
allocate the instance; this is normally \cfunction{PyObject_Del()}
|
|
if the instance was allocated using \cfunction{PyObject_New()} or
|
|
\cfunction{PyObject_VarNew()}, or \cfunction{PyObject_GC_Del()} if
|
|
the instance was allocated using \cfunction{PyObject_GC_New()} or
|
|
\cfunction{PyObject_GC_VarNew()}.
|
|
|
|
This field is inherited by subtypes.
|
|
\end{cmemberdesc}
|
|
|
|
\begin{cmemberdesc}{PyTypeObject}{printfunc}{tp_print}
|
|
An optional pointer to the instance print function.
|
|
|
|
The print function is only called when the instance is printed to a
|
|
\emph{real} file; when it is printed to a pseudo-file (like a
|
|
\class{StringIO} instance), the instance's \member{tp_repr} or
|
|
\member{tp_str} function is called to convert it to a string. These
|
|
are also called when the type's \member{tp_print} field is \NULL. A
|
|
type should never implement \member{tp_print} in a way that produces
|
|
different output than \member{tp_repr} or \member{tp_str} would.
|
|
|
|
The print function is called with the same signature as
|
|
\cfunction{PyObject_Print()}: \code{int tp_print(PyObject *self, FILE
|
|
*file, int flags)}. The \var{self} argument is the instance to be
|
|
printed. The \var{file} argument is the stdio file to which it is
|
|
to be printed. The \var{flags} argument is composed of flag bits.
|
|
The only flag bit currently defined is \constant{Py_PRINT_RAW}.
|
|
When the \constant{Py_PRINT_RAW} flag bit is set, the instance
|
|
should be printed the same way as \member{tp_str} would format it;
|
|
when the \constant{Py_PRINT_RAW} flag bit is clear, the instance
|
|
should be printed the same was as \member{tp_repr} would format it.
|
|
It should return \code{-1} and set an exception condition when an
|
|
error occurred during the comparison.
|
|
|
|
It is possible that the \member{tp_print} field will be deprecated.
|
|
In any case, it is recommended not to define \member{tp_print}, but
|
|
instead to rely on \member{tp_repr} and \member{tp_str} for
|
|
printing.
|
|
|
|
This field is inherited by subtypes.
|
|
\end{cmemberdesc}
|
|
|
|
\begin{cmemberdesc}{PyTypeObject}{getattrfunc}{tp_getattr}
|
|
An optional pointer to the get-attribute-string function.
|
|
|
|
This field is deprecated. When it is defined, it should point to a
|
|
function that acts the same as the \member{tp_getattro} function,
|
|
but taking a C string instead of a Python string object to give the
|
|
attribute name. The signature is the same as for
|
|
\cfunction{PyObject_GetAttrString()}.
|
|
|
|
This field is inherited by subtypes together with
|
|
\member{tp_getattro}: a subtype inherits both \member{tp_getattr}
|
|
and \member{tp_getattro} from its base type when the subtype's
|
|
\member{tp_getattr} and \member{tp_getattro} are both \NULL.
|
|
\end{cmemberdesc}
|
|
|
|
\begin{cmemberdesc}{PyTypeObject}{setattrfunc}{tp_setattr}
|
|
An optional pointer to the set-attribute-string function.
|
|
|
|
This field is deprecated. When it is defined, it should point to a
|
|
function that acts the same as the \member{tp_setattro} function,
|
|
but taking a C string instead of a Python string object to give the
|
|
attribute name. The signature is the same as for
|
|
\cfunction{PyObject_SetAttrString()}.
|
|
|
|
This field is inherited by subtypes together with
|
|
\member{tp_setattro}: a subtype inherits both \member{tp_setattr}
|
|
and \member{tp_setattro} from its base type when the subtype's
|
|
\member{tp_setattr} and \member{tp_setattro} are both \NULL.
|
|
\end{cmemberdesc}
|
|
|
|
\begin{cmemberdesc}{PyTypeObject}{cmpfunc}{tp_compare}
|
|
An optional pointer to the three-way comparison function.
|
|
|
|
The signature is the same as for \cfunction{PyObject_Compare()}.
|
|
The function should return \code{1} if \var{self} greater than
|
|
\var{other}, \code{0} if \var{self} is equal to \var{other}, and
|
|
\code{-1} if \var{self} less than \var{other}. It should return
|
|
\code{-1} and set an exception condition when an error occurred
|
|
during the comparison.
|
|
|
|
This field is inherited by subtypes together with
|
|
\member{tp_richcompare} and \member{tp_hash}: a subtypes inherits
|
|
all three of \member{tp_compare}, \member{tp_richcompare}, and
|
|
\member{tp_hash} when the subtype's \member{tp_compare},
|
|
\member{tp_richcompare}, and \member{tp_hash} are all \NULL.
|
|
\end{cmemberdesc}
|
|
|
|
\begin{cmemberdesc}{PyTypeObject}{reprfunc}{tp_repr}
|
|
An optional pointer to a function that implements the built-in
|
|
function \function{repr()}.\bifuncindex{repr}
|
|
|
|
The signature is the same as for \cfunction{PyObject_Repr()}; it
|
|
must return a string or a Unicode object. Ideally, this function
|
|
should return a string that, when passed to \function{eval()}, given
|
|
a suitable environment, returns an object with the same value. If
|
|
this is not feasible, it should return a string starting with
|
|
\character{\textless} and ending with \character{\textgreater} from
|
|
which both the type and the value of the object can be deduced.
|
|
|
|
When this field is not set, a string of the form \samp{<\%s object
|
|
at \%p>} is returned, where \code{\%s} is replaced by the type name,
|
|
and \code{\%p} by the object's memory address.
|
|
|
|
This field is inherited by subtypes.
|
|
\end{cmemberdesc}
|
|
|
|
PyNumberMethods *tp_as_number;
|
|
|
|
XXX
|
|
|
|
PySequenceMethods *tp_as_sequence;
|
|
|
|
XXX
|
|
|
|
PyMappingMethods *tp_as_mapping;
|
|
|
|
XXX
|
|
|
|
\begin{cmemberdesc}{PyTypeObject}{hashfunc}{tp_hash}
|
|
An optional pointer to a function that implements the built-in
|
|
function \function{hash()}.\bifuncindex{hash}
|
|
|
|
The signature is the same as for \cfunction{PyObject_Hash()}; it
|
|
must return a C long. The value \code{-1} should not be returned as
|
|
a normal return value; when an error occurs during the computation
|
|
of the hash value, the function should set an exception and return
|
|
\code{-1}.
|
|
|
|
When this field is not set, two possibilities exist: if the
|
|
\member{tp_compare} and \member{tp_richcompare} fields are both
|
|
\NULL, a default hash value based on the object's address is
|
|
returned; otherwise, a \exception{TypeError} is raised.
|
|
|
|
This field is inherited by subtypes together with
|
|
\member{tp_richcompare} and \member{tp_compare}: a subtypes inherits
|
|
all three of \member{tp_compare}, \member{tp_richcompare}, and
|
|
\member{tp_hash}, when the subtype's \member{tp_compare},
|
|
\member{tp_richcompare} and \member{tp_hash} are all \NULL.
|
|
\end{cmemberdesc}
|
|
|
|
\begin{cmemberdesc}{PyTypeObject}{ternaryfunc}{tp_call}
|
|
An optional pointer to a function that implements calling the
|
|
object. This should be \NULL{} if the object is not callable. The
|
|
signature is the same as for \cfunction{PyObject_Call()}.
|
|
|
|
This field is inherited by subtypes.
|
|
\end{cmemberdesc}
|
|
|
|
\begin{cmemberdesc}{PyTypeObject}{reprfunc}{tp_str}
|
|
An optional pointer to a function that implements the built-in
|
|
operation \function{str()}. (Note that \class{str} is a type now,
|
|
and \function{str()} calls the constructor for that type. This
|
|
constructor calls \cfunction{PyObject_Str()} to do the actual work,
|
|
and \cfunction{PyObject_Str()} will call this handler.)
|
|
|
|
The signature is the same as for \cfunction{PyObject_Str()}; it must
|
|
return a string or a Unicode object. This function should return a
|
|
``friendly'' string representation of the object, as this is the
|
|
representation that will be used by the print statement.
|
|
|
|
When this field is not set, \cfunction{PyObject_Repr()} is called to
|
|
return a string representation.
|
|
|
|
This field is inherited by subtypes.
|
|
\end{cmemberdesc}
|
|
|
|
\begin{cmemberdesc}{PyTypeObject}{getattrofunc}{tp_getattro}
|
|
An optional pointer to the get-attribute function.
|
|
|
|
The signature is the same as for \cfunction{PyObject_GetAttr()}. It
|
|
is usually convenient to set this field to
|
|
\cfunction{PyObject_GenericGetAttr()}, which implements the normal
|
|
way of looking for object attributes.
|
|
|
|
This field is inherited by subtypes together with
|
|
\member{tp_getattr}: a subtype inherits both \member{tp_getattr} and
|
|
\member{tp_getattro} from its base type when the subtype's
|
|
\member{tp_getattr} and \member{tp_getattro} are both \NULL.
|
|
\end{cmemberdesc}
|
|
|
|
\begin{cmemberdesc}{PyTypeObject}{setattrofunc}{tp_setattro}
|
|
An optional pointer to the set-attribute function.
|
|
|
|
The signature is the same as for \cfunction{PyObject_SetAttr()}. It
|
|
is usually convenient to set this field to
|
|
\cfunction{PyObject_GenericSetAttr()}, which implements the normal
|
|
way of setting object attributes.
|
|
|
|
This field is inherited by subtypes together with
|
|
\member{tp_setattr}: a subtype inherits both \member{tp_setattr} and
|
|
\member{tp_setattro} from its base type when the subtype's
|
|
\member{tp_setattr} and \member{tp_setattro} are both \NULL.
|
|
\end{cmemberdesc}
|
|
|
|
\begin{cmemberdesc}{PyTypeObject}{PyBufferProcs*}{tp_as_buffer}
|
|
Pointer to an additional structure that contains fields relevant only to
|
|
objects which implement the buffer interface. These fields are
|
|
documented in ``Buffer Object Structures'' (section
|
|
\ref{buffer-structs}).
|
|
|
|
The \member{tp_as_buffer} field is not inherited, but the contained
|
|
fields are inherited individually.
|
|
\end{cmemberdesc}
|
|
|
|
\begin{cmemberdesc}{PyTypeObject}{long}{tp_flags}
|
|
This field is a bit mask of various flags. Some flags indicate
|
|
variant semantics for certain situations; others are used to
|
|
indicate that certain fields in the type object (or in the extension
|
|
structures referenced via \member{tp_as_number},
|
|
\member{tp_as_sequence}, \member{tp_as_mapping}, and
|
|
\member{tp_as_buffer}) that were historically not always present are
|
|
valid; if such a flag bit is clear, the type fields it guards must
|
|
not be accessed and must be considered to have a zero or \NULL{}
|
|
value instead.
|
|
|
|
Inheritance of this field is complicated. Most flag bits are
|
|
inherited individually, i.e. if the base type has a flag bit set,
|
|
the subtype inherits this flag bit. The flag bits that pertain to
|
|
extension structures are strictly inherited if the extension
|
|
structure is inherited, i.e. the base type's value of the flag bit
|
|
is copied into the subtype together with a pointer to the extension
|
|
structure. The \constant{Py_TPFLAGS_HAVE_GC} flag bit is inherited
|
|
together with the \member{tp_traverse} and \member{tp_clear} fields,
|
|
i.e. if the \constant{Py_TPFLAGS_HAVE_GC} flag bit is clear in the
|
|
subtype and the \member{tp_traverse} and \member{tp_clear} fields in
|
|
the subtype exist (as indicated by the
|
|
\constant{Py_TPFLAGS_HAVE_RICHCOMPARE} flag bit) and have \NULL{}
|
|
values.
|
|
|
|
The following bit masks are currently defined; these can be or-ed
|
|
together using the \code{|} operator to form the value of the
|
|
\member{tp_flags} field. The macro \cfunction{PyType_HasFeature()}
|
|
takes a type and a flags value, \var{tp} and \var{f}, and checks
|
|
whether \code{\var{tp}->tp_flags \& \var{f}} is non-zero.
|
|
|
|
\begin{datadesc}{Py_TPFLAGS_HAVE_GETCHARBUFFER}
|
|
If this bit is set, the \ctype{PyBufferProcs} struct referenced by
|
|
\member{tp_as_buffer} has the \member{bf_getcharbuffer} field.
|
|
\end{datadesc}
|
|
|
|
\begin{datadesc}{Py_TPFLAGS_HAVE_SEQUENCE_IN}
|
|
If this bit is set, the \ctype{PySequenceMethods} struct
|
|
referenced by \member{tp_as_sequence} has the \member{sq_contains}
|
|
field.
|
|
\end{datadesc}
|
|
|
|
\begin{datadesc}{Py_TPFLAGS_GC}
|
|
This bit is obsolete. The bit it used to name is no longer in
|
|
use. The symbol is now defined as zero.
|
|
\end{datadesc}
|
|
|
|
\begin{datadesc}{Py_TPFLAGS_HAVE_INPLACEOPS}
|
|
If this bit is set, the \ctype{PySequenceMethods} struct
|
|
referenced by \member{tp_as_sequence} and the
|
|
\ctype{PyNumberMethods} structure referenced by
|
|
\member{tp_as_number} contain the fields for in-place operators.
|
|
In particular, this means that the \ctype{PyNumberMethods}
|
|
structure has the fields \member{nb_inplace_add},
|
|
\member{nb_inplace_subtract}, \member{nb_inplace_multiply},
|
|
\member{nb_inplace_divide}, \member{nb_inplace_remainder},
|
|
\member{nb_inplace_power}, \member{nb_inplace_lshift},
|
|
\member{nb_inplace_rshift}, \member{nb_inplace_and},
|
|
\member{nb_inplace_xor}, and \member{nb_inplace_or}; and the
|
|
\ctype{PySequenceMethods} struct has the fields
|
|
\member{sq_inplace_concat} and \member{sq_inplace_repeat}.
|
|
\end{datadesc}
|
|
|
|
\begin{datadesc}{Py_TPFLAGS_CHECKTYPES}
|
|
If this bit is set, the binary and ternary operations in the
|
|
\ctype{PyNumberMethods} structure referenced by
|
|
\member{tp_as_number} accept arguments of arbitrary object types,
|
|
and do their own type conversions if needed. If this bit is
|
|
clear, those operations require that all arguments have the
|
|
current type as their type, and the caller is supposed to perform
|
|
a coercion operation first. This applies to \member{nb_add},
|
|
\member{nb_subtract}, \member{nb_multiply}, \member{nb_divide},
|
|
\member{nb_remainder}, \member{nb_divmod}, \member{nb_power},
|
|
\member{nb_lshift}, \member{nb_rshift}, \member{nb_and},
|
|
\member{nb_xor}, and \member{nb_or}.
|
|
\end{datadesc}
|
|
|
|
\begin{datadesc}{Py_TPFLAGS_HAVE_RICHCOMPARE}
|
|
If this bit is set, the type object has the
|
|
\member{tp_richcompare} field, as well as the \member{tp_traverse}
|
|
and the \member{tp_clear} fields.
|
|
\end{datadesc}
|
|
|
|
\begin{datadesc}{Py_TPFLAGS_HAVE_WEAKREFS}
|
|
If this bit is set, the \member{tp_weaklistoffset} field is
|
|
defined. Instances of a type are weakly referenceable if the
|
|
type's \member{tp_weaklistoffset} field has a value greater than
|
|
zero.
|
|
\end{datadesc}
|
|
|
|
\begin{datadesc}{Py_TPFLAGS_HAVE_ITER}
|
|
If this bit is set, the type object has the \member{tp_iter} and
|
|
\member{tp_iternext} fields.
|
|
\end{datadesc}
|
|
|
|
\begin{datadesc}{Py_TPFLAGS_HAVE_CLASS}
|
|
If this bit is set, the type object has several new fields defined
|
|
starting in Python 2.2: \member{tp_methods}, \member{tp_members},
|
|
\member{tp_getset}, \member{tp_base}, \member{tp_dict},
|
|
\member{tp_descr_get}, \member{tp_descr_set},
|
|
\member{tp_dictoffset}, \member{tp_init}, \member{tp_alloc},
|
|
\member{tp_new}, \member{tp_free}, \member{tp_is_gc},
|
|
\member{tp_bases}, \member{tp_mro}, \member{tp_cache},
|
|
\member{tp_subclasses}, and \member{tp_weaklist}.
|
|
\end{datadesc}
|
|
|
|
\begin{datadesc}{Py_TPFLAGS_HEAPTYPE}
|
|
This bit is set when the type object itself is allocated on the
|
|
heap. In this case, the \member{ob_type} field of its instances
|
|
is considered a reference to the type, and the type object is
|
|
INCREF'ed when a new instance is created, and DECREF'ed when an
|
|
instance is destroyed (this does not apply to instances of
|
|
subtypes; only the type referenced by the instance's ob_type gets
|
|
INCREF'ed or DECREF'ed).
|
|
\end{datadesc}
|
|
|
|
\begin{datadesc}{Py_TPFLAGS_BASETYPE}
|
|
This bit is set when the type can be used as the base type of
|
|
another type. If this bit is clear, the type cannot be subtyped
|
|
(similar to a "final" class in Java).
|
|
\end{datadesc}
|
|
|
|
\begin{datadesc}{Py_TPFLAGS_READY}
|
|
This bit is set when the type object has been fully initialized by
|
|
\cfunction{PyType_Ready()}.
|
|
\end{datadesc}
|
|
|
|
\begin{datadesc}{Py_TPFLAGS_READYING}
|
|
This bit is set while \cfunction{PyType_Ready()} is in the process
|
|
of initializing the type object.
|
|
\end{datadesc}
|
|
|
|
\begin{datadesc}{Py_TPFLAGS_HAVE_GC}
|
|
This bit is set when the object supports garbage collection. If
|
|
this bit is set, instances must be created using
|
|
\cfunction{PyObject_GC_New()} and destroyed using
|
|
\cfunction{PyObject_GC_Del()}. More information in section XXX
|
|
about garbage collection. This bit also implies that the
|
|
GC-related fields \member{tp_traverse} and \member{tp_clear} are
|
|
present in the type object; but those fields also exist when
|
|
\constant{Py_TPFLAGS_HAVE_GC} is clear but
|
|
\constant{Py_TPFLAGS_HAVE_RICHCOMPARE} is set.
|
|
\end{datadesc}
|
|
|
|
\begin{datadesc}{Py_TPFLAGS_DEFAULT}
|
|
This is a bitmask of all the bits that pertain to the existence of
|
|
certain fields in the type object and its extension structures.
|
|
Currently, it includes the following bits:
|
|
\constant{Py_TPFLAGS_HAVE_GETCHARBUFFER},
|
|
\constant{Py_TPFLAGS_HAVE_SEQUENCE_IN},
|
|
\constant{Py_TPFLAGS_HAVE_INPLACEOPS},
|
|
\constant{Py_TPFLAGS_HAVE_RICHCOMPARE},
|
|
\constant{Py_TPFLAGS_HAVE_WEAKREFS},
|
|
\constant{Py_TPFLAGS_HAVE_ITER}, and
|
|
\constant{Py_TPFLAGS_HAVE_CLASS}.
|
|
\end{datadesc}
|
|
\end{cmemberdesc}
|
|
|
|
\begin{cmemberdesc}{PyTypeObject}{char*}{tp_doc}
|
|
An optional pointer to a NUL-terminated C string giving the
|
|
docstring for this type object. This is exposed as the
|
|
\member{__doc__} attribute on the type and instances of the type.
|
|
|
|
This field is \emph{not} inherited by subtypes.
|
|
\end{cmemberdesc}
|
|
|
|
The following three fields only exist if the
|
|
\constant{Py_TPFLAGS_HAVE_RICHCOMPARE} flag bit is set.
|
|
|
|
\begin{cmemberdesc}{PyTypeObject}{traverseproc}{tp_traverse}
|
|
An optional pointer to a traversal function for the garbage
|
|
collector. This is only used if the \constant{Py_TPFLAGS_HAVE_GC}
|
|
flag bit is set. More information about Python's garbage collection
|
|
scheme can be found in section \ref{supporting-cycle-detection}.
|
|
|
|
The \member{tp_traverse} pointer is used by the garbage collector
|
|
to detect reference cycles. A typical implementation of a
|
|
\member{tp_traverse} function simply calls \cfunction{Py_VISIT()} on
|
|
each of the instance's members that are Python objects. For exampe, this
|
|
is function \cfunction{local_traverse} from the \module{thread} extension
|
|
module:
|
|
|
|
\begin{verbatim}
|
|
static int
|
|
local_traverse(localobject *self, visitproc visit, void *arg)
|
|
{
|
|
Py_VISIT(self->args);
|
|
Py_VISIT(self->kw);
|
|
Py_VISIT(self->dict);
|
|
return 0;
|
|
}
|
|
\end{verbatim}
|
|
|
|
Note that \cfunction{Py_VISIT()} is called only on those members that can
|
|
participate in reference cycles. Although there is also a
|
|
\samp{self->key} member, it can only be \NULL{} or a Python string and
|
|
therefore cannot be part of a reference cycle.
|
|
|
|
On the other hand, even if you know a member can never be part of a cycle,
|
|
as a debugging aid you may want to visit it anyway just so the
|
|
\module{gc} module's \function{get_referents()} function will include it.
|
|
|
|
Note that \cfunction{Py_VISIT()} requires the \var{visit} and \var{arg}
|
|
parameters to \cfunction{local_traverse} to have these specific names;
|
|
don't name them just anything.
|
|
|
|
This field is inherited by subtypes together with \member{tp_clear}
|
|
and the \constant{Py_TPFLAGS_HAVE_GC} flag bit: the flag bit,
|
|
\member{tp_traverse}, and \member{tp_clear} are all inherited from
|
|
the base type if they are all zero in the subtype \emph{and} the
|
|
subtype has the \constant{Py_TPFLAGS_HAVE_RICHCOMPARE} flag bit set.
|
|
\end{cmemberdesc}
|
|
|
|
\begin{cmemberdesc}{PyTypeObject}{inquiry}{tp_clear}
|
|
An optional pointer to a clear function for the garbage collector.
|
|
This is only used if the \constant{Py_TPFLAGS_HAVE_GC} flag bit is
|
|
set.
|
|
|
|
The \member{tp_clear} member function is used to break reference
|
|
cycles in cyclic garbage detected by the garbage collector. Taken
|
|
together, all \member{tp_clear} functions in the system must combine to
|
|
break all reference cycles. This is subtle, and if in any doubt supply a
|
|
\member{tp_clear} function. For example, the tuple type does not
|
|
implement a \member{tp_clear} function, because it's possible to prove
|
|
that no reference cycle can be composed entirely of tuples. Therefore
|
|
the \member{tp_clear} functions of other types must be sufficient to
|
|
break any cycle containing a tuple. This isn't immediately obvious, and
|
|
there's rarely a good reason to avoid implementing \member{tp_clear}.
|
|
|
|
Implementations of \member{tp_clear} should drop the instance's
|
|
references to those of its members that may be Python objects, and set
|
|
its pointers to those members to \NULL{}, as in the following example:
|
|
|
|
\begin{verbatim}
|
|
static int
|
|
local_clear(localobject *self)
|
|
{
|
|
Py_CLEAR(self->key);
|
|
Py_CLEAR(self->args);
|
|
Py_CLEAR(self->kw);
|
|
Py_CLEAR(self->dict);
|
|
return 0;
|
|
}
|
|
\end{verbatim}
|
|
|
|
The \cfunction{Py_CLEAR()} macro should be used, because clearing
|
|
references is delicate: the reference to the contained object must not be
|
|
decremented until after the pointer to the contained object is set to
|
|
\NULL{}. This is because decrementing the reference count may cause
|
|
the contained object to become trash, triggering a chain of reclamation
|
|
activity that may include invoking arbitrary Python code (due to
|
|
finalizers, or weakref callbacks, associated with the contained object).
|
|
If it's possible for such code to reference \var{self} again, it's
|
|
important that the pointer to the contained object be \NULL{} at that
|
|
time, so that \var{self} knows the contained object can no longer be
|
|
used. The \cfunction{Py_CLEAR()} macro performs the operations in a
|
|
safe order.
|
|
|
|
Because the goal of \member{tp_clear} functions is to break reference
|
|
cycles, it's not necessary to clear contained objects like Python strings
|
|
or Python integers, which can't participate in reference cycles.
|
|
On the other hand, it may be convenient to clear all contained Python
|
|
objects, and write the type's \member{tp_dealloc} function to
|
|
invoke \member{tp_clear}.
|
|
|
|
More information about Python's garbage collection
|
|
scheme can be found in section \ref{supporting-cycle-detection}.
|
|
|
|
This field is inherited by subtypes together with \member{tp_traverse}
|
|
and the \constant{Py_TPFLAGS_HAVE_GC} flag bit: the flag bit,
|
|
\member{tp_traverse}, and \member{tp_clear} are all inherited from
|
|
the base type if they are all zero in the subtype \emph{and} the
|
|
subtype has the \constant{Py_TPFLAGS_HAVE_RICHCOMPARE} flag bit set.
|
|
\end{cmemberdesc}
|
|
|
|
\begin{cmemberdesc}{PyTypeObject}{richcmpfunc}{tp_richcompare}
|
|
An optional pointer to the rich comparison function.
|
|
|
|
The signature is the same as for \cfunction{PyObject_RichCompare()}.
|
|
The function should return the result of the comparison (usually
|
|
\code{Py_True} or \code{Py_False}). If the comparison is undefined,
|
|
it must return \code{Py_NotImplemented}, if another error occurred
|
|
it must return \code{NULL} and set an exception condition.
|
|
|
|
This field is inherited by subtypes together with
|
|
\member{tp_compare} and \member{tp_hash}: a subtype inherits all
|
|
three of \member{tp_compare}, \member{tp_richcompare}, and
|
|
\member{tp_hash}, when the subtype's \member{tp_compare},
|
|
\member{tp_richcompare}, and \member{tp_hash} are all \NULL.
|
|
|
|
The following constants are defined to be used as the third argument
|
|
for \member{tp_richcompare} and for \cfunction{PyObject_RichCompare()}:
|
|
|
|
\begin{tableii}{l|c}{constant}{Constant}{Comparison}
|
|
\lineii{Py_LT}{\code{<}}
|
|
\lineii{Py_LE}{\code{<=}}
|
|
\lineii{Py_EQ}{\code{==}}
|
|
\lineii{Py_NE}{\code{!=}}
|
|
\lineii{Py_GT}{\code{>}}
|
|
\lineii{Py_GE}{\code{>=}}
|
|
\end{tableii}
|
|
\end{cmemberdesc}
|
|
|
|
The next field only exists if the \constant{Py_TPFLAGS_HAVE_WEAKREFS}
|
|
flag bit is set.
|
|
|
|
\begin{cmemberdesc}{PyTypeObject}{long}{tp_weaklistoffset}
|
|
If the instances of this type are weakly referenceable, this field
|
|
is greater than zero and contains the offset in the instance
|
|
structure of the weak reference list head (ignoring the GC header,
|
|
if present); this offset is used by
|
|
\cfunction{PyObject_ClearWeakRefs()} and the
|
|
\cfunction{PyWeakref_*()} functions. The instance structure needs
|
|
to include a field of type \ctype{PyObject*} which is initialized to
|
|
\NULL.
|
|
|
|
Do not confuse this field with \member{tp_weaklist}; that is the
|
|
list head for weak references to the type object itself.
|
|
|
|
This field is inherited by subtypes, but see the rules listed below.
|
|
A subtype may override this offset; this means that the subtype uses
|
|
a different weak reference list head than the base type. Since the
|
|
list head is always found via \member{tp_weaklistoffset}, this
|
|
should not be a problem.
|
|
|
|
When a type defined by a class statement has no \member{__slots__}
|
|
declaration, and none of its base types are weakly referenceable,
|
|
the type is made weakly referenceable by adding a weak reference
|
|
list head slot to the instance layout and setting the
|
|
\member{tp_weaklistoffset} of that slot's offset.
|
|
|
|
When a type's \member{__slots__} declaration contains a slot named
|
|
\member{__weakref__}, that slot becomes the weak reference list head
|
|
for instances of the type, and the slot's offset is stored in the
|
|
type's \member{tp_weaklistoffset}.
|
|
|
|
When a type's \member{__slots__} declaration does not contain a slot
|
|
named \member{__weakref__}, the type inherits its
|
|
\member{tp_weaklistoffset} from its base type.
|
|
\end{cmemberdesc}
|
|
|
|
The next two fields only exist if the
|
|
\constant{Py_TPFLAGS_HAVE_CLASS} flag bit is set.
|
|
|
|
\begin{cmemberdesc}{PyTypeObject}{getiterfunc}{tp_iter}
|
|
An optional pointer to a function that returns an iterator for the
|
|
object. Its presence normally signals that the instances of this
|
|
type are iterable (although sequences may be iterable without this
|
|
function, and classic instances always have this function, even if
|
|
they don't define an \method{__iter__()} method).
|
|
|
|
This function has the same signature as
|
|
\cfunction{PyObject_GetIter()}.
|
|
|
|
This field is inherited by subtypes.
|
|
\end{cmemberdesc}
|
|
|
|
\begin{cmemberdesc}{PyTypeObject}{iternextfunc}{tp_iternext}
|
|
An optional pointer to a function that returns the next item in an
|
|
iterator, or raises \exception{StopIteration} when the iterator is
|
|
exhausted. Its presence normally signals that the instances of this
|
|
type are iterators (although classic instances always have this
|
|
function, even if they don't define a \method{__next__()} method).
|
|
|
|
Iterator types should also define the \member{tp_iter} function, and
|
|
that function should return the iterator instance itself (not a new
|
|
iterator instance).
|
|
|
|
This function has the same signature as \cfunction{PyIter_Next()}.
|
|
|
|
This field is inherited by subtypes.
|
|
\end{cmemberdesc}
|
|
|
|
The next fields, up to and including \member{tp_weaklist}, only exist
|
|
if the \constant{Py_TPFLAGS_HAVE_CLASS} flag bit is set.
|
|
|
|
\begin{cmemberdesc}{PyTypeObject}{struct PyMethodDef*}{tp_methods}
|
|
An optional pointer to a static \NULL-terminated array of
|
|
\ctype{PyMethodDef} structures, declaring regular methods of this
|
|
type.
|
|
|
|
For each entry in the array, an entry is added to the type's
|
|
dictionary (see \member{tp_dict} below) containing a method
|
|
descriptor.
|
|
|
|
This field is not inherited by subtypes (methods are
|
|
inherited through a different mechanism).
|
|
\end{cmemberdesc}
|
|
|
|
\begin{cmemberdesc}{PyTypeObject}{struct PyMemberDef*}{tp_members}
|
|
An optional pointer to a static \NULL-terminated array of
|
|
\ctype{PyMemberDef} structures, declaring regular data members
|
|
(fields or slots) of instances of this type.
|
|
|
|
For each entry in the array, an entry is added to the type's
|
|
dictionary (see \member{tp_dict} below) containing a member
|
|
descriptor.
|
|
|
|
This field is not inherited by subtypes (members are inherited
|
|
through a different mechanism).
|
|
\end{cmemberdesc}
|
|
|
|
\begin{cmemberdesc}{PyTypeObject}{struct PyGetSetDef*}{tp_getset}
|
|
An optional pointer to a static \NULL-terminated array of
|
|
\ctype{PyGetSetDef} structures, declaring computed attributes of
|
|
instances of this type.
|
|
|
|
For each entry in the array, an entry is added to the type's
|
|
dictionary (see \member{tp_dict} below) containing a getset
|
|
descriptor.
|
|
|
|
This field is not inherited by subtypes (computed attributes are
|
|
inherited through a different mechanism).
|
|
|
|
Docs for PyGetSetDef (XXX belong elsewhere):
|
|
|
|
\begin{verbatim}
|
|
typedef PyObject *(*getter)(PyObject *, void *);
|
|
typedef int (*setter)(PyObject *, PyObject *, void *);
|
|
|
|
typedef struct PyGetSetDef {
|
|
char *name; /* attribute name */
|
|
getter get; /* C function to get the attribute */
|
|
setter set; /* C function to set the attribute */
|
|
char *doc; /* optional doc string */
|
|
void *closure; /* optional additional data for getter and setter */
|
|
} PyGetSetDef;
|
|
\end{verbatim}
|
|
\end{cmemberdesc}
|
|
|
|
\begin{cmemberdesc}{PyTypeObject}{PyTypeObject*}{tp_base}
|
|
An optional pointer to a base type from which type properties are
|
|
inherited. At this level, only single inheritance is supported;
|
|
multiple inheritance require dynamically creating a type object by
|
|
calling the metatype.
|
|
|
|
This field is not inherited by subtypes (obviously), but it defaults
|
|
to \code{\&PyBaseObject_Type} (which to Python programmers is known
|
|
as the type \class{object}).
|
|
\end{cmemberdesc}
|
|
|
|
\begin{cmemberdesc}{PyTypeObject}{PyObject*}{tp_dict}
|
|
The type's dictionary is stored here by \cfunction{PyType_Ready()}.
|
|
|
|
This field should normally be initialized to \NULL{} before
|
|
PyType_Ready is called; it may also be initialized to a dictionary
|
|
containing initial attributes for the type. Once
|
|
\cfunction{PyType_Ready()} has initialized the type, extra
|
|
attributes for the type may be added to this dictionary only if they
|
|
don't correspond to overloaded operations (like \method{__add__()}).
|
|
|
|
This field is not inherited by subtypes (though the attributes
|
|
defined in here are inherited through a different mechanism).
|
|
\end{cmemberdesc}
|
|
|
|
\begin{cmemberdesc}{PyTypeObject}{descrgetfunc}{tp_descr_get}
|
|
An optional pointer to a "descriptor get" function.
|
|
|
|
|
|
The function signature is
|
|
|
|
\begin{verbatim}
|
|
PyObject * tp_descr_get(PyObject *self, PyObject *obj, PyObject *type);
|
|
\end{verbatim}
|
|
|
|
XXX blah, blah.
|
|
|
|
This field is inherited by subtypes.
|
|
\end{cmemberdesc}
|
|
|
|
\begin{cmemberdesc}{PyTypeObject}{descrsetfunc}{tp_descr_set}
|
|
An optional pointer to a "descriptor set" function.
|
|
|
|
The function signature is
|
|
|
|
\begin{verbatim}
|
|
int tp_descr_set(PyObject *self, PyObject *obj, PyObject *value);
|
|
\end{verbatim}
|
|
|
|
This field is inherited by subtypes.
|
|
|
|
XXX blah, blah.
|
|
|
|
\end{cmemberdesc}
|
|
|
|
\begin{cmemberdesc}{PyTypeObject}{long}{tp_dictoffset}
|
|
If the instances of this type have a dictionary containing instance
|
|
variables, this field is non-zero and contains the offset in the
|
|
instances of the type of the instance variable dictionary; this
|
|
offset is used by \cfunction{PyObject_GenericGetAttr()}.
|
|
|
|
Do not confuse this field with \member{tp_dict}; that is the
|
|
dictionary for attributes of the type object itself.
|
|
|
|
If the value of this field is greater than zero, it specifies the
|
|
offset from the start of the instance structure. If the value is
|
|
less than zero, it specifies the offset from the \emph{end} of the
|
|
instance structure. A negative offset is more expensive to use, and
|
|
should only be used when the instance structure contains a
|
|
variable-length part. This is used for example to add an instance
|
|
variable dictionary to subtypes of \class{str} or \class{tuple}.
|
|
Note that the \member{tp_basicsize} field should account for the
|
|
dictionary added to the end in that case, even though the dictionary
|
|
is not included in the basic object layout. On a system with a
|
|
pointer size of 4 bytes, \member{tp_dictoffset} should be set to
|
|
\code{-4} to indicate that the dictionary is at the very end of the
|
|
structure.
|
|
|
|
The real dictionary offset in an instance can be computed from a
|
|
negative \member{tp_dictoffset} as follows:
|
|
|
|
\begin{verbatim}
|
|
dictoffset = tp_basicsize + abs(ob_size)*tp_itemsize + tp_dictoffset
|
|
if dictoffset is not aligned on sizeof(void*):
|
|
round up to sizeof(void*)
|
|
\end{verbatim}
|
|
|
|
where \member{tp_basicsize}, \member{tp_itemsize} and
|
|
\member{tp_dictoffset} are taken from the type object, and
|
|
\member{ob_size} is taken from the instance. The absolute value is
|
|
taken because long ints use the sign of \member{ob_size} to store
|
|
the sign of the number. (There's never a need to do this
|
|
calculation yourself; it is done for you by
|
|
\cfunction{_PyObject_GetDictPtr()}.)
|
|
|
|
This field is inherited by subtypes, but see the rules listed below.
|
|
A subtype may override this offset; this means that the subtype
|
|
instances store the dictionary at a difference offset than the base
|
|
type. Since the dictionary is always found via
|
|
\member{tp_dictoffset}, this should not be a problem.
|
|
|
|
When a type defined by a class statement has no \member{__slots__}
|
|
declaration, and none of its base types has an instance variable
|
|
dictionary, a dictionary slot is added to the instance layout and
|
|
the \member{tp_dictoffset} is set to that slot's offset.
|
|
|
|
When a type defined by a class statement has a \member{__slots__}
|
|
declaration, the type inherits its \member{tp_dictoffset} from its
|
|
base type.
|
|
|
|
(Adding a slot named \member{__dict__} to the \member{__slots__}
|
|
declaration does not have the expected effect, it just causes
|
|
confusion. Maybe this should be added as a feature just like
|
|
\member{__weakref__} though.)
|
|
\end{cmemberdesc}
|
|
|
|
\begin{cmemberdesc}{PyTypeObject}{initproc}{tp_init}
|
|
An optional pointer to an instance initialization function.
|
|
|
|
This function corresponds to the \method{__init__()} method of
|
|
classes. Like \method{__init__()}, it is possible to create an
|
|
instance without calling \method{__init__()}, and it is possible to
|
|
reinitialize an instance by calling its \method{__init__()} method
|
|
again.
|
|
|
|
The function signature is
|
|
|
|
\begin{verbatim}
|
|
int tp_init(PyObject *self, PyObject *args, PyObject *kwds)
|
|
\end{verbatim}
|
|
|
|
The self argument is the instance to be initialized; the \var{args}
|
|
and \var{kwds} arguments represent positional and keyword arguments
|
|
of the call to \method{__init__()}.
|
|
|
|
The \member{tp_init} function, if not \NULL, is called when an
|
|
instance is created normally by calling its type, after the type's
|
|
\member{tp_new} function has returned an instance of the type. If
|
|
the \member{tp_new} function returns an instance of some other type
|
|
that is not a subtype of the original type, no \member{tp_init}
|
|
function is called; if \member{tp_new} returns an instance of a
|
|
subtype of the original type, the subtype's \member{tp_init} is
|
|
called. (VERSION NOTE: described here is what is implemented in
|
|
Python 2.2.1 and later. In Python 2.2, the \member{tp_init} of the
|
|
type of the object returned by \member{tp_new} was always called, if
|
|
not \NULL.)
|
|
|
|
This field is inherited by subtypes.
|
|
\end{cmemberdesc}
|
|
|
|
\begin{cmemberdesc}{PyTypeObject}{allocfunc}{tp_alloc}
|
|
An optional pointer to an instance allocation function.
|
|
|
|
The function signature is
|
|
|
|
\begin{verbatim}
|
|
PyObject *tp_alloc(PyTypeObject *self, Py_ssize_t nitems)
|
|
\end{verbatim}
|
|
|
|
The purpose of this function is to separate memory allocation from
|
|
memory initialization. It should return a pointer to a block of
|
|
memory of adequate length for the instance, suitably aligned, and
|
|
initialized to zeros, but with \member{ob_refcnt} set to \code{1}
|
|
and \member{ob_type} set to the type argument. If the type's
|
|
\member{tp_itemsize} is non-zero, the object's \member{ob_size} field
|
|
should be initialized to \var{nitems} and the length of the
|
|
allocated memory block should be \code{tp_basicsize +
|
|
\var{nitems}*tp_itemsize}, rounded up to a multiple of
|
|
\code{sizeof(void*)}; otherwise, \var{nitems} is not used and the
|
|
length of the block should be \member{tp_basicsize}.
|
|
|
|
Do not use this function to do any other instance initialization,
|
|
not even to allocate additional memory; that should be done by
|
|
\member{tp_new}.
|
|
|
|
This field is inherited by static subtypes, but not by dynamic
|
|
subtypes (subtypes created by a class statement); in the latter,
|
|
this field is always set to \cfunction{PyType_GenericAlloc}, to
|
|
force a standard heap allocation strategy. That is also the
|
|
recommended value for statically defined types.
|
|
\end{cmemberdesc}
|
|
|
|
\begin{cmemberdesc}{PyTypeObject}{newfunc}{tp_new}
|
|
An optional pointer to an instance creation function.
|
|
|
|
If this function is \NULL{} for a particular type, that type cannot
|
|
be called to create new instances; presumably there is some other
|
|
way to create instances, like a factory function.
|
|
|
|
The function signature is
|
|
|
|
\begin{verbatim}
|
|
PyObject *tp_new(PyTypeObject *subtype, PyObject *args, PyObject *kwds)
|
|
\end{verbatim}
|
|
|
|
The subtype argument is the type of the object being created; the
|
|
\var{args} and \var{kwds} arguments represent positional and keyword
|
|
arguments of the call to the type. Note that subtype doesn't have
|
|
to equal the type whose \member{tp_new} function is called; it may
|
|
be a subtype of that type (but not an unrelated type).
|
|
|
|
The \member{tp_new} function should call
|
|
\code{\var{subtype}->tp_alloc(\var{subtype}, \var{nitems})} to
|
|
allocate space for the object, and then do only as much further
|
|
initialization as is absolutely necessary. Initialization that can
|
|
safely be ignored or repeated should be placed in the
|
|
\member{tp_init} handler. A good rule of thumb is that for
|
|
immutable types, all initialization should take place in
|
|
\member{tp_new}, while for mutable types, most initialization should
|
|
be deferred to \member{tp_init}.
|
|
|
|
This field is inherited by subtypes, except it is not inherited by
|
|
static types whose \member{tp_base} is \NULL{} or
|
|
\code{\&PyBaseObject_Type}. The latter exception is a precaution so
|
|
that old extension types don't become callable simply by being
|
|
linked with Python 2.2.
|
|
\end{cmemberdesc}
|
|
|
|
\begin{cmemberdesc}{PyTypeObject}{destructor}{tp_free}
|
|
An optional pointer to an instance deallocation function.
|
|
|
|
The signature of this function has changed slightly: in Python
|
|
2.2 and 2.2.1, its signature is \ctype{destructor}:
|
|
|
|
\begin{verbatim}
|
|
void tp_free(PyObject *)
|
|
\end{verbatim}
|
|
|
|
In Python 2.3 and beyond, its signature is \ctype{freefunc}:
|
|
|
|
\begin{verbatim}
|
|
void tp_free(void *)
|
|
\end{verbatim}
|
|
|
|
The only initializer that is compatible with both versions is
|
|
\code{_PyObject_Del}, whose definition has suitably adapted in
|
|
Python 2.3.
|
|
|
|
This field is inherited by static subtypes, but not by dynamic
|
|
subtypes (subtypes created by a class statement); in the latter,
|
|
this field is set to a deallocator suitable to match
|
|
\cfunction{PyType_GenericAlloc()} and the value of the
|
|
\constant{Py_TPFLAGS_HAVE_GC} flag bit.
|
|
\end{cmemberdesc}
|
|
|
|
\begin{cmemberdesc}{PyTypeObject}{inquiry}{tp_is_gc}
|
|
An optional pointer to a function called by the garbage collector.
|
|
|
|
The garbage collector needs to know whether a particular object is
|
|
collectible or not. Normally, it is sufficient to look at the
|
|
object's type's \member{tp_flags} field, and check the
|
|
\constant{Py_TPFLAGS_HAVE_GC} flag bit. But some types have a
|
|
mixture of statically and dynamically allocated instances, and the
|
|
statically allocated instances are not collectible. Such types
|
|
should define this function; it should return \code{1} for a
|
|
collectible instance, and \code{0} for a non-collectible instance.
|
|
The signature is
|
|
|
|
\begin{verbatim}
|
|
int tp_is_gc(PyObject *self)
|
|
\end{verbatim}
|
|
|
|
(The only example of this are types themselves. The metatype,
|
|
\cdata{PyType_Type}, defines this function to distinguish between
|
|
statically and dynamically allocated types.)
|
|
|
|
This field is inherited by subtypes. (VERSION NOTE: in Python
|
|
2.2, it was not inherited. It is inherited in 2.2.1 and later
|
|
versions.)
|
|
\end{cmemberdesc}
|
|
|
|
\begin{cmemberdesc}{PyTypeObject}{PyObject*}{tp_bases}
|
|
Tuple of base types.
|
|
|
|
This is set for types created by a class statement. It should be
|
|
\NULL{} for statically defined types.
|
|
|
|
This field is not inherited.
|
|
\end{cmemberdesc}
|
|
|
|
\begin{cmemberdesc}{PyTypeObject}{PyObject*}{tp_mro}
|
|
Tuple containing the expanded set of base types, starting with the
|
|
type itself and ending with \class{object}, in Method Resolution
|
|
Order.
|
|
|
|
This field is not inherited; it is calculated fresh by
|
|
\cfunction{PyType_Ready()}.
|
|
\end{cmemberdesc}
|
|
|
|
\begin{cmemberdesc}{PyTypeObject}{PyObject*}{tp_cache}
|
|
Unused. Not inherited. Internal use only.
|
|
\end{cmemberdesc}
|
|
|
|
\begin{cmemberdesc}{PyTypeObject}{PyObject*}{tp_subclasses}
|
|
List of weak references to subclasses. Not inherited. Internal
|
|
use only.
|
|
\end{cmemberdesc}
|
|
|
|
\begin{cmemberdesc}{PyTypeObject}{PyObject*}{tp_weaklist}
|
|
Weak reference list head, for weak references to this type
|
|
object. Not inherited. Internal use only.
|
|
\end{cmemberdesc}
|
|
|
|
The remaining fields are only defined if the feature test macro
|
|
\constant{COUNT_ALLOCS} is defined, and are for internal use only.
|
|
They are documented here for completeness. None of these fields are
|
|
inherited by subtypes.
|
|
|
|
\begin{cmemberdesc}{PyTypeObject}{Py_ssize_t}{tp_allocs}
|
|
Number of allocations.
|
|
\end{cmemberdesc}
|
|
|
|
\begin{cmemberdesc}{PyTypeObject}{Py_ssize_t}{tp_frees}
|
|
Number of frees.
|
|
\end{cmemberdesc}
|
|
|
|
\begin{cmemberdesc}{PyTypeObject}{Py_ssize_t}{tp_maxalloc}
|
|
Maximum simultaneously allocated objects.
|
|
\end{cmemberdesc}
|
|
|
|
\begin{cmemberdesc}{PyTypeObject}{PyTypeObject*}{tp_next}
|
|
Pointer to the next type object with a non-zero \member{tp_allocs}
|
|
field.
|
|
\end{cmemberdesc}
|
|
|
|
Also, note that, in a garbage collected Python, tp_dealloc may be
|
|
called from any Python thread, not just the thread which created the
|
|
object (if the object becomes part of a refcount cycle, that cycle
|
|
might be collected by a garbage collection on any thread). This is
|
|
not a problem for Python API calls, since the thread on which
|
|
tp_dealloc is called will own the Global Interpreter Lock (GIL).
|
|
However, if the object being destroyed in turn destroys objects from
|
|
some other C or \Cpp{} library, care should be taken to ensure that
|
|
destroying those objects on the thread which called tp_dealloc will
|
|
not violate any assumptions of the library.
|
|
|
|
\section{Mapping Object Structures \label{mapping-structs}}
|
|
|
|
\begin{ctypedesc}{PyMappingMethods}
|
|
Structure used to hold pointers to the functions used to implement
|
|
the mapping protocol for an extension type.
|
|
\end{ctypedesc}
|
|
|
|
|
|
\section{Number Object Structures \label{number-structs}}
|
|
|
|
\begin{ctypedesc}{PyNumberMethods}
|
|
Structure used to hold pointers to the functions an extension type
|
|
uses to implement the number protocol.
|
|
\end{ctypedesc}
|
|
|
|
|
|
\section{Sequence Object Structures \label{sequence-structs}}
|
|
|
|
\begin{ctypedesc}{PySequenceMethods}
|
|
Structure used to hold pointers to the functions which an object
|
|
uses to implement the sequence protocol.
|
|
\end{ctypedesc}
|
|
|
|
|
|
\section{Buffer Object Structures \label{buffer-structs}}
|
|
\sectionauthor{Greg J. Stein}{greg@lyra.org}
|
|
|
|
The buffer interface exports a model where an object can expose its
|
|
internal data as a set of chunks of data, where each chunk is
|
|
specified as a pointer/length pair. These chunks are called
|
|
\dfn{segments} and are presumed to be non-contiguous in memory.
|
|
|
|
If an object does not export the buffer interface, then its
|
|
\member{tp_as_buffer} member in the \ctype{PyTypeObject} structure
|
|
should be \NULL. Otherwise, the \member{tp_as_buffer} will point to
|
|
a \ctype{PyBufferProcs} structure.
|
|
|
|
\note{It is very important that your \ctype{PyTypeObject} structure
|
|
uses \constant{Py_TPFLAGS_DEFAULT} for the value of the
|
|
\member{tp_flags} member rather than \code{0}. This tells the Python
|
|
runtime that your \ctype{PyBufferProcs} structure contains the
|
|
\member{bf_getcharbuffer} slot. Older versions of Python did not have
|
|
this member, so a new Python interpreter using an old extension needs
|
|
to be able to test for its presence before using it.}
|
|
|
|
\begin{ctypedesc}{PyBufferProcs}
|
|
Structure used to hold the function pointers which define an
|
|
implementation of the buffer protocol.
|
|
|
|
The first slot is \member{bf_getreadbuffer}, of type
|
|
\ctype{getreadbufferproc}. If this slot is \NULL, then the object
|
|
does not support reading from the internal data. This is
|
|
non-sensical, so implementors should fill this in, but callers
|
|
should test that the slot contains a non-\NULL{} value.
|
|
|
|
The next slot is \member{bf_getwritebuffer} having type
|
|
\ctype{getwritebufferproc}. This slot may be \NULL{} if the object
|
|
does not allow writing into its returned buffers.
|
|
|
|
The third slot is \member{bf_getsegcount}, with type
|
|
\ctype{getsegcountproc}. This slot must not be \NULL{} and is used
|
|
to inform the caller how many segments the object contains. Simple
|
|
objects such as \ctype{PyString_Type} and \ctype{PyBuffer_Type}
|
|
objects contain a single segment.
|
|
|
|
The last slot is \member{bf_getcharbuffer}, of type
|
|
\ctype{getcharbufferproc}. This slot will only be present if the
|
|
\constant{Py_TPFLAGS_HAVE_GETCHARBUFFER} flag is present in the
|
|
\member{tp_flags} field of the object's \ctype{PyTypeObject}.
|
|
Before using this slot, the caller should test whether it is present
|
|
by using the
|
|
\cfunction{PyType_HasFeature()}\ttindex{PyType_HasFeature()}
|
|
function. If the flag is present, \member{bf_getcharbuffer} may be
|
|
\NULL,
|
|
indicating that the object's
|
|
contents cannot be used as \emph{8-bit characters}.
|
|
The slot function may also raise an error if the object's contents
|
|
cannot be interpreted as 8-bit characters. For example, if the
|
|
object is an array which is configured to hold floating point
|
|
values, an exception may be raised if a caller attempts to use
|
|
\member{bf_getcharbuffer} to fetch a sequence of 8-bit characters.
|
|
This notion of exporting the internal buffers as ``text'' is used to
|
|
distinguish between objects that are binary in nature, and those
|
|
which have character-based content.
|
|
|
|
\note{The current policy seems to state that these characters
|
|
may be multi-byte characters. This implies that a buffer size of
|
|
\var{N} does not mean there are \var{N} characters present.}
|
|
\end{ctypedesc}
|
|
|
|
\begin{datadesc}{Py_TPFLAGS_HAVE_GETCHARBUFFER}
|
|
Flag bit set in the type structure to indicate that the
|
|
\member{bf_getcharbuffer} slot is known. This being set does not
|
|
indicate that the object supports the buffer interface or that the
|
|
\member{bf_getcharbuffer} slot is non-\NULL.
|
|
\end{datadesc}
|
|
|
|
\begin{ctypedesc}[getreadbufferproc]{Py_ssize_t (*readbufferproc)
|
|
(PyObject *self, Py_ssize_t segment, void **ptrptr)}
|
|
Return a pointer to a readable segment of the buffer in
|
|
\code{*\var{ptrptr}}. This function
|
|
is allowed to raise an exception, in which case it must return
|
|
\code{-1}. The \var{segment} which is specified must be zero or
|
|
positive, and strictly less than the number of segments returned by
|
|
the \member{bf_getsegcount} slot function. On success, it returns
|
|
the length of the segment, and sets \code{*\var{ptrptr}} to a
|
|
pointer to that memory.
|
|
\end{ctypedesc}
|
|
|
|
\begin{ctypedesc}[getwritebufferproc]{Py_ssize_t (*writebufferproc)
|
|
(PyObject *self, Py_ssize_t segment, void **ptrptr)}
|
|
Return a pointer to a writable memory buffer in
|
|
\code{*\var{ptrptr}}, and the length of that segment as the function
|
|
return value. The memory buffer must correspond to buffer segment
|
|
\var{segment}. Must return \code{-1} and set an exception on
|
|
error. \exception{TypeError} should be raised if the object only
|
|
supports read-only buffers, and \exception{SystemError} should be
|
|
raised when \var{segment} specifies a segment that doesn't exist.
|
|
% Why doesn't it raise ValueError for this one?
|
|
% GJS: because you shouldn't be calling it with an invalid
|
|
% segment. That indicates a blatant programming error in the C
|
|
% code.
|
|
\end{ctypedesc}
|
|
|
|
\begin{ctypedesc}[getsegcountproc]{Py_ssize_t (*segcountproc)
|
|
(PyObject *self, Py_ssize_t *lenp)}
|
|
Return the number of memory segments which comprise the buffer. If
|
|
\var{lenp} is not \NULL, the implementation must report the sum of
|
|
the sizes (in bytes) of all segments in \code{*\var{lenp}}.
|
|
The function cannot fail.
|
|
\end{ctypedesc}
|
|
|
|
\begin{ctypedesc}[getcharbufferproc]{Py_ssize_t (*charbufferproc)
|
|
(PyObject *self, Py_ssize_t segment, const char **ptrptr)}
|
|
Return the size of the segment \var{segment} that \var{ptrptr}
|
|
is set to. \code{*\var{ptrptr}} is set to the memory buffer.
|
|
Returns \code{-1} on error.
|
|
\end{ctypedesc}
|
|
|
|
|
|
\section{Supporting the Iterator Protocol
|
|
\label{supporting-iteration}}
|
|
|
|
|
|
\section{Supporting Cyclic Garbage Collection
|
|
\label{supporting-cycle-detection}}
|
|
|
|
Python's support for detecting and collecting garbage which involves
|
|
circular references requires support from object types which are
|
|
``containers'' for other objects which may also be containers. Types
|
|
which do not store references to other objects, or which only store
|
|
references to atomic types (such as numbers or strings), do not need
|
|
to provide any explicit support for garbage collection.
|
|
|
|
An example showing the use of these interfaces can be found in
|
|
``\ulink{Supporting the Cycle
|
|
Collector}{../ext/example-cycle-support.html}'' in
|
|
\citetitle[../ext/ext.html]{Extending and Embedding the Python
|
|
Interpreter}.
|
|
|
|
To create a container type, the \member{tp_flags} field of the type
|
|
object must include the \constant{Py_TPFLAGS_HAVE_GC} and provide an
|
|
implementation of the \member{tp_traverse} handler. If instances of the
|
|
type are mutable, a \member{tp_clear} implementation must also be
|
|
provided.
|
|
|
|
\begin{datadesc}{Py_TPFLAGS_HAVE_GC}
|
|
Objects with a type with this flag set must conform with the rules
|
|
documented here. For convenience these objects will be referred to
|
|
as container objects.
|
|
\end{datadesc}
|
|
|
|
Constructors for container types must conform to two rules:
|
|
|
|
\begin{enumerate}
|
|
\item The memory for the object must be allocated using
|
|
\cfunction{PyObject_GC_New()} or \cfunction{PyObject_GC_VarNew()}.
|
|
|
|
\item Once all the fields which may contain references to other
|
|
containers are initialized, it must call
|
|
\cfunction{PyObject_GC_Track()}.
|
|
\end{enumerate}
|
|
|
|
\begin{cfuncdesc}{\var{TYPE}*}{PyObject_GC_New}{TYPE, PyTypeObject *type}
|
|
Analogous to \cfunction{PyObject_New()} but for container objects with
|
|
the \constant{Py_TPFLAGS_HAVE_GC} flag set.
|
|
\end{cfuncdesc}
|
|
|
|
\begin{cfuncdesc}{\var{TYPE}*}{PyObject_GC_NewVar}{TYPE, PyTypeObject *type,
|
|
Py_ssize_t size}
|
|
Analogous to \cfunction{PyObject_NewVar()} but for container objects
|
|
with the \constant{Py_TPFLAGS_HAVE_GC} flag set.
|
|
\end{cfuncdesc}
|
|
|
|
\begin{cfuncdesc}{PyVarObject *}{PyObject_GC_Resize}{PyVarObject *op, Py_ssize_t}
|
|
Resize an object allocated by \cfunction{PyObject_NewVar()}. Returns
|
|
the resized object or \NULL{} on failure.
|
|
\end{cfuncdesc}
|
|
|
|
\begin{cfuncdesc}{void}{PyObject_GC_Track}{PyObject *op}
|
|
Adds the object \var{op} to the set of container objects tracked by
|
|
the collector. The collector can run at unexpected times so objects
|
|
must be valid while being tracked. This should be called once all
|
|
the fields followed by the \member{tp_traverse} handler become valid,
|
|
usually near the end of the constructor.
|
|
\end{cfuncdesc}
|
|
|
|
\begin{cfuncdesc}{void}{_PyObject_GC_TRACK}{PyObject *op}
|
|
A macro version of \cfunction{PyObject_GC_Track()}. It should not be
|
|
used for extension modules.
|
|
\end{cfuncdesc}
|
|
|
|
Similarly, the deallocator for the object must conform to a similar
|
|
pair of rules:
|
|
|
|
\begin{enumerate}
|
|
\item Before fields which refer to other containers are invalidated,
|
|
\cfunction{PyObject_GC_UnTrack()} must be called.
|
|
|
|
\item The object's memory must be deallocated using
|
|
\cfunction{PyObject_GC_Del()}.
|
|
\end{enumerate}
|
|
|
|
\begin{cfuncdesc}{void}{PyObject_GC_Del}{void *op}
|
|
Releases memory allocated to an object using
|
|
\cfunction{PyObject_GC_New()} or \cfunction{PyObject_GC_NewVar()}.
|
|
\end{cfuncdesc}
|
|
|
|
\begin{cfuncdesc}{void}{PyObject_GC_UnTrack}{void *op}
|
|
Remove the object \var{op} from the set of container objects tracked
|
|
by the collector. Note that \cfunction{PyObject_GC_Track()} can be
|
|
called again on this object to add it back to the set of tracked
|
|
objects. The deallocator (\member{tp_dealloc} handler) should call
|
|
this for the object before any of the fields used by the
|
|
\member{tp_traverse} handler become invalid.
|
|
\end{cfuncdesc}
|
|
|
|
\begin{cfuncdesc}{void}{_PyObject_GC_UNTRACK}{PyObject *op}
|
|
A macro version of \cfunction{PyObject_GC_UnTrack()}. It should not be
|
|
used for extension modules.
|
|
\end{cfuncdesc}
|
|
|
|
The \member{tp_traverse} handler accepts a function parameter of this
|
|
type:
|
|
|
|
\begin{ctypedesc}[visitproc]{int (*visitproc)(PyObject *object, void *arg)}
|
|
Type of the visitor function passed to the \member{tp_traverse}
|
|
handler. The function should be called with an object to traverse
|
|
as \var{object} and the third parameter to the \member{tp_traverse}
|
|
handler as \var{arg}. The Python core uses several visitor functions
|
|
to implement cyclic garbage detection; it's not expected that users will
|
|
need to write their own visitor functions.
|
|
\end{ctypedesc}
|
|
|
|
The \member{tp_traverse} handler must have the following type:
|
|
|
|
\begin{ctypedesc}[traverseproc]{int (*traverseproc)(PyObject *self,
|
|
visitproc visit, void *arg)}
|
|
Traversal function for a container object. Implementations must
|
|
call the \var{visit} function for each object directly contained by
|
|
\var{self}, with the parameters to \var{visit} being the contained
|
|
object and the \var{arg} value passed to the handler. The \var{visit}
|
|
function must not be called with a \NULL{} object argument. If
|
|
\var{visit} returns a non-zero value
|
|
that value should be returned immediately.
|
|
\end{ctypedesc}
|
|
|
|
To simplify writing \member{tp_traverse} handlers, a
|
|
\cfunction{Py_VISIT()} macro is provided. In order to use this macro,
|
|
the \member{tp_traverse} implementation must name its arguments
|
|
exactly \var{visit} and \var{arg}:
|
|
|
|
\begin{cfuncdesc}{void}{Py_VISIT}{PyObject *o}
|
|
Call the \var{visit} callback, with arguments \var{o} and \var{arg}.
|
|
If \var{visit} returns a non-zero value, then return it. Using this
|
|
macro, \member{tp_traverse} handlers look like:
|
|
|
|
\begin{verbatim}
|
|
static int
|
|
my_traverse(Noddy *self, visitproc visit, void *arg)
|
|
{
|
|
Py_VISIT(self->foo);
|
|
Py_VISIT(self->bar);
|
|
return 0;
|
|
}
|
|
\end{verbatim}
|
|
|
|
\versionadded{2.4}
|
|
\end{cfuncdesc}
|
|
|
|
|
|
The \member{tp_clear} handler must be of the \ctype{inquiry} type, or
|
|
\NULL{} if the object is immutable.
|
|
|
|
\begin{ctypedesc}[inquiry]{int (*inquiry)(PyObject *self)}
|
|
Drop references that may have created reference cycles. Immutable
|
|
objects do not have to define this method since they can never
|
|
directly create reference cycles. Note that the object must still
|
|
be valid after calling this method (don't just call
|
|
\cfunction{Py_DECREF()} on a reference). The collector will call
|
|
this method if it detects that this object is involved in a
|
|
reference cycle.
|
|
\end{ctypedesc}
|