mirror of
https://github.com/python/cpython.git
synced 2024-11-23 18:04:37 +08:00
00ee7baf49
which unfortunately means the errors from the bytes type change somewhat: bytes([300]) still raises a ValueError, but bytes([10**100]) now raises a TypeError (either that, or bytes(1.0) also raises a ValueError -- PyNumber_AsSsize_t() can only raise one type of exception.) Merged revisions 51188-51433 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r51189 | kurt.kaiser | 2006-08-10 19:11:09 +0200 (Thu, 10 Aug 2006) | 4 lines Retrieval of previous shell command was not always preserving indentation since 1.2a1) Patch 1528468 Tal Einat. ........ r51190 | guido.van.rossum | 2006-08-10 19:41:07 +0200 (Thu, 10 Aug 2006) | 3 lines Chris McDonough's patch to defend against certain DoS attacks on FieldStorage. SF bug #1112549. ........ r51191 | guido.van.rossum | 2006-08-10 19:42:50 +0200 (Thu, 10 Aug 2006) | 2 lines News item for SF bug 1112549. ........ r51192 | guido.van.rossum | 2006-08-10 20:09:25 +0200 (Thu, 10 Aug 2006) | 2 lines Fix title -- it's rc1, not beta3. ........ r51194 | martin.v.loewis | 2006-08-10 21:04:00 +0200 (Thu, 10 Aug 2006) | 3 lines Update dangling references to the 3.2 database to mention that this is UCD 4.1 now. ........ r51195 | tim.peters | 2006-08-11 00:45:34 +0200 (Fri, 11 Aug 2006) | 6 lines Followup to bug #1069160. PyThreadState_SetAsyncExc(): internal correctness changes wrt refcount safety and deadlock avoidance. Also added a basic test case (relying on ctypes) and repaired the docs. ........ r51196 | tim.peters | 2006-08-11 00:48:45 +0200 (Fri, 11 Aug 2006) | 2 lines Whitespace normalization. ........ r51197 | tim.peters | 2006-08-11 01:22:13 +0200 (Fri, 11 Aug 2006) | 5 lines Whitespace normalization broke test_cgi, because a line of quoted test data relied on preserving a single trailing blank. Changed the string from raw to regular, and forced in the trailing blank via an explicit \x20 escape. ........ r51198 | tim.peters | 2006-08-11 02:49:01 +0200 (Fri, 11 Aug 2006) | 10 lines test_PyThreadState_SetAsyncExc(): This is failing on some 64-bit boxes. I have no idea what the ctypes docs mean by "integers", and blind-guessing here that it intended to mean the signed C "int" type, in which case perhaps I can repair this by feeding the thread id argument to type ctypes.c_long(). Also made the worker thread daemonic, so it doesn't hang Python shutdown if the test continues to fail. ........ r51199 | tim.peters | 2006-08-11 05:49:10 +0200 (Fri, 11 Aug 2006) | 6 lines force_test_exit(): This has been completely ineffective at stopping test_signal from hanging forever on the Tru64 buildbot. That could be because there's no such thing as signal.SIGALARM. Changed to the idiotic (but standard) signal.SIGALRM instead, and added some more debug output. ........ r51202 | neal.norwitz | 2006-08-11 08:09:41 +0200 (Fri, 11 Aug 2006) | 6 lines Fix the failures on cygwin (2006-08-10 fixed the actual locking issue). The first hunk changes the colon to an ! like other Windows variants. We need to always wait on the child so the lock gets released and no other tests fail. This is the try/finally in the second hunk. ........ r51205 | georg.brandl | 2006-08-11 09:15:38 +0200 (Fri, 11 Aug 2006) | 3 lines Add Chris McDonough (latest cgi.py patch) ........ r51206 | georg.brandl | 2006-08-11 09:26:10 +0200 (Fri, 11 Aug 2006) | 3 lines logging's atexit hook now runs even if the rest of the module has already been cleaned up. ........ r51212 | thomas.wouters | 2006-08-11 17:02:39 +0200 (Fri, 11 Aug 2006) | 4 lines Add ignore of *.pyc and *.pyo to Lib/xml/etree/. ........ r51215 | thomas.heller | 2006-08-11 21:55:35 +0200 (Fri, 11 Aug 2006) | 7 lines When a ctypes C callback function is called, zero out the result storage before converting the result to C data. See the comment in the code for details. Provide a better context for errors when the conversion of a callback function's result cannot be converted. ........ r51218 | neal.norwitz | 2006-08-12 03:43:40 +0200 (Sat, 12 Aug 2006) | 6 lines Klocwork made another run and found a bunch more problems. This is the first batch of fixes that should be easy to verify based on context. This fixes problem numbers: 220 (ast), 323-324 (symtable), 321-322 (structseq), 215 (array), 210 (hotshot), 182 (codecs), 209 (etree). ........ r51219 | neal.norwitz | 2006-08-12 03:45:47 +0200 (Sat, 12 Aug 2006) | 9 lines Even though _Py_Mangle() isn't truly public anyone can call it and there was no verification that privateobj was a PyString. If it wasn't a string, this could have allowed a NULL pointer to creep in below and crash. I wonder if this should be PyString_CheckExact? Must identifiers be strings or can they be subclasses? Klocwork #275 ........ r51220 | neal.norwitz | 2006-08-12 03:46:42 +0200 (Sat, 12 Aug 2006) | 5 lines It's highly unlikely, though possible for PyEval_Get*() to return NULLs. So be safe and do an XINCREF. Klocwork # 221-222. ........ r51221 | neal.norwitz | 2006-08-12 03:47:59 +0200 (Sat, 12 Aug 2006) | 7 lines This code is actually not used unless WITHOUT_COMPLEX is defined. However, there was no error checking that PyFloat_FromDouble returned a valid pointer. I believe this change is correct as it seemed to follow other code in the area. Klocwork # 292. ........ r51222 | neal.norwitz | 2006-08-12 03:49:12 +0200 (Sat, 12 Aug 2006) | 5 lines Handle NULL nodes while parsing. I'm not entirely sure this is correct. There might be something else that needs to be done to setup the error. Klocwork #295. ........ r51223 | neal.norwitz | 2006-08-12 03:50:38 +0200 (Sat, 12 Aug 2006) | 6 lines If _stat_float_times is false, we will try to INCREF ival which could be NULL. Return early in that case. The caller checks for PyErr_Occurred so this should be ok. Klocwork #297 ........ r51224 | neal.norwitz | 2006-08-12 03:51:12 +0200 (Sat, 12 Aug 2006) | 3 lines Move the assert which checks for a NULL pointer first. Klocwork #274. ........ r51225 | neal.norwitz | 2006-08-12 03:53:28 +0200 (Sat, 12 Aug 2006) | 5 lines Try to handle a malloc failure. I'm not entirely sure this is correct. There might be something else we need to do to handle the exception. Klocwork # 212-213 ........ r51226 | neal.norwitz | 2006-08-12 03:57:47 +0200 (Sat, 12 Aug 2006) | 6 lines I'm not sure why this code allocates this string for the error message. I think it would be better to always use snprintf and have the format limit the size of the name appropriately (like %.200s). Klocwork #340 ........ r51227 | neal.norwitz | 2006-08-12 04:06:34 +0200 (Sat, 12 Aug 2006) | 3 lines Check returned pointer is valid. Klocwork #233 ........ r51228 | neal.norwitz | 2006-08-12 04:12:30 +0200 (Sat, 12 Aug 2006) | 1 line Whoops, how did that get in there. :-) Revert all the parts of 51227 that were not supposed to go it. Only Modules/_ctypes/cfields.c was supposed to be changed ........ r51229 | neal.norwitz | 2006-08-12 04:33:36 +0200 (Sat, 12 Aug 2006) | 4 lines Don't deref v if it's NULL. Klocwork #214 ........ r51230 | neal.norwitz | 2006-08-12 05:16:54 +0200 (Sat, 12 Aug 2006) | 5 lines Check return of PyMem_MALLOC (garbage) is non-NULL. Check seq in both portions of if/else. Klocwork #289-290. ........ r51231 | neal.norwitz | 2006-08-12 05:17:41 +0200 (Sat, 12 Aug 2006) | 4 lines PyModule_GetDict() can fail, produce fatal errors if this happens on startup. Klocwork #298-299. ........ r51232 | neal.norwitz | 2006-08-12 05:18:50 +0200 (Sat, 12 Aug 2006) | 5 lines Verify verdat which is returned from malloc is not NULL. Ensure we don't pass NULL to free. Klocwork #306 (at least the first part, checking malloc) ........ r51233 | tim.peters | 2006-08-12 06:42:47 +0200 (Sat, 12 Aug 2006) | 35 lines test_signal: Signal handling on the Tru64 buildbot appears to be utterly insane. Plug some theoretical insecurities in the test script: - Verify that the SIGALRM handler was actually installed. - Don't call alarm() before the handler is installed. - Move everything that can fail inside the try/finally, so the test cleans up after itself more often. - Try sending all the expected signals in force_test_exit(), not just SIGALRM. Since that was fixed to actually send SIGALRM (instead of invisibly dying with an AttributeError), we've seen that sending SIGALRM alone does not stop this from hanging. - Move the "kill the child" business into the finally clause, so the child doesn't survive test failure to send SIGALRM to other tests later (there are also baffling SIGALRM-related failures in test_socket). - Cancel the alarm in the finally clause -- if the test dies early, we again don't want SIGALRM showing up to confuse a later test. Alas, this still relies on timing luck wrt the spawned script that sends the test signals, but it's hard to see how waiting for seconds can so often be so unlucky. test_threadedsignals: curiously, this test never fails on Tru64, but doesn't normally signal SIGALRM. Anyway, fixed an obvious (but probably inconsequential) logic error. ........ r51234 | tim.peters | 2006-08-12 07:17:41 +0200 (Sat, 12 Aug 2006) | 8 lines Ah, fudge. One of the prints here actually "shouldn't be" protected by "if verbose:", which caused the test to fail on all non-Windows boxes. Note that I deliberately didn't convert this to unittest yet, because I expect it would be even harder to debug this on Tru64 after conversion. ........ r51235 | georg.brandl | 2006-08-12 10:32:02 +0200 (Sat, 12 Aug 2006) | 3 lines Repair logging test spew caused by rev. 51206. ........ r51236 | neal.norwitz | 2006-08-12 19:03:09 +0200 (Sat, 12 Aug 2006) | 8 lines Patch #1538606, Patch to fix __index__() clipping. I modified this patch some by fixing style, some error checking, and adding XXX comments. This patch requires review and some changes are to be expected. I'm checking in now to get the greatest possible review and establish a baseline for moving forward. I don't want this to hold up release if possible. ........ r51238 | neal.norwitz | 2006-08-12 20:44:06 +0200 (Sat, 12 Aug 2006) | 10 lines Fix a couple of bugs exposed by the new __index__ code. The 64-bit buildbots were failing due to inappropriate clipping of numbers larger than 2**31 with new-style classes. (typeobject.c) In reviewing the code for classic classes, there were 2 problems. Any negative value return could be returned. Always return -1 if there was an error. Also make the checks similar with the new-style classes. I believe this is correct for 32 and 64 bit boxes, including Windows64. Add a test of classic classes too. ........ r51240 | neal.norwitz | 2006-08-13 02:20:49 +0200 (Sun, 13 Aug 2006) | 1 line SF bug #1539336, distutils example code missing ........ r51245 | neal.norwitz | 2006-08-13 20:10:10 +0200 (Sun, 13 Aug 2006) | 6 lines Move/copy assert for tstate != NULL before first use. Verify that PyEval_Get{Globals,Locals} returned valid pointers. Klocwork 231-232 ........ r51246 | neal.norwitz | 2006-08-13 20:10:28 +0200 (Sun, 13 Aug 2006) | 5 lines Handle a whole lot of failures from PyString_FromInternedString(). Should fix most of Klocwork 234-272. ........ r51247 | neal.norwitz | 2006-08-13 20:10:47 +0200 (Sun, 13 Aug 2006) | 8 lines cpathname could be NULL if it was longer than MAXPATHLEN. Don't try to write the .pyc to NULL. Check results of PyList_GetItem() and PyModule_GetDict() are not NULL. Klocwork 282, 283, 285 ........ r51248 | neal.norwitz | 2006-08-13 20:11:08 +0200 (Sun, 13 Aug 2006) | 6 lines Fix segfault when doing string formatting on subclasses of long if __oct__, __hex__ don't return a string. Klocwork 308 ........ r51250 | neal.norwitz | 2006-08-13 20:11:27 +0200 (Sun, 13 Aug 2006) | 5 lines Check return result of PyModule_GetDict(). Fix a bunch of refleaks in the init of the module. This would only be found when running python -v. ........ r51251 | neal.norwitz | 2006-08-13 20:11:43 +0200 (Sun, 13 Aug 2006) | 5 lines Handle malloc and fopen failures more gracefully. Klocwork 180-181 ........ r51252 | neal.norwitz | 2006-08-13 20:12:03 +0200 (Sun, 13 Aug 2006) | 7 lines It's very unlikely, though possible that source is not a string. Verify that PyString_AsString() returns a valid pointer. (The problem can arise when zlib.decompress doesn't return a string.) Klocwork 346 ........ r51253 | neal.norwitz | 2006-08-13 20:12:26 +0200 (Sun, 13 Aug 2006) | 5 lines Handle failures from lookup. Klocwork 341-342 ........ r51254 | neal.norwitz | 2006-08-13 20:12:45 +0200 (Sun, 13 Aug 2006) | 6 lines Handle failure from PyModule_GetDict() (Klocwork 208). Fix a bunch of refleaks in the init of the module. This would only be found when running python -v. ........ r51255 | neal.norwitz | 2006-08-13 20:13:02 +0200 (Sun, 13 Aug 2006) | 4 lines Really address the issue of where to place the assert for leftblock. (Followup of Klocwork 274) ........ r51256 | neal.norwitz | 2006-08-13 20:13:36 +0200 (Sun, 13 Aug 2006) | 4 lines Handle malloc failure. Klocwork 281 ........ r51258 | neal.norwitz | 2006-08-13 20:40:39 +0200 (Sun, 13 Aug 2006) | 4 lines Handle alloca failures. Klocwork 225-228 ........ r51259 | neal.norwitz | 2006-08-13 20:41:15 +0200 (Sun, 13 Aug 2006) | 1 line Get rid of compiler warning ........ r51261 | neal.norwitz | 2006-08-14 02:51:15 +0200 (Mon, 14 Aug 2006) | 1 line Ignore pgen.exe and kill_python.exe for cygwin ........ r51262 | neal.norwitz | 2006-08-14 02:59:03 +0200 (Mon, 14 Aug 2006) | 4 lines Can't return NULL from a void function. If there is a memory error, about the best we can do is call PyErr_WriteUnraisable and go on. We won't be able to do the call below either, so verify delstr is valid. ........ r51263 | neal.norwitz | 2006-08-14 03:49:54 +0200 (Mon, 14 Aug 2006) | 1 line Update purify doc some. ........ r51264 | thomas.heller | 2006-08-14 09:13:05 +0200 (Mon, 14 Aug 2006) | 2 lines Remove unused, buggy test function. Fixes klockwork issue #207. ........ r51265 | thomas.heller | 2006-08-14 09:14:09 +0200 (Mon, 14 Aug 2006) | 2 lines Check for NULL return value from new_CArgObject(). Fixes klockwork issues #183, #184, #185. ........ r51266 | thomas.heller | 2006-08-14 09:50:14 +0200 (Mon, 14 Aug 2006) | 2 lines Check for NULL return value of GenericCData_new(). Fixes klockwork issues #188, #189. ........ r51274 | thomas.heller | 2006-08-14 12:02:24 +0200 (Mon, 14 Aug 2006) | 2 lines Revert the change that tries to zero out a closure's result storage area because the size if unknown in source/callproc.c. ........ r51276 | marc-andre.lemburg | 2006-08-14 12:55:19 +0200 (Mon, 14 Aug 2006) | 11 lines Slightly revised version of patch #1538956: Replace UnicodeDecodeErrors raised during == and != compares of Unicode and other objects with a new UnicodeWarning. All other comparisons continue to raise exceptions. Exceptions other than UnicodeDecodeErrors are also left untouched. ........ r51277 | thomas.heller | 2006-08-14 13:17:48 +0200 (Mon, 14 Aug 2006) | 13 lines Apply the patch #1532975 plus ideas from the patch #1533481. ctypes instances no longer have the internal and undocumented '_as_parameter_' attribute which was used to adapt them to foreign function calls; this mechanism is replaced by a function pointer in the type's stgdict. In the 'from_param' class methods, try the _as_parameter_ attribute if other conversions are not possible. This makes the documented _as_parameter_ mechanism work as intended. Change the ctypes version number to 1.0.1. ........ r51278 | marc-andre.lemburg | 2006-08-14 13:44:34 +0200 (Mon, 14 Aug 2006) | 3 lines Readd NEWS items that were accidentally removed by r51276. ........ r51279 | georg.brandl | 2006-08-14 14:36:06 +0200 (Mon, 14 Aug 2006) | 3 lines Improve markup in PyUnicode_RichCompare. ........ r51280 | marc-andre.lemburg | 2006-08-14 14:57:27 +0200 (Mon, 14 Aug 2006) | 3 lines Correct an accidentally removed previous patch. ........ r51281 | thomas.heller | 2006-08-14 18:17:41 +0200 (Mon, 14 Aug 2006) | 3 lines Patch #1536908: Add support for AMD64 / OpenBSD. Remove the -no-stack-protector compiler flag for OpenBSD as it has been reported to be unneeded. ........ r51282 | thomas.heller | 2006-08-14 18:20:04 +0200 (Mon, 14 Aug 2006) | 1 line News item for rev 51281. ........ r51283 | georg.brandl | 2006-08-14 22:25:39 +0200 (Mon, 14 Aug 2006) | 3 lines Fix refleak introduced in rev. 51248. ........ r51284 | georg.brandl | 2006-08-14 23:34:08 +0200 (Mon, 14 Aug 2006) | 5 lines Make tabnanny recognize IndentationErrors raised by tokenize. Add a test to test_inspect to make sure indented source is recognized correctly. (fixes #1224621) ........ r51285 | georg.brandl | 2006-08-14 23:42:55 +0200 (Mon, 14 Aug 2006) | 3 lines Patch #1535500: fix segfault in BZ2File.writelines and make sure it raises the correct exceptions. ........ r51287 | georg.brandl | 2006-08-14 23:45:32 +0200 (Mon, 14 Aug 2006) | 3 lines Add an additional test: BZ2File write methods should raise IOError when file is read-only. ........ r51289 | georg.brandl | 2006-08-14 23:55:28 +0200 (Mon, 14 Aug 2006) | 3 lines Patch #1536071: trace.py should now find the full module name of a file correctly even on Windows. ........ r51290 | georg.brandl | 2006-08-15 00:01:24 +0200 (Tue, 15 Aug 2006) | 3 lines Cookie.py shouldn't "bogusly" use string._idmap. ........ r51291 | georg.brandl | 2006-08-15 00:10:24 +0200 (Tue, 15 Aug 2006) | 3 lines Patch #1511317: don't crash on invalid hostname info ........ r51292 | tim.peters | 2006-08-15 02:25:04 +0200 (Tue, 15 Aug 2006) | 2 lines Whitespace normalization. ........ r51293 | neal.norwitz | 2006-08-15 06:14:57 +0200 (Tue, 15 Aug 2006) | 3 lines Georg fixed one of my bugs, so I'll repay him with 2 NEWS entries. Now we're even. :-) ........ r51295 | neal.norwitz | 2006-08-15 06:58:28 +0200 (Tue, 15 Aug 2006) | 8 lines Fix the test for SocketServer so it should pass on cygwin and not fail sporadically on other platforms. This is really a band-aid that doesn't fix the underlying issue in SocketServer. It's not clear if it's worth it to fix SocketServer, however, I opened a bug to track it: http://python.org/sf/1540386 ........ r51296 | neal.norwitz | 2006-08-15 06:59:30 +0200 (Tue, 15 Aug 2006) | 3 lines Update the docstring to use a version a little newer than 1999. This was taken from a Debian patch. Should we update the version for each release? ........ r51298 | neal.norwitz | 2006-08-15 08:29:03 +0200 (Tue, 15 Aug 2006) | 2 lines Subclasses of int/long are allowed to define an __index__. ........ r51300 | thomas.heller | 2006-08-15 15:07:21 +0200 (Tue, 15 Aug 2006) | 1 line Check for NULL return value from new_CArgObject calls. ........ r51303 | kurt.kaiser | 2006-08-16 05:15:26 +0200 (Wed, 16 Aug 2006) | 2 lines The 'with' statement is now a Code Context block opener ........ r51304 | anthony.baxter | 2006-08-16 05:42:26 +0200 (Wed, 16 Aug 2006) | 1 line preparing for 2.5c1 ........ r51305 | anthony.baxter | 2006-08-16 05:58:37 +0200 (Wed, 16 Aug 2006) | 1 line preparing for 2.5c1 - no, really this time ........ r51306 | kurt.kaiser | 2006-08-16 07:01:42 +0200 (Wed, 16 Aug 2006) | 9 lines Patch #1540892: site.py Quitter() class attempts to close sys.stdin before raising SystemExit, allowing IDLE to honor quit() and exit(). M Lib/site.py M Lib/idlelib/PyShell.py M Lib/idlelib/CREDITS.txt M Lib/idlelib/NEWS.txt M Misc/NEWS ........ r51307 | ka-ping.yee | 2006-08-16 09:02:50 +0200 (Wed, 16 Aug 2006) | 6 lines Update code and tests to support the 'bytes_le' attribute (for little-endian byte order on Windows), and to work around clocks with low resolution yielding duplicate UUIDs. Anthony Baxter has approved this change. ........ r51308 | kurt.kaiser | 2006-08-16 09:04:17 +0200 (Wed, 16 Aug 2006) | 2 lines Get quit() and exit() to work cleanly when not using subprocess. ........ r51309 | marc-andre.lemburg | 2006-08-16 10:13:26 +0200 (Wed, 16 Aug 2006) | 2 lines Revert to having static version numbers again. ........ r51310 | martin.v.loewis | 2006-08-16 14:55:10 +0200 (Wed, 16 Aug 2006) | 2 lines Build _hashlib on Windows. Build OpenSSL with masm assembler code. Fixes #1535502. ........ r51311 | thomas.heller | 2006-08-16 15:03:11 +0200 (Wed, 16 Aug 2006) | 6 lines Add commented assert statements to check that the result of PyObject_stgdict() and PyType_stgdict() calls are non-NULL before dereferencing the result. Hopefully this fixes what klocwork is complaining about. Fix a few other nits as well. ........ r51312 | anthony.baxter | 2006-08-16 15:08:25 +0200 (Wed, 16 Aug 2006) | 1 line news entry for 51307 ........ r51313 | andrew.kuchling | 2006-08-16 15:22:20 +0200 (Wed, 16 Aug 2006) | 1 line Add UnicodeWarning ........ r51314 | andrew.kuchling | 2006-08-16 15:41:52 +0200 (Wed, 16 Aug 2006) | 1 line Bump document version to 1.0; remove pystone paragraph ........ r51315 | andrew.kuchling | 2006-08-16 15:51:32 +0200 (Wed, 16 Aug 2006) | 1 line Link to docs; remove an XXX comment ........ r51316 | martin.v.loewis | 2006-08-16 15:58:51 +0200 (Wed, 16 Aug 2006) | 1 line Make cl build step compile-only (/c). Remove libs from source list. ........ r51317 | thomas.heller | 2006-08-16 16:07:44 +0200 (Wed, 16 Aug 2006) | 5 lines The __repr__ method of a NULL py_object does no longer raise an exception. Remove a stray '?' character from the exception text when the value is retrieved of such an object. Includes tests. ........ r51318 | andrew.kuchling | 2006-08-16 16:18:23 +0200 (Wed, 16 Aug 2006) | 1 line Update bug/patch counts ........ r51319 | andrew.kuchling | 2006-08-16 16:21:14 +0200 (Wed, 16 Aug 2006) | 1 line Wording/typo fixes ........ r51320 | thomas.heller | 2006-08-16 17:10:12 +0200 (Wed, 16 Aug 2006) | 9 lines Remove the special casing of Py_None when converting the return value of the Python part of a callback function to C. If it cannot be converted, call PyErr_WriteUnraisable with the exception we got. Before, arbitrary data has been passed to the calling C code in this case. (I'm not really sure the NEWS entry is understandable, but I cannot find better words) ........ r51321 | marc-andre.lemburg | 2006-08-16 18:11:01 +0200 (Wed, 16 Aug 2006) | 2 lines Add NEWS item mentioning the reverted distutils version number patch. ........ r51322 | fredrik.lundh | 2006-08-16 18:47:07 +0200 (Wed, 16 Aug 2006) | 5 lines SF#1534630 ignore data that arrives before the opening start tag ........ r51324 | andrew.kuchling | 2006-08-16 19:11:18 +0200 (Wed, 16 Aug 2006) | 1 line Grammar fix ........ r51328 | thomas.heller | 2006-08-16 20:02:11 +0200 (Wed, 16 Aug 2006) | 12 lines Tutorial: Clarify somewhat how parameters are passed to functions (especially explain what integer means). Correct the table - Python integers and longs can both be used. Further clarification to the table comparing ctypes types, Python types, and C types. Reference: Replace integer by C ``int`` where it makes sense. ........ r51329 | kurt.kaiser | 2006-08-16 23:45:59 +0200 (Wed, 16 Aug 2006) | 8 lines File menu hotkeys: there were three 'p' assignments. Reassign the 'Save Copy As' and 'Print' hotkeys to 'y' and 't'. Change the Shell menu hotkey from 's' to 'l'. M Bindings.py M PyShell.py M NEWS.txt ........ r51330 | neil.schemenauer | 2006-08-17 01:38:05 +0200 (Thu, 17 Aug 2006) | 3 lines Fix a bug in the ``compiler`` package that caused invalid code to be generated for generator expressions. ........ r51342 | martin.v.loewis | 2006-08-17 21:19:32 +0200 (Thu, 17 Aug 2006) | 3 lines Merge 51340 and 51341 from 2.5 branch: Leave tk build directory to restore original path. Invoke debug mk1mf.pl after running Configure. ........ r51354 | martin.v.loewis | 2006-08-18 05:47:18 +0200 (Fri, 18 Aug 2006) | 3 lines Bug #1541863: uuid.uuid1 failed to generate unique identifiers on systems with low clock resolution. ........ r51355 | neal.norwitz | 2006-08-18 05:57:54 +0200 (Fri, 18 Aug 2006) | 1 line Add template for 2.6 on HEAD ........ r51356 | neal.norwitz | 2006-08-18 06:01:38 +0200 (Fri, 18 Aug 2006) | 1 line More post-release wibble ........ r51357 | neal.norwitz | 2006-08-18 06:58:33 +0200 (Fri, 18 Aug 2006) | 1 line Try to get Windows bots working again ........ r51358 | neal.norwitz | 2006-08-18 07:10:00 +0200 (Fri, 18 Aug 2006) | 1 line Try to get Windows bots working again. Take 2 ........ r51359 | neal.norwitz | 2006-08-18 07:39:20 +0200 (Fri, 18 Aug 2006) | 1 line Try to get Unix bots install working again. ........ r51360 | neal.norwitz | 2006-08-18 07:41:46 +0200 (Fri, 18 Aug 2006) | 1 line Set version to 2.6a0, seems more consistent. ........ r51362 | neal.norwitz | 2006-08-18 08:14:52 +0200 (Fri, 18 Aug 2006) | 1 line More version wibble ........ r51364 | georg.brandl | 2006-08-18 09:27:59 +0200 (Fri, 18 Aug 2006) | 4 lines Bug #1541682: Fix example in the "Refcount details" API docs. Additionally, remove a faulty example showing PySequence_SetItem applied to a newly created list object and add notes that this isn't a good idea. ........ r51366 | anthony.baxter | 2006-08-18 09:29:02 +0200 (Fri, 18 Aug 2006) | 3 lines Updating IDLE's version number to match Python's (as per python-dev discussion). ........ r51367 | anthony.baxter | 2006-08-18 09:30:07 +0200 (Fri, 18 Aug 2006) | 1 line RPM specfile updates ........ r51368 | georg.brandl | 2006-08-18 09:35:47 +0200 (Fri, 18 Aug 2006) | 2 lines Typo in tp_clear docs. ........ r51378 | andrew.kuchling | 2006-08-18 15:57:13 +0200 (Fri, 18 Aug 2006) | 1 line Minor edits ........ r51379 | thomas.heller | 2006-08-18 16:38:46 +0200 (Fri, 18 Aug 2006) | 6 lines Add asserts to check for 'impossible' NULL values, with comments. In one place where I'n not 1000% sure about the non-NULL, raise a RuntimeError for safety. This should fix the klocwork issues that Neal sent me. If so, it should be applied to the release25-maint branch also. ........ r51400 | neal.norwitz | 2006-08-19 06:22:33 +0200 (Sat, 19 Aug 2006) | 5 lines Move initialization of interned strings to before allocating the object so we don't leak op. (Fixes an earlier patch to this code) Klockwork #350 ........ r51401 | neal.norwitz | 2006-08-19 06:23:04 +0200 (Sat, 19 Aug 2006) | 4 lines Move assert to after NULL check, otherwise we deref NULL in the assert. Klocwork #307 ........ r51402 | neal.norwitz | 2006-08-19 06:25:29 +0200 (Sat, 19 Aug 2006) | 2 lines SF #1542693: Remove semi-colon at end of PyImport_ImportModuleEx macro ........ r51403 | neal.norwitz | 2006-08-19 06:28:55 +0200 (Sat, 19 Aug 2006) | 6 lines Move initialization to after the asserts for non-NULL values. Klocwork 286-287. (I'm not backporting this, but if someone wants to, feel free.) ........ r51404 | neal.norwitz | 2006-08-19 06:52:03 +0200 (Sat, 19 Aug 2006) | 6 lines Handle PyString_FromInternedString() failing (unlikely, but possible). Klocwork #325 (I'm not backporting this, but if someone wants to, feel free.) ........ r51416 | georg.brandl | 2006-08-20 15:15:39 +0200 (Sun, 20 Aug 2006) | 2 lines Patch #1542948: fix urllib2 header casing issue. With new test. ........ r51428 | jeremy.hylton | 2006-08-21 18:19:37 +0200 (Mon, 21 Aug 2006) | 3 lines Move peephole optimizer to separate file. ........ r51429 | jeremy.hylton | 2006-08-21 18:20:29 +0200 (Mon, 21 Aug 2006) | 2 lines Move peephole optimizer to separate file. (Forgot .h in previous checkin.) ........ r51432 | neal.norwitz | 2006-08-21 19:59:46 +0200 (Mon, 21 Aug 2006) | 5 lines Fix bug #1543303, tarfile adds padding that breaks gunzip. Patch # 1543897. Will backport to 2.5 ........ r51433 | neal.norwitz | 2006-08-21 20:01:30 +0200 (Mon, 21 Aug 2006) | 2 lines Add assert to make Klocwork happy (#276) ........
1190 lines
37 KiB
C++
1190 lines
37 KiB
C++
#ifndef Py_ABSTRACTOBJECT_H
|
|
#define Py_ABSTRACTOBJECT_H
|
|
#ifdef __cplusplus
|
|
extern "C" {
|
|
#endif
|
|
|
|
#ifdef PY_SSIZE_T_CLEAN
|
|
#define PyObject_CallFunction _PyObject_CallFunction_SizeT
|
|
#define PyObject_CallMethod _PyObject_CallMethod_SizeT
|
|
#endif
|
|
|
|
/* Abstract Object Interface (many thanks to Jim Fulton) */
|
|
|
|
/*
|
|
PROPOSAL: A Generic Python Object Interface for Python C Modules
|
|
|
|
Problem
|
|
|
|
Python modules written in C that must access Python objects must do
|
|
so through routines whose interfaces are described by a set of
|
|
include files. Unfortunately, these routines vary according to the
|
|
object accessed. To use these routines, the C programmer must check
|
|
the type of the object being used and must call a routine based on
|
|
the object type. For example, to access an element of a sequence,
|
|
the programmer must determine whether the sequence is a list or a
|
|
tuple:
|
|
|
|
if(is_tupleobject(o))
|
|
e=gettupleitem(o,i)
|
|
else if(is_listitem(o))
|
|
e=getlistitem(o,i)
|
|
|
|
If the programmer wants to get an item from another type of object
|
|
that provides sequence behavior, there is no clear way to do it
|
|
correctly.
|
|
|
|
The persistent programmer may peruse object.h and find that the
|
|
_typeobject structure provides a means of invoking up to (currently
|
|
about) 41 special operators. So, for example, a routine can get an
|
|
item from any object that provides sequence behavior. However, to
|
|
use this mechanism, the programmer must make their code dependent on
|
|
the current Python implementation.
|
|
|
|
Also, certain semantics, especially memory management semantics, may
|
|
differ by the type of object being used. Unfortunately, these
|
|
semantics are not clearly described in the current include files.
|
|
An abstract interface providing more consistent semantics is needed.
|
|
|
|
Proposal
|
|
|
|
I propose the creation of a standard interface (with an associated
|
|
library of routines and/or macros) for generically obtaining the
|
|
services of Python objects. This proposal can be viewed as one
|
|
components of a Python C interface consisting of several components.
|
|
|
|
From the viewpoint of C access to Python services, we have (as
|
|
suggested by Guido in off-line discussions):
|
|
|
|
- "Very high level layer": two or three functions that let you exec or
|
|
eval arbitrary Python code given as a string in a module whose name is
|
|
given, passing C values in and getting C values out using
|
|
mkvalue/getargs style format strings. This does not require the user
|
|
to declare any variables of type "PyObject *". This should be enough
|
|
to write a simple application that gets Python code from the user,
|
|
execs it, and returns the output or errors. (Error handling must also
|
|
be part of this API.)
|
|
|
|
- "Abstract objects layer": which is the subject of this proposal.
|
|
It has many functions operating on objects, and lest you do many
|
|
things from C that you can also write in Python, without going
|
|
through the Python parser.
|
|
|
|
- "Concrete objects layer": This is the public type-dependent
|
|
interface provided by the standard built-in types, such as floats,
|
|
strings, and lists. This interface exists and is currently
|
|
documented by the collection of include files provided with the
|
|
Python distributions.
|
|
|
|
From the point of view of Python accessing services provided by C
|
|
modules:
|
|
|
|
- "Python module interface": this interface consist of the basic
|
|
routines used to define modules and their members. Most of the
|
|
current extensions-writing guide deals with this interface.
|
|
|
|
- "Built-in object interface": this is the interface that a new
|
|
built-in type must provide and the mechanisms and rules that a
|
|
developer of a new built-in type must use and follow.
|
|
|
|
This proposal is a "first-cut" that is intended to spur
|
|
discussion. See especially the lists of notes.
|
|
|
|
The Python C object interface will provide four protocols: object,
|
|
numeric, sequence, and mapping. Each protocol consists of a
|
|
collection of related operations. If an operation that is not
|
|
provided by a particular type is invoked, then a standard exception,
|
|
NotImplementedError is raised with a operation name as an argument.
|
|
In addition, for convenience this interface defines a set of
|
|
constructors for building objects of built-in types. This is needed
|
|
so new objects can be returned from C functions that otherwise treat
|
|
objects generically.
|
|
|
|
Memory Management
|
|
|
|
For all of the functions described in this proposal, if a function
|
|
retains a reference to a Python object passed as an argument, then the
|
|
function will increase the reference count of the object. It is
|
|
unnecessary for the caller to increase the reference count of an
|
|
argument in anticipation of the object's retention.
|
|
|
|
All Python objects returned from functions should be treated as new
|
|
objects. Functions that return objects assume that the caller will
|
|
retain a reference and the reference count of the object has already
|
|
been incremented to account for this fact. A caller that does not
|
|
retain a reference to an object that is returned from a function
|
|
must decrement the reference count of the object (using
|
|
DECREF(object)) to prevent memory leaks.
|
|
|
|
Note that the behavior mentioned here is different from the current
|
|
behavior for some objects (e.g. lists and tuples) when certain
|
|
type-specific routines are called directly (e.g. setlistitem). The
|
|
proposed abstraction layer will provide a consistent memory
|
|
management interface, correcting for inconsistent behavior for some
|
|
built-in types.
|
|
|
|
Protocols
|
|
|
|
xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx*/
|
|
|
|
/* Object Protocol: */
|
|
|
|
/* Implemented elsewhere:
|
|
|
|
int PyObject_Print(PyObject *o, FILE *fp, int flags);
|
|
|
|
Print an object, o, on file, fp. Returns -1 on
|
|
error. The flags argument is used to enable certain printing
|
|
options. The only option currently supported is Py_Print_RAW.
|
|
|
|
(What should be said about Py_Print_RAW?)
|
|
|
|
*/
|
|
|
|
/* Implemented elsewhere:
|
|
|
|
int PyObject_HasAttrString(PyObject *o, char *attr_name);
|
|
|
|
Returns 1 if o has the attribute attr_name, and 0 otherwise.
|
|
This is equivalent to the Python expression:
|
|
hasattr(o,attr_name).
|
|
|
|
This function always succeeds.
|
|
|
|
*/
|
|
|
|
/* Implemented elsewhere:
|
|
|
|
PyObject* PyObject_GetAttrString(PyObject *o, char *attr_name);
|
|
|
|
Retrieve an attributed named attr_name form object o.
|
|
Returns the attribute value on success, or NULL on failure.
|
|
This is the equivalent of the Python expression: o.attr_name.
|
|
|
|
*/
|
|
|
|
/* Implemented elsewhere:
|
|
|
|
int PyObject_HasAttr(PyObject *o, PyObject *attr_name);
|
|
|
|
Returns 1 if o has the attribute attr_name, and 0 otherwise.
|
|
This is equivalent to the Python expression:
|
|
hasattr(o,attr_name).
|
|
|
|
This function always succeeds.
|
|
|
|
*/
|
|
|
|
/* Implemented elsewhere:
|
|
|
|
PyObject* PyObject_GetAttr(PyObject *o, PyObject *attr_name);
|
|
|
|
Retrieve an attributed named attr_name form object o.
|
|
Returns the attribute value on success, or NULL on failure.
|
|
This is the equivalent of the Python expression: o.attr_name.
|
|
|
|
*/
|
|
|
|
|
|
/* Implemented elsewhere:
|
|
|
|
int PyObject_SetAttrString(PyObject *o, char *attr_name, PyObject *v);
|
|
|
|
Set the value of the attribute named attr_name, for object o,
|
|
to the value, v. Returns -1 on failure. This is
|
|
the equivalent of the Python statement: o.attr_name=v.
|
|
|
|
*/
|
|
|
|
/* Implemented elsewhere:
|
|
|
|
int PyObject_SetAttr(PyObject *o, PyObject *attr_name, PyObject *v);
|
|
|
|
Set the value of the attribute named attr_name, for object o,
|
|
to the value, v. Returns -1 on failure. This is
|
|
the equivalent of the Python statement: o.attr_name=v.
|
|
|
|
*/
|
|
|
|
/* implemented as a macro:
|
|
|
|
int PyObject_DelAttrString(PyObject *o, char *attr_name);
|
|
|
|
Delete attribute named attr_name, for object o. Returns
|
|
-1 on failure. This is the equivalent of the Python
|
|
statement: del o.attr_name.
|
|
|
|
*/
|
|
#define PyObject_DelAttrString(O,A) PyObject_SetAttrString((O),(A),NULL)
|
|
|
|
/* implemented as a macro:
|
|
|
|
int PyObject_DelAttr(PyObject *o, PyObject *attr_name);
|
|
|
|
Delete attribute named attr_name, for object o. Returns -1
|
|
on failure. This is the equivalent of the Python
|
|
statement: del o.attr_name.
|
|
|
|
*/
|
|
#define PyObject_DelAttr(O,A) PyObject_SetAttr((O),(A),NULL)
|
|
|
|
PyAPI_FUNC(int) PyObject_Cmp(PyObject *o1, PyObject *o2, int *result);
|
|
|
|
/*
|
|
Compare the values of o1 and o2 using a routine provided by
|
|
o1, if one exists, otherwise with a routine provided by o2.
|
|
The result of the comparison is returned in result. Returns
|
|
-1 on failure. This is the equivalent of the Python
|
|
statement: result=cmp(o1,o2).
|
|
|
|
*/
|
|
|
|
/* Implemented elsewhere:
|
|
|
|
int PyObject_Compare(PyObject *o1, PyObject *o2);
|
|
|
|
Compare the values of o1 and o2 using a routine provided by
|
|
o1, if one exists, otherwise with a routine provided by o2.
|
|
Returns the result of the comparison on success. On error,
|
|
the value returned is undefined. This is equivalent to the
|
|
Python expression: cmp(o1,o2).
|
|
|
|
*/
|
|
|
|
/* Implemented elsewhere:
|
|
|
|
PyObject *PyObject_Repr(PyObject *o);
|
|
|
|
Compute the string representation of object, o. Returns the
|
|
string representation on success, NULL on failure. This is
|
|
the equivalent of the Python expression: repr(o).
|
|
|
|
Called by the repr() built-in function and by reverse quotes.
|
|
|
|
*/
|
|
|
|
/* Implemented elsewhere:
|
|
|
|
PyObject *PyObject_Str(PyObject *o);
|
|
|
|
Compute the string representation of object, o. Returns the
|
|
string representation on success, NULL on failure. This is
|
|
the equivalent of the Python expression: str(o).)
|
|
|
|
Called by the str() built-in function and by the print
|
|
statement.
|
|
|
|
*/
|
|
|
|
/* Implemented elsewhere:
|
|
|
|
PyObject *PyObject_Unicode(PyObject *o);
|
|
|
|
Compute the unicode representation of object, o. Returns the
|
|
unicode representation on success, NULL on failure. This is
|
|
the equivalent of the Python expression: unistr(o).)
|
|
|
|
Called by the unistr() built-in function.
|
|
|
|
*/
|
|
|
|
PyAPI_FUNC(int) PyCallable_Check(PyObject *o);
|
|
|
|
/*
|
|
Determine if the object, o, is callable. Return 1 if the
|
|
object is callable and 0 otherwise.
|
|
|
|
This function always succeeds.
|
|
*/
|
|
|
|
PyAPI_FUNC(PyObject *) PyObject_Call(PyObject *callable_object,
|
|
PyObject *args, PyObject *kw);
|
|
|
|
/*
|
|
Call a callable Python object, callable_object, with
|
|
arguments and keywords arguments. The 'args' argument can not be
|
|
NULL, but the 'kw' argument can be NULL.
|
|
*/
|
|
|
|
PyAPI_FUNC(PyObject *) PyObject_CallObject(PyObject *callable_object,
|
|
PyObject *args);
|
|
|
|
/*
|
|
Call a callable Python object, callable_object, with
|
|
arguments given by the tuple, args. If no arguments are
|
|
needed, then args may be NULL. Returns the result of the
|
|
call on success, or NULL on failure. This is the equivalent
|
|
of the Python expression: o(*args).
|
|
*/
|
|
|
|
PyAPI_FUNC(PyObject *) PyObject_CallFunction(PyObject *callable_object,
|
|
char *format, ...);
|
|
|
|
/*
|
|
Call a callable Python object, callable_object, with a
|
|
variable number of C arguments. The C arguments are described
|
|
using a mkvalue-style format string. The format may be NULL,
|
|
indicating that no arguments are provided. Returns the
|
|
result of the call on success, or NULL on failure. This is
|
|
the equivalent of the Python expression: o(*args).
|
|
*/
|
|
|
|
|
|
PyAPI_FUNC(PyObject *) PyObject_CallMethod(PyObject *o, char *method,
|
|
char *format, ...);
|
|
|
|
/*
|
|
Call the method named m of object o with a variable number of
|
|
C arguments. The C arguments are described by a mkvalue
|
|
format string. The format may be NULL, indicating that no
|
|
arguments are provided. Returns the result of the call on
|
|
success, or NULL on failure. This is the equivalent of the
|
|
Python expression: o.method(args).
|
|
*/
|
|
|
|
PyAPI_FUNC(PyObject *) _PyObject_CallFunction_SizeT(PyObject *callable,
|
|
char *format, ...);
|
|
PyAPI_FUNC(PyObject *) _PyObject_CallMethod_SizeT(PyObject *o,
|
|
char *name,
|
|
char *format, ...);
|
|
|
|
PyAPI_FUNC(PyObject *) PyObject_CallFunctionObjArgs(PyObject *callable,
|
|
...);
|
|
|
|
/*
|
|
Call a callable Python object, callable_object, with a
|
|
variable number of C arguments. The C arguments are provided
|
|
as PyObject * values, terminated by a NULL. Returns the
|
|
result of the call on success, or NULL on failure. This is
|
|
the equivalent of the Python expression: o(*args).
|
|
*/
|
|
|
|
|
|
PyAPI_FUNC(PyObject *) PyObject_CallMethodObjArgs(PyObject *o,
|
|
PyObject *method, ...);
|
|
|
|
/*
|
|
Call the method named m of object o with a variable number of
|
|
C arguments. The C arguments are provided as PyObject *
|
|
values, terminated by NULL. Returns the result of the call
|
|
on success, or NULL on failure. This is the equivalent of
|
|
the Python expression: o.method(args).
|
|
*/
|
|
|
|
|
|
/* Implemented elsewhere:
|
|
|
|
long PyObject_Hash(PyObject *o);
|
|
|
|
Compute and return the hash, hash_value, of an object, o. On
|
|
failure, return -1. This is the equivalent of the Python
|
|
expression: hash(o).
|
|
*/
|
|
|
|
|
|
/* Implemented elsewhere:
|
|
|
|
int PyObject_IsTrue(PyObject *o);
|
|
|
|
Returns 1 if the object, o, is considered to be true, 0 if o is
|
|
considered to be false and -1 on failure. This is equivalent to the
|
|
Python expression: not not o
|
|
*/
|
|
|
|
/* Implemented elsewhere:
|
|
|
|
int PyObject_Not(PyObject *o);
|
|
|
|
Returns 0 if the object, o, is considered to be true, 1 if o is
|
|
considered to be false and -1 on failure. This is equivalent to the
|
|
Python expression: not o
|
|
*/
|
|
|
|
PyAPI_FUNC(PyObject *) PyObject_Type(PyObject *o);
|
|
|
|
/*
|
|
On success, returns a type object corresponding to the object
|
|
type of object o. On failure, returns NULL. This is
|
|
equivalent to the Python expression: type(o).
|
|
*/
|
|
|
|
PyAPI_FUNC(Py_ssize_t) PyObject_Size(PyObject *o);
|
|
|
|
/*
|
|
Return the size of object o. If the object, o, provides
|
|
both sequence and mapping protocols, the sequence size is
|
|
returned. On error, -1 is returned. This is the equivalent
|
|
to the Python expression: len(o).
|
|
*/
|
|
|
|
/* For DLL compatibility */
|
|
#undef PyObject_Length
|
|
PyAPI_FUNC(Py_ssize_t) PyObject_Length(PyObject *o);
|
|
#define PyObject_Length PyObject_Size
|
|
|
|
PyAPI_FUNC(Py_ssize_t) _PyObject_LengthHint(PyObject *o);
|
|
|
|
/*
|
|
Return the size of object o. If the object, o, provides
|
|
both sequence and mapping protocols, the sequence size is
|
|
returned. On error, -1 is returned. If the object provides
|
|
a __length_hint__() method, its value is returned. This is an
|
|
internal undocumented API provided for performance reasons;
|
|
for compatibility, don't use it outside the core. This is the
|
|
equivalent to the Python expression:
|
|
try:
|
|
return len(o)
|
|
except (AttributeError, TypeError):
|
|
exc_type, exc_value, exc_tb = sys.exc_info()
|
|
try:
|
|
return o.__length_hint__()
|
|
except:
|
|
pass
|
|
raise exc_type, exc_value, exc_tb
|
|
*/
|
|
|
|
PyAPI_FUNC(PyObject *) PyObject_GetItem(PyObject *o, PyObject *key);
|
|
|
|
/*
|
|
Return element of o corresponding to the object, key, or NULL
|
|
on failure. This is the equivalent of the Python expression:
|
|
o[key].
|
|
*/
|
|
|
|
PyAPI_FUNC(int) PyObject_SetItem(PyObject *o, PyObject *key, PyObject *v);
|
|
|
|
/*
|
|
Map the object, key, to the value, v. Returns
|
|
-1 on failure. This is the equivalent of the Python
|
|
statement: o[key]=v.
|
|
*/
|
|
|
|
PyAPI_FUNC(int) PyObject_DelItemString(PyObject *o, char *key);
|
|
|
|
/*
|
|
Remove the mapping for object, key, from the object *o.
|
|
Returns -1 on failure. This is equivalent to
|
|
the Python statement: del o[key].
|
|
*/
|
|
|
|
PyAPI_FUNC(int) PyObject_DelItem(PyObject *o, PyObject *key);
|
|
|
|
/*
|
|
Delete the mapping for key from *o. Returns -1 on failure.
|
|
This is the equivalent of the Python statement: del o[key].
|
|
*/
|
|
|
|
PyAPI_FUNC(int) PyObject_AsCharBuffer(PyObject *obj,
|
|
const char **buffer,
|
|
Py_ssize_t *buffer_len);
|
|
|
|
/*
|
|
Takes an arbitrary object which must support the (character,
|
|
single segment) buffer interface and returns a pointer to a
|
|
read-only memory location useable as character based input
|
|
for subsequent processing.
|
|
|
|
0 is returned on success. buffer and buffer_len are only
|
|
set in case no error occurs. Otherwise, -1 is returned and
|
|
an exception set.
|
|
*/
|
|
|
|
PyAPI_FUNC(int) PyObject_CheckReadBuffer(PyObject *obj);
|
|
|
|
/*
|
|
Checks whether an arbitrary object supports the (character,
|
|
single segment) buffer interface. Returns 1 on success, 0
|
|
on failure.
|
|
*/
|
|
|
|
PyAPI_FUNC(int) PyObject_AsReadBuffer(PyObject *obj,
|
|
const void **buffer,
|
|
Py_ssize_t *buffer_len);
|
|
|
|
/*
|
|
Same as PyObject_AsCharBuffer() except that this API expects
|
|
(readable, single segment) buffer interface and returns a
|
|
pointer to a read-only memory location which can contain
|
|
arbitrary data.
|
|
|
|
0 is returned on success. buffer and buffer_len are only
|
|
set in case no error occurrs. Otherwise, -1 is returned and
|
|
an exception set.
|
|
*/
|
|
|
|
PyAPI_FUNC(int) PyObject_AsWriteBuffer(PyObject *obj,
|
|
void **buffer,
|
|
Py_ssize_t *buffer_len);
|
|
|
|
/*
|
|
Takes an arbitrary object which must support the (writeable,
|
|
single segment) buffer interface and returns a pointer to a
|
|
writeable memory location in buffer of size buffer_len.
|
|
|
|
0 is returned on success. buffer and buffer_len are only
|
|
set in case no error occurrs. Otherwise, -1 is returned and
|
|
an exception set.
|
|
*/
|
|
|
|
/* Iterators */
|
|
|
|
PyAPI_FUNC(PyObject *) PyObject_GetIter(PyObject *);
|
|
/* Takes an object and returns an iterator for it.
|
|
This is typically a new iterator but if the argument
|
|
is an iterator, this returns itself. */
|
|
|
|
#define PyIter_Check(obj) \
|
|
((obj)->ob_type->tp_iternext != NULL)
|
|
|
|
PyAPI_FUNC(PyObject *) PyIter_Next(PyObject *);
|
|
/* Takes an iterator object and calls its tp_iternext slot,
|
|
returning the next value. If the iterator is exhausted,
|
|
this returns NULL without setting an exception.
|
|
NULL with an exception means an error occurred. */
|
|
|
|
/* Number Protocol:*/
|
|
|
|
PyAPI_FUNC(int) PyNumber_Check(PyObject *o);
|
|
|
|
/*
|
|
Returns 1 if the object, o, provides numeric protocols, and
|
|
false otherwise.
|
|
|
|
This function always succeeds.
|
|
*/
|
|
|
|
PyAPI_FUNC(PyObject *) PyNumber_Add(PyObject *o1, PyObject *o2);
|
|
|
|
/*
|
|
Returns the result of adding o1 and o2, or null on failure.
|
|
This is the equivalent of the Python expression: o1+o2.
|
|
*/
|
|
|
|
PyAPI_FUNC(PyObject *) PyNumber_Subtract(PyObject *o1, PyObject *o2);
|
|
|
|
/*
|
|
Returns the result of subtracting o2 from o1, or null on
|
|
failure. This is the equivalent of the Python expression:
|
|
o1-o2.
|
|
*/
|
|
|
|
PyAPI_FUNC(PyObject *) PyNumber_Multiply(PyObject *o1, PyObject *o2);
|
|
|
|
/*
|
|
Returns the result of multiplying o1 and o2, or null on
|
|
failure. This is the equivalent of the Python expression:
|
|
o1*o2.
|
|
*/
|
|
|
|
PyAPI_FUNC(PyObject *) PyNumber_Divide(PyObject *o1, PyObject *o2);
|
|
|
|
/*
|
|
Returns the result of dividing o1 by o2, or null on failure.
|
|
This is the equivalent of the Python expression: o1/o2.
|
|
*/
|
|
|
|
PyAPI_FUNC(PyObject *) PyNumber_FloorDivide(PyObject *o1, PyObject *o2);
|
|
|
|
/*
|
|
Returns the result of dividing o1 by o2 giving an integral result,
|
|
or null on failure.
|
|
This is the equivalent of the Python expression: o1//o2.
|
|
*/
|
|
|
|
PyAPI_FUNC(PyObject *) PyNumber_TrueDivide(PyObject *o1, PyObject *o2);
|
|
|
|
/*
|
|
Returns the result of dividing o1 by o2 giving a float result,
|
|
or null on failure.
|
|
This is the equivalent of the Python expression: o1/o2.
|
|
*/
|
|
|
|
PyAPI_FUNC(PyObject *) PyNumber_Remainder(PyObject *o1, PyObject *o2);
|
|
|
|
/*
|
|
Returns the remainder of dividing o1 by o2, or null on
|
|
failure. This is the equivalent of the Python expression:
|
|
o1%o2.
|
|
*/
|
|
|
|
PyAPI_FUNC(PyObject *) PyNumber_Divmod(PyObject *o1, PyObject *o2);
|
|
|
|
/*
|
|
See the built-in function divmod. Returns NULL on failure.
|
|
This is the equivalent of the Python expression:
|
|
divmod(o1,o2).
|
|
*/
|
|
|
|
PyAPI_FUNC(PyObject *) PyNumber_Power(PyObject *o1, PyObject *o2,
|
|
PyObject *o3);
|
|
|
|
/*
|
|
See the built-in function pow. Returns NULL on failure.
|
|
This is the equivalent of the Python expression:
|
|
pow(o1,o2,o3), where o3 is optional.
|
|
*/
|
|
|
|
PyAPI_FUNC(PyObject *) PyNumber_Negative(PyObject *o);
|
|
|
|
/*
|
|
Returns the negation of o on success, or null on failure.
|
|
This is the equivalent of the Python expression: -o.
|
|
*/
|
|
|
|
PyAPI_FUNC(PyObject *) PyNumber_Positive(PyObject *o);
|
|
|
|
/*
|
|
Returns the (what?) of o on success, or NULL on failure.
|
|
This is the equivalent of the Python expression: +o.
|
|
*/
|
|
|
|
PyAPI_FUNC(PyObject *) PyNumber_Absolute(PyObject *o);
|
|
|
|
/*
|
|
Returns the absolute value of o, or null on failure. This is
|
|
the equivalent of the Python expression: abs(o).
|
|
*/
|
|
|
|
PyAPI_FUNC(PyObject *) PyNumber_Invert(PyObject *o);
|
|
|
|
/*
|
|
Returns the bitwise negation of o on success, or NULL on
|
|
failure. This is the equivalent of the Python expression:
|
|
~o.
|
|
*/
|
|
|
|
PyAPI_FUNC(PyObject *) PyNumber_Lshift(PyObject *o1, PyObject *o2);
|
|
|
|
/*
|
|
Returns the result of left shifting o1 by o2 on success, or
|
|
NULL on failure. This is the equivalent of the Python
|
|
expression: o1 << o2.
|
|
*/
|
|
|
|
PyAPI_FUNC(PyObject *) PyNumber_Rshift(PyObject *o1, PyObject *o2);
|
|
|
|
/*
|
|
Returns the result of right shifting o1 by o2 on success, or
|
|
NULL on failure. This is the equivalent of the Python
|
|
expression: o1 >> o2.
|
|
*/
|
|
|
|
PyAPI_FUNC(PyObject *) PyNumber_And(PyObject *o1, PyObject *o2);
|
|
|
|
/*
|
|
Returns the result of bitwise and of o1 and o2 on success, or
|
|
NULL on failure. This is the equivalent of the Python
|
|
expression: o1&o2.
|
|
|
|
*/
|
|
|
|
PyAPI_FUNC(PyObject *) PyNumber_Xor(PyObject *o1, PyObject *o2);
|
|
|
|
/*
|
|
Returns the bitwise exclusive or of o1 by o2 on success, or
|
|
NULL on failure. This is the equivalent of the Python
|
|
expression: o1^o2.
|
|
*/
|
|
|
|
PyAPI_FUNC(PyObject *) PyNumber_Or(PyObject *o1, PyObject *o2);
|
|
|
|
/*
|
|
Returns the result of bitwise or on o1 and o2 on success, or
|
|
NULL on failure. This is the equivalent of the Python
|
|
expression: o1|o2.
|
|
*/
|
|
|
|
#define PyIndex_Check(obj) \
|
|
((obj)->ob_type->tp_as_number != NULL && \
|
|
(obj)->ob_type->tp_as_number->nb_index != NULL)
|
|
|
|
PyAPI_FUNC(PyObject *) PyNumber_Index(PyObject *o);
|
|
|
|
/*
|
|
Returns the object converted to a Python long or int
|
|
or NULL with an error raised on failure.
|
|
*/
|
|
|
|
PyAPI_FUNC(Py_ssize_t) PyNumber_AsSsize_t(PyObject *o, PyObject *exc);
|
|
|
|
/*
|
|
Returns the object converted to Py_ssize_t by going through
|
|
PyNumber_Index first. If an overflow error occurs while
|
|
converting the int-or-long to Py_ssize_t, then the second argument
|
|
is the error-type to return. If it is NULL, then the overflow error
|
|
is cleared and the value is clipped.
|
|
*/
|
|
|
|
PyAPI_FUNC(PyObject *) PyNumber_Int(PyObject *o);
|
|
|
|
/*
|
|
Returns the o converted to an integer object on success, or
|
|
NULL on failure. This is the equivalent of the Python
|
|
expression: int(o).
|
|
*/
|
|
|
|
PyAPI_FUNC(PyObject *) PyNumber_Long(PyObject *o);
|
|
|
|
/*
|
|
Returns the o converted to a long integer object on success,
|
|
or NULL on failure. This is the equivalent of the Python
|
|
expression: long(o).
|
|
*/
|
|
|
|
PyAPI_FUNC(PyObject *) PyNumber_Float(PyObject *o);
|
|
|
|
/*
|
|
Returns the o converted to a float object on success, or NULL
|
|
on failure. This is the equivalent of the Python expression:
|
|
float(o).
|
|
*/
|
|
|
|
/* In-place variants of (some of) the above number protocol functions */
|
|
|
|
PyAPI_FUNC(PyObject *) PyNumber_InPlaceAdd(PyObject *o1, PyObject *o2);
|
|
|
|
/*
|
|
Returns the result of adding o2 to o1, possibly in-place, or null
|
|
on failure. This is the equivalent of the Python expression:
|
|
o1 += o2.
|
|
*/
|
|
|
|
PyAPI_FUNC(PyObject *) PyNumber_InPlaceSubtract(PyObject *o1, PyObject *o2);
|
|
|
|
/*
|
|
Returns the result of subtracting o2 from o1, possibly in-place or
|
|
null on failure. This is the equivalent of the Python expression:
|
|
o1 -= o2.
|
|
*/
|
|
|
|
PyAPI_FUNC(PyObject *) PyNumber_InPlaceMultiply(PyObject *o1, PyObject *o2);
|
|
|
|
/*
|
|
Returns the result of multiplying o1 by o2, possibly in-place, or
|
|
null on failure. This is the equivalent of the Python expression:
|
|
o1 *= o2.
|
|
*/
|
|
|
|
PyAPI_FUNC(PyObject *) PyNumber_InPlaceDivide(PyObject *o1, PyObject *o2);
|
|
|
|
/*
|
|
Returns the result of dividing o1 by o2, possibly in-place, or null
|
|
on failure. This is the equivalent of the Python expression:
|
|
o1 /= o2.
|
|
*/
|
|
|
|
PyAPI_FUNC(PyObject *) PyNumber_InPlaceFloorDivide(PyObject *o1,
|
|
PyObject *o2);
|
|
|
|
/*
|
|
Returns the result of dividing o1 by o2 giving an integral result,
|
|
possibly in-place, or null on failure.
|
|
This is the equivalent of the Python expression:
|
|
o1 /= o2.
|
|
*/
|
|
|
|
PyAPI_FUNC(PyObject *) PyNumber_InPlaceTrueDivide(PyObject *o1,
|
|
PyObject *o2);
|
|
|
|
/*
|
|
Returns the result of dividing o1 by o2 giving a float result,
|
|
possibly in-place, or null on failure.
|
|
This is the equivalent of the Python expression:
|
|
o1 /= o2.
|
|
*/
|
|
|
|
PyAPI_FUNC(PyObject *) PyNumber_InPlaceRemainder(PyObject *o1, PyObject *o2);
|
|
|
|
/*
|
|
Returns the remainder of dividing o1 by o2, possibly in-place, or
|
|
null on failure. This is the equivalent of the Python expression:
|
|
o1 %= o2.
|
|
*/
|
|
|
|
PyAPI_FUNC(PyObject *) PyNumber_InPlacePower(PyObject *o1, PyObject *o2,
|
|
PyObject *o3);
|
|
|
|
/*
|
|
Returns the result of raising o1 to the power of o2, possibly
|
|
in-place, or null on failure. This is the equivalent of the Python
|
|
expression: o1 **= o2, or pow(o1, o2, o3) if o3 is present.
|
|
*/
|
|
|
|
PyAPI_FUNC(PyObject *) PyNumber_InPlaceLshift(PyObject *o1, PyObject *o2);
|
|
|
|
/*
|
|
Returns the result of left shifting o1 by o2, possibly in-place, or
|
|
null on failure. This is the equivalent of the Python expression:
|
|
o1 <<= o2.
|
|
*/
|
|
|
|
PyAPI_FUNC(PyObject *) PyNumber_InPlaceRshift(PyObject *o1, PyObject *o2);
|
|
|
|
/*
|
|
Returns the result of right shifting o1 by o2, possibly in-place or
|
|
null on failure. This is the equivalent of the Python expression:
|
|
o1 >>= o2.
|
|
*/
|
|
|
|
PyAPI_FUNC(PyObject *) PyNumber_InPlaceAnd(PyObject *o1, PyObject *o2);
|
|
|
|
/*
|
|
Returns the result of bitwise and of o1 and o2, possibly in-place,
|
|
or null on failure. This is the equivalent of the Python
|
|
expression: o1 &= o2.
|
|
*/
|
|
|
|
PyAPI_FUNC(PyObject *) PyNumber_InPlaceXor(PyObject *o1, PyObject *o2);
|
|
|
|
/*
|
|
Returns the bitwise exclusive or of o1 by o2, possibly in-place, or
|
|
null on failure. This is the equivalent of the Python expression:
|
|
o1 ^= o2.
|
|
*/
|
|
|
|
PyAPI_FUNC(PyObject *) PyNumber_InPlaceOr(PyObject *o1, PyObject *o2);
|
|
|
|
/*
|
|
Returns the result of bitwise or of o1 and o2, possibly in-place,
|
|
or null on failure. This is the equivalent of the Python
|
|
expression: o1 |= o2.
|
|
*/
|
|
|
|
|
|
/* Sequence protocol:*/
|
|
|
|
PyAPI_FUNC(int) PySequence_Check(PyObject *o);
|
|
|
|
/*
|
|
Return 1 if the object provides sequence protocol, and zero
|
|
otherwise.
|
|
|
|
This function always succeeds.
|
|
*/
|
|
|
|
PyAPI_FUNC(Py_ssize_t) PySequence_Size(PyObject *o);
|
|
|
|
/*
|
|
Return the size of sequence object o, or -1 on failure.
|
|
*/
|
|
|
|
/* For DLL compatibility */
|
|
#undef PySequence_Length
|
|
PyAPI_FUNC(Py_ssize_t) PySequence_Length(PyObject *o);
|
|
#define PySequence_Length PySequence_Size
|
|
|
|
|
|
PyAPI_FUNC(PyObject *) PySequence_Concat(PyObject *o1, PyObject *o2);
|
|
|
|
/*
|
|
Return the concatenation of o1 and o2 on success, and NULL on
|
|
failure. This is the equivalent of the Python
|
|
expression: o1+o2.
|
|
*/
|
|
|
|
PyAPI_FUNC(PyObject *) PySequence_Repeat(PyObject *o, Py_ssize_t count);
|
|
|
|
/*
|
|
Return the result of repeating sequence object o count times,
|
|
or NULL on failure. This is the equivalent of the Python
|
|
expression: o1*count.
|
|
*/
|
|
|
|
PyAPI_FUNC(PyObject *) PySequence_GetItem(PyObject *o, Py_ssize_t i);
|
|
|
|
/*
|
|
Return the ith element of o, or NULL on failure. This is the
|
|
equivalent of the Python expression: o[i].
|
|
*/
|
|
|
|
PyAPI_FUNC(PyObject *) PySequence_GetSlice(PyObject *o, Py_ssize_t i1, Py_ssize_t i2);
|
|
|
|
/*
|
|
Return the slice of sequence object o between i1 and i2, or
|
|
NULL on failure. This is the equivalent of the Python
|
|
expression: o[i1:i2].
|
|
*/
|
|
|
|
PyAPI_FUNC(int) PySequence_SetItem(PyObject *o, Py_ssize_t i, PyObject *v);
|
|
|
|
/*
|
|
Assign object v to the ith element of o. Returns
|
|
-1 on failure. This is the equivalent of the Python
|
|
statement: o[i]=v.
|
|
*/
|
|
|
|
PyAPI_FUNC(int) PySequence_DelItem(PyObject *o, Py_ssize_t i);
|
|
|
|
/*
|
|
Delete the ith element of object v. Returns
|
|
-1 on failure. This is the equivalent of the Python
|
|
statement: del o[i].
|
|
*/
|
|
|
|
PyAPI_FUNC(int) PySequence_SetSlice(PyObject *o, Py_ssize_t i1, Py_ssize_t i2,
|
|
PyObject *v);
|
|
|
|
/*
|
|
Assign the sequence object, v, to the slice in sequence
|
|
object, o, from i1 to i2. Returns -1 on failure. This is the
|
|
equivalent of the Python statement: o[i1:i2]=v.
|
|
*/
|
|
|
|
PyAPI_FUNC(int) PySequence_DelSlice(PyObject *o, Py_ssize_t i1, Py_ssize_t i2);
|
|
|
|
/*
|
|
Delete the slice in sequence object, o, from i1 to i2.
|
|
Returns -1 on failure. This is the equivalent of the Python
|
|
statement: del o[i1:i2].
|
|
*/
|
|
|
|
PyAPI_FUNC(PyObject *) PySequence_Tuple(PyObject *o);
|
|
|
|
/*
|
|
Returns the sequence, o, as a tuple on success, and NULL on failure.
|
|
This is equivalent to the Python expression: tuple(o)
|
|
*/
|
|
|
|
|
|
PyAPI_FUNC(PyObject *) PySequence_List(PyObject *o);
|
|
/*
|
|
Returns the sequence, o, as a list on success, and NULL on failure.
|
|
This is equivalent to the Python expression: list(o)
|
|
*/
|
|
|
|
PyAPI_FUNC(PyObject *) PySequence_Fast(PyObject *o, const char* m);
|
|
/*
|
|
Returns the sequence, o, as a tuple, unless it's already a
|
|
tuple or list. Use PySequence_Fast_GET_ITEM to access the
|
|
members of this list, and PySequence_Fast_GET_SIZE to get its length.
|
|
|
|
Returns NULL on failure. If the object does not support iteration,
|
|
raises a TypeError exception with m as the message text.
|
|
*/
|
|
|
|
#define PySequence_Fast_GET_SIZE(o) \
|
|
(PyList_Check(o) ? PyList_GET_SIZE(o) : PyTuple_GET_SIZE(o))
|
|
/*
|
|
Return the size of o, assuming that o was returned by
|
|
PySequence_Fast and is not NULL.
|
|
*/
|
|
|
|
#define PySequence_Fast_GET_ITEM(o, i)\
|
|
(PyList_Check(o) ? PyList_GET_ITEM(o, i) : PyTuple_GET_ITEM(o, i))
|
|
/*
|
|
Return the ith element of o, assuming that o was returned by
|
|
PySequence_Fast, and that i is within bounds.
|
|
*/
|
|
|
|
#define PySequence_ITEM(o, i)\
|
|
( o->ob_type->tp_as_sequence->sq_item(o, i) )
|
|
/* Assume tp_as_sequence and sq_item exist and that i does not
|
|
need to be corrected for a negative index
|
|
*/
|
|
|
|
#define PySequence_Fast_ITEMS(sf) \
|
|
(PyList_Check(sf) ? ((PyListObject *)(sf))->ob_item \
|
|
: ((PyTupleObject *)(sf))->ob_item)
|
|
/* Return a pointer to the underlying item array for
|
|
an object retured by PySequence_Fast */
|
|
|
|
PyAPI_FUNC(Py_ssize_t) PySequence_Count(PyObject *o, PyObject *value);
|
|
|
|
/*
|
|
Return the number of occurrences on value on o, that is,
|
|
return the number of keys for which o[key]==value. On
|
|
failure, return -1. This is equivalent to the Python
|
|
expression: o.count(value).
|
|
*/
|
|
|
|
PyAPI_FUNC(int) PySequence_Contains(PyObject *seq, PyObject *ob);
|
|
/*
|
|
Return -1 if error; 1 if ob in seq; 0 if ob not in seq.
|
|
Use __contains__ if possible, else _PySequence_IterSearch().
|
|
*/
|
|
|
|
#define PY_ITERSEARCH_COUNT 1
|
|
#define PY_ITERSEARCH_INDEX 2
|
|
#define PY_ITERSEARCH_CONTAINS 3
|
|
PyAPI_FUNC(Py_ssize_t) _PySequence_IterSearch(PyObject *seq,
|
|
PyObject *obj, int operation);
|
|
/*
|
|
Iterate over seq. Result depends on the operation:
|
|
PY_ITERSEARCH_COUNT: return # of times obj appears in seq; -1 if
|
|
error.
|
|
PY_ITERSEARCH_INDEX: return 0-based index of first occurrence of
|
|
obj in seq; set ValueError and return -1 if none found;
|
|
also return -1 on error.
|
|
PY_ITERSEARCH_CONTAINS: return 1 if obj in seq, else 0; -1 on
|
|
error.
|
|
*/
|
|
|
|
/* For DLL-level backwards compatibility */
|
|
#undef PySequence_In
|
|
PyAPI_FUNC(int) PySequence_In(PyObject *o, PyObject *value);
|
|
|
|
/* For source-level backwards compatibility */
|
|
#define PySequence_In PySequence_Contains
|
|
|
|
/*
|
|
Determine if o contains value. If an item in o is equal to
|
|
X, return 1, otherwise return 0. On error, return -1. This
|
|
is equivalent to the Python expression: value in o.
|
|
*/
|
|
|
|
PyAPI_FUNC(Py_ssize_t) PySequence_Index(PyObject *o, PyObject *value);
|
|
|
|
/*
|
|
Return the first index for which o[i]=value. On error,
|
|
return -1. This is equivalent to the Python
|
|
expression: o.index(value).
|
|
*/
|
|
|
|
/* In-place versions of some of the above Sequence functions. */
|
|
|
|
PyAPI_FUNC(PyObject *) PySequence_InPlaceConcat(PyObject *o1, PyObject *o2);
|
|
|
|
/*
|
|
Append o2 to o1, in-place when possible. Return the resulting
|
|
object, which could be o1, or NULL on failure. This is the
|
|
equivalent of the Python expression: o1 += o2.
|
|
|
|
*/
|
|
|
|
PyAPI_FUNC(PyObject *) PySequence_InPlaceRepeat(PyObject *o, Py_ssize_t count);
|
|
|
|
/*
|
|
Repeat o1 by count, in-place when possible. Return the resulting
|
|
object, which could be o1, or NULL on failure. This is the
|
|
equivalent of the Python expression: o1 *= count.
|
|
|
|
*/
|
|
|
|
/* Mapping protocol:*/
|
|
|
|
PyAPI_FUNC(int) PyMapping_Check(PyObject *o);
|
|
|
|
/*
|
|
Return 1 if the object provides mapping protocol, and zero
|
|
otherwise.
|
|
|
|
This function always succeeds.
|
|
*/
|
|
|
|
PyAPI_FUNC(Py_ssize_t) PyMapping_Size(PyObject *o);
|
|
|
|
/*
|
|
Returns the number of keys in object o on success, and -1 on
|
|
failure. For objects that do not provide sequence protocol,
|
|
this is equivalent to the Python expression: len(o).
|
|
*/
|
|
|
|
/* For DLL compatibility */
|
|
#undef PyMapping_Length
|
|
PyAPI_FUNC(Py_ssize_t) PyMapping_Length(PyObject *o);
|
|
#define PyMapping_Length PyMapping_Size
|
|
|
|
|
|
/* implemented as a macro:
|
|
|
|
int PyMapping_DelItemString(PyObject *o, char *key);
|
|
|
|
Remove the mapping for object, key, from the object *o.
|
|
Returns -1 on failure. This is equivalent to
|
|
the Python statement: del o[key].
|
|
*/
|
|
#define PyMapping_DelItemString(O,K) PyObject_DelItemString((O),(K))
|
|
|
|
/* implemented as a macro:
|
|
|
|
int PyMapping_DelItem(PyObject *o, PyObject *key);
|
|
|
|
Remove the mapping for object, key, from the object *o.
|
|
Returns -1 on failure. This is equivalent to
|
|
the Python statement: del o[key].
|
|
*/
|
|
#define PyMapping_DelItem(O,K) PyObject_DelItem((O),(K))
|
|
|
|
PyAPI_FUNC(int) PyMapping_HasKeyString(PyObject *o, char *key);
|
|
|
|
/*
|
|
On success, return 1 if the mapping object has the key, key,
|
|
and 0 otherwise. This is equivalent to the Python expression:
|
|
key in o.
|
|
|
|
This function always succeeds.
|
|
*/
|
|
|
|
PyAPI_FUNC(int) PyMapping_HasKey(PyObject *o, PyObject *key);
|
|
|
|
/*
|
|
Return 1 if the mapping object has the key, key,
|
|
and 0 otherwise. This is equivalent to the Python expression:
|
|
key in o.
|
|
|
|
This function always succeeds.
|
|
|
|
*/
|
|
|
|
/* Implemented as macro:
|
|
|
|
PyObject *PyMapping_Keys(PyObject *o);
|
|
|
|
On success, return a list of the keys in object o. On
|
|
failure, return NULL. This is equivalent to the Python
|
|
expression: o.keys().
|
|
*/
|
|
#define PyMapping_Keys(O) PyObject_CallMethod(O,"keys",NULL)
|
|
|
|
/* Implemented as macro:
|
|
|
|
PyObject *PyMapping_Values(PyObject *o);
|
|
|
|
On success, return a list of the values in object o. On
|
|
failure, return NULL. This is equivalent to the Python
|
|
expression: o.values().
|
|
*/
|
|
#define PyMapping_Values(O) PyObject_CallMethod(O,"values",NULL)
|
|
|
|
/* Implemented as macro:
|
|
|
|
PyObject *PyMapping_Items(PyObject *o);
|
|
|
|
On success, return a list of the items in object o, where
|
|
each item is a tuple containing a key-value pair. On
|
|
failure, return NULL. This is equivalent to the Python
|
|
expression: o.items().
|
|
|
|
*/
|
|
#define PyMapping_Items(O) PyObject_CallMethod(O,"items",NULL)
|
|
|
|
PyAPI_FUNC(PyObject *) PyMapping_GetItemString(PyObject *o, char *key);
|
|
|
|
/*
|
|
Return element of o corresponding to the object, key, or NULL
|
|
on failure. This is the equivalent of the Python expression:
|
|
o[key].
|
|
*/
|
|
|
|
PyAPI_FUNC(int) PyMapping_SetItemString(PyObject *o, char *key,
|
|
PyObject *value);
|
|
|
|
/*
|
|
Map the object, key, to the value, v. Returns
|
|
-1 on failure. This is the equivalent of the Python
|
|
statement: o[key]=v.
|
|
*/
|
|
|
|
|
|
PyAPI_FUNC(int) PyObject_IsInstance(PyObject *object, PyObject *typeorclass);
|
|
/* isinstance(object, typeorclass) */
|
|
|
|
PyAPI_FUNC(int) PyObject_IsSubclass(PyObject *object, PyObject *typeorclass);
|
|
/* issubclass(object, typeorclass) */
|
|
|
|
|
|
#ifdef __cplusplus
|
|
}
|
|
#endif
|
|
#endif /* Py_ABSTRACTOBJECT_H */
|