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

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) ........
2237 lines
48 KiB
C
2237 lines
48 KiB
C
/* Abstract Object Interface (many thanks to Jim Fulton) */
|
|
|
|
#include "Python.h"
|
|
#include <ctype.h>
|
|
#include "structmember.h" /* we need the offsetof() macro from there */
|
|
#include "longintrepr.h"
|
|
|
|
|
|
|
|
/* Shorthands to return certain errors */
|
|
|
|
static PyObject *
|
|
type_error(const char *msg, PyObject *obj)
|
|
{
|
|
PyErr_Format(PyExc_TypeError, msg, obj->ob_type->tp_name);
|
|
return NULL;
|
|
}
|
|
|
|
static PyObject *
|
|
null_error(void)
|
|
{
|
|
if (!PyErr_Occurred())
|
|
PyErr_SetString(PyExc_SystemError,
|
|
"null argument to internal routine");
|
|
return NULL;
|
|
}
|
|
|
|
/* Operations on any object */
|
|
|
|
int
|
|
PyObject_Cmp(PyObject *o1, PyObject *o2, int *result)
|
|
{
|
|
int r;
|
|
|
|
if (o1 == NULL || o2 == NULL) {
|
|
null_error();
|
|
return -1;
|
|
}
|
|
r = PyObject_Compare(o1, o2);
|
|
if (PyErr_Occurred())
|
|
return -1;
|
|
*result = r;
|
|
return 0;
|
|
}
|
|
|
|
PyObject *
|
|
PyObject_Type(PyObject *o)
|
|
{
|
|
PyObject *v;
|
|
|
|
if (o == NULL)
|
|
return null_error();
|
|
v = (PyObject *)o->ob_type;
|
|
Py_INCREF(v);
|
|
return v;
|
|
}
|
|
|
|
Py_ssize_t
|
|
PyObject_Size(PyObject *o)
|
|
{
|
|
PySequenceMethods *m;
|
|
|
|
if (o == NULL) {
|
|
null_error();
|
|
return -1;
|
|
}
|
|
|
|
m = o->ob_type->tp_as_sequence;
|
|
if (m && m->sq_length)
|
|
return m->sq_length(o);
|
|
|
|
return PyMapping_Size(o);
|
|
}
|
|
|
|
#undef PyObject_Length
|
|
Py_ssize_t
|
|
PyObject_Length(PyObject *o)
|
|
{
|
|
return PyObject_Size(o);
|
|
}
|
|
#define PyObject_Length PyObject_Size
|
|
|
|
Py_ssize_t
|
|
_PyObject_LengthHint(PyObject *o)
|
|
{
|
|
Py_ssize_t rv = PyObject_Size(o);
|
|
if (rv != -1)
|
|
return rv;
|
|
if (PyErr_ExceptionMatches(PyExc_TypeError) ||
|
|
PyErr_ExceptionMatches(PyExc_AttributeError)) {
|
|
PyObject *err_type, *err_value, *err_tb, *ro;
|
|
|
|
PyErr_Fetch(&err_type, &err_value, &err_tb);
|
|
ro = PyObject_CallMethod(o, "__length_hint__", NULL);
|
|
if (ro != NULL) {
|
|
rv = PyInt_AsLong(ro);
|
|
Py_DECREF(ro);
|
|
Py_XDECREF(err_type);
|
|
Py_XDECREF(err_value);
|
|
Py_XDECREF(err_tb);
|
|
return rv;
|
|
}
|
|
PyErr_Restore(err_type, err_value, err_tb);
|
|
}
|
|
return -1;
|
|
}
|
|
|
|
PyObject *
|
|
PyObject_GetItem(PyObject *o, PyObject *key)
|
|
{
|
|
PyMappingMethods *m;
|
|
|
|
if (o == NULL || key == NULL)
|
|
return null_error();
|
|
|
|
m = o->ob_type->tp_as_mapping;
|
|
if (m && m->mp_subscript)
|
|
return m->mp_subscript(o, key);
|
|
|
|
if (o->ob_type->tp_as_sequence) {
|
|
if (PyIndex_Check(key)) {
|
|
Py_ssize_t key_value;
|
|
key_value = PyNumber_AsSsize_t(key, PyExc_IndexError);
|
|
if (key_value == -1 && PyErr_Occurred())
|
|
return NULL;
|
|
return PySequence_GetItem(o, key_value);
|
|
}
|
|
else if (o->ob_type->tp_as_sequence->sq_item)
|
|
return type_error("sequence index must "
|
|
"be integer, not '%.200s'", key);
|
|
}
|
|
|
|
return type_error("'%.200s' object is unsubscriptable", o);
|
|
}
|
|
|
|
int
|
|
PyObject_SetItem(PyObject *o, PyObject *key, PyObject *value)
|
|
{
|
|
PyMappingMethods *m;
|
|
|
|
if (o == NULL || key == NULL || value == NULL) {
|
|
null_error();
|
|
return -1;
|
|
}
|
|
m = o->ob_type->tp_as_mapping;
|
|
if (m && m->mp_ass_subscript)
|
|
return m->mp_ass_subscript(o, key, value);
|
|
|
|
if (o->ob_type->tp_as_sequence) {
|
|
if (PyIndex_Check(key)) {
|
|
Py_ssize_t key_value;
|
|
key_value = PyNumber_AsSsize_t(key, PyExc_IndexError);
|
|
if (key_value == -1 && PyErr_Occurred())
|
|
return -1;
|
|
return PySequence_SetItem(o, key_value, value);
|
|
}
|
|
else if (o->ob_type->tp_as_sequence->sq_ass_item) {
|
|
type_error("sequence index must be "
|
|
"integer, not '%.200s'", key);
|
|
return -1;
|
|
}
|
|
}
|
|
|
|
type_error("'%.200s' object does not support item assignment", o);
|
|
return -1;
|
|
}
|
|
|
|
int
|
|
PyObject_DelItem(PyObject *o, PyObject *key)
|
|
{
|
|
PyMappingMethods *m;
|
|
|
|
if (o == NULL || key == NULL) {
|
|
null_error();
|
|
return -1;
|
|
}
|
|
m = o->ob_type->tp_as_mapping;
|
|
if (m && m->mp_ass_subscript)
|
|
return m->mp_ass_subscript(o, key, (PyObject*)NULL);
|
|
|
|
if (o->ob_type->tp_as_sequence) {
|
|
if (PyIndex_Check(key)) {
|
|
Py_ssize_t key_value;
|
|
key_value = PyNumber_AsSsize_t(key, PyExc_IndexError);
|
|
if (key_value == -1 && PyErr_Occurred())
|
|
return -1;
|
|
return PySequence_DelItem(o, key_value);
|
|
}
|
|
else if (o->ob_type->tp_as_sequence->sq_ass_item) {
|
|
type_error("sequence index must be "
|
|
"integer, not '%.200s'", key);
|
|
return -1;
|
|
}
|
|
}
|
|
|
|
type_error("'%.200s' object does not support item deletion", o);
|
|
return -1;
|
|
}
|
|
|
|
int
|
|
PyObject_DelItemString(PyObject *o, char *key)
|
|
{
|
|
PyObject *okey;
|
|
int ret;
|
|
|
|
if (o == NULL || key == NULL) {
|
|
null_error();
|
|
return -1;
|
|
}
|
|
okey = PyString_FromString(key);
|
|
if (okey == NULL)
|
|
return -1;
|
|
ret = PyObject_DelItem(o, okey);
|
|
Py_DECREF(okey);
|
|
return ret;
|
|
}
|
|
|
|
int
|
|
PyObject_AsCharBuffer(PyObject *obj,
|
|
const char **buffer,
|
|
Py_ssize_t *buffer_len)
|
|
{
|
|
PyBufferProcs *pb;
|
|
char *pp;
|
|
Py_ssize_t len;
|
|
|
|
if (obj == NULL || buffer == NULL || buffer_len == NULL) {
|
|
null_error();
|
|
return -1;
|
|
}
|
|
pb = obj->ob_type->tp_as_buffer;
|
|
if (pb == NULL ||
|
|
pb->bf_getcharbuffer == NULL ||
|
|
pb->bf_getsegcount == NULL) {
|
|
PyErr_SetString(PyExc_TypeError,
|
|
"expected a character buffer object");
|
|
return -1;
|
|
}
|
|
if ((*pb->bf_getsegcount)(obj,NULL) != 1) {
|
|
PyErr_SetString(PyExc_TypeError,
|
|
"expected a single-segment buffer object");
|
|
return -1;
|
|
}
|
|
len = (*pb->bf_getcharbuffer)(obj, 0, &pp);
|
|
if (len < 0)
|
|
return -1;
|
|
*buffer = pp;
|
|
*buffer_len = len;
|
|
return 0;
|
|
}
|
|
|
|
int
|
|
PyObject_CheckReadBuffer(PyObject *obj)
|
|
{
|
|
PyBufferProcs *pb = obj->ob_type->tp_as_buffer;
|
|
|
|
if (pb == NULL ||
|
|
pb->bf_getreadbuffer == NULL ||
|
|
pb->bf_getsegcount == NULL ||
|
|
(*pb->bf_getsegcount)(obj, NULL) != 1)
|
|
return 0;
|
|
return 1;
|
|
}
|
|
|
|
int PyObject_AsReadBuffer(PyObject *obj,
|
|
const void **buffer,
|
|
Py_ssize_t *buffer_len)
|
|
{
|
|
PyBufferProcs *pb;
|
|
void *pp;
|
|
Py_ssize_t len;
|
|
|
|
if (obj == NULL || buffer == NULL || buffer_len == NULL) {
|
|
null_error();
|
|
return -1;
|
|
}
|
|
pb = obj->ob_type->tp_as_buffer;
|
|
if (pb == NULL ||
|
|
pb->bf_getreadbuffer == NULL ||
|
|
pb->bf_getsegcount == NULL) {
|
|
PyErr_SetString(PyExc_TypeError,
|
|
"expected a readable buffer object");
|
|
return -1;
|
|
}
|
|
if ((*pb->bf_getsegcount)(obj, NULL) != 1) {
|
|
PyErr_SetString(PyExc_TypeError,
|
|
"expected a single-segment buffer object");
|
|
return -1;
|
|
}
|
|
len = (*pb->bf_getreadbuffer)(obj, 0, &pp);
|
|
if (len < 0)
|
|
return -1;
|
|
*buffer = pp;
|
|
*buffer_len = len;
|
|
return 0;
|
|
}
|
|
|
|
int PyObject_AsWriteBuffer(PyObject *obj,
|
|
void **buffer,
|
|
Py_ssize_t *buffer_len)
|
|
{
|
|
PyBufferProcs *pb;
|
|
void*pp;
|
|
Py_ssize_t len;
|
|
|
|
if (obj == NULL || buffer == NULL || buffer_len == NULL) {
|
|
null_error();
|
|
return -1;
|
|
}
|
|
pb = obj->ob_type->tp_as_buffer;
|
|
if (pb == NULL ||
|
|
pb->bf_getwritebuffer == NULL ||
|
|
pb->bf_getsegcount == NULL) {
|
|
PyErr_SetString(PyExc_TypeError,
|
|
"expected a writeable buffer object");
|
|
return -1;
|
|
}
|
|
if ((*pb->bf_getsegcount)(obj, NULL) != 1) {
|
|
PyErr_SetString(PyExc_TypeError,
|
|
"expected a single-segment buffer object");
|
|
return -1;
|
|
}
|
|
len = (*pb->bf_getwritebuffer)(obj,0,&pp);
|
|
if (len < 0)
|
|
return -1;
|
|
*buffer = pp;
|
|
*buffer_len = len;
|
|
return 0;
|
|
}
|
|
|
|
/* Operations on numbers */
|
|
|
|
int
|
|
PyNumber_Check(PyObject *o)
|
|
{
|
|
return o && o->ob_type->tp_as_number &&
|
|
(o->ob_type->tp_as_number->nb_int ||
|
|
o->ob_type->tp_as_number->nb_float);
|
|
}
|
|
|
|
/* Binary operators */
|
|
|
|
#define NB_SLOT(x) offsetof(PyNumberMethods, x)
|
|
#define NB_BINOP(nb_methods, slot) \
|
|
(*(binaryfunc*)(& ((char*)nb_methods)[slot]))
|
|
#define NB_TERNOP(nb_methods, slot) \
|
|
(*(ternaryfunc*)(& ((char*)nb_methods)[slot]))
|
|
|
|
/*
|
|
Calling scheme used for binary operations:
|
|
|
|
Order operations are tried until either a valid result or error:
|
|
w.op(v,w)[*], v.op(v,w), w.op(v,w)
|
|
|
|
[*] only when v->ob_type != w->ob_type && w->ob_type is a subclass of
|
|
v->ob_type
|
|
*/
|
|
|
|
static PyObject *
|
|
binary_op1(PyObject *v, PyObject *w, const int op_slot)
|
|
{
|
|
PyObject *x;
|
|
binaryfunc slotv = NULL;
|
|
binaryfunc slotw = NULL;
|
|
|
|
if (v->ob_type->tp_as_number != NULL)
|
|
slotv = NB_BINOP(v->ob_type->tp_as_number, op_slot);
|
|
if (w->ob_type != v->ob_type &&
|
|
w->ob_type->tp_as_number != NULL) {
|
|
slotw = NB_BINOP(w->ob_type->tp_as_number, op_slot);
|
|
if (slotw == slotv)
|
|
slotw = NULL;
|
|
}
|
|
if (slotv) {
|
|
if (slotw && PyType_IsSubtype(w->ob_type, v->ob_type)) {
|
|
x = slotw(v, w);
|
|
if (x != Py_NotImplemented)
|
|
return x;
|
|
Py_DECREF(x); /* can't do it */
|
|
slotw = NULL;
|
|
}
|
|
x = slotv(v, w);
|
|
if (x != Py_NotImplemented)
|
|
return x;
|
|
Py_DECREF(x); /* can't do it */
|
|
}
|
|
if (slotw) {
|
|
x = slotw(v, w);
|
|
if (x != Py_NotImplemented)
|
|
return x;
|
|
Py_DECREF(x); /* can't do it */
|
|
}
|
|
Py_INCREF(Py_NotImplemented);
|
|
return Py_NotImplemented;
|
|
}
|
|
|
|
static PyObject *
|
|
binop_type_error(PyObject *v, PyObject *w, const char *op_name)
|
|
{
|
|
PyErr_Format(PyExc_TypeError,
|
|
"unsupported operand type(s) for %.100s: "
|
|
"'%.100s' and '%.100s'",
|
|
op_name,
|
|
v->ob_type->tp_name,
|
|
w->ob_type->tp_name);
|
|
return NULL;
|
|
}
|
|
|
|
static PyObject *
|
|
binary_op(PyObject *v, PyObject *w, const int op_slot, const char *op_name)
|
|
{
|
|
PyObject *result = binary_op1(v, w, op_slot);
|
|
if (result == Py_NotImplemented) {
|
|
Py_DECREF(result);
|
|
return binop_type_error(v, w, op_name);
|
|
}
|
|
return result;
|
|
}
|
|
|
|
|
|
/*
|
|
Calling scheme used for ternary operations:
|
|
|
|
Order operations are tried until either a valid result or error:
|
|
v.op(v,w,z), w.op(v,w,z), z.op(v,w,z)
|
|
*/
|
|
|
|
static PyObject *
|
|
ternary_op(PyObject *v,
|
|
PyObject *w,
|
|
PyObject *z,
|
|
const int op_slot,
|
|
const char *op_name)
|
|
{
|
|
PyNumberMethods *mv, *mw, *mz;
|
|
PyObject *x = NULL;
|
|
ternaryfunc slotv = NULL;
|
|
ternaryfunc slotw = NULL;
|
|
ternaryfunc slotz = NULL;
|
|
|
|
mv = v->ob_type->tp_as_number;
|
|
mw = w->ob_type->tp_as_number;
|
|
if (mv != NULL)
|
|
slotv = NB_TERNOP(mv, op_slot);
|
|
if (w->ob_type != v->ob_type &&
|
|
mw != NULL) {
|
|
slotw = NB_TERNOP(mw, op_slot);
|
|
if (slotw == slotv)
|
|
slotw = NULL;
|
|
}
|
|
if (slotv) {
|
|
if (slotw && PyType_IsSubtype(w->ob_type, v->ob_type)) {
|
|
x = slotw(v, w, z);
|
|
if (x != Py_NotImplemented)
|
|
return x;
|
|
Py_DECREF(x); /* can't do it */
|
|
slotw = NULL;
|
|
}
|
|
x = slotv(v, w, z);
|
|
if (x != Py_NotImplemented)
|
|
return x;
|
|
Py_DECREF(x); /* can't do it */
|
|
}
|
|
if (slotw) {
|
|
x = slotw(v, w, z);
|
|
if (x != Py_NotImplemented)
|
|
return x;
|
|
Py_DECREF(x); /* can't do it */
|
|
}
|
|
mz = z->ob_type->tp_as_number;
|
|
if (mz != NULL) {
|
|
slotz = NB_TERNOP(mz, op_slot);
|
|
if (slotz == slotv || slotz == slotw)
|
|
slotz = NULL;
|
|
if (slotz) {
|
|
x = slotz(v, w, z);
|
|
if (x != Py_NotImplemented)
|
|
return x;
|
|
Py_DECREF(x); /* can't do it */
|
|
}
|
|
}
|
|
|
|
if (z == Py_None)
|
|
PyErr_Format(
|
|
PyExc_TypeError,
|
|
"unsupported operand type(s) for ** or pow(): "
|
|
"'%.100s' and '%.100s'",
|
|
v->ob_type->tp_name,
|
|
w->ob_type->tp_name);
|
|
else
|
|
PyErr_Format(
|
|
PyExc_TypeError,
|
|
"unsupported operand type(s) for pow(): "
|
|
"'%.100s', '%.100s', '%.100s'",
|
|
v->ob_type->tp_name,
|
|
w->ob_type->tp_name,
|
|
z->ob_type->tp_name);
|
|
return NULL;
|
|
}
|
|
|
|
#define BINARY_FUNC(func, op, op_name) \
|
|
PyObject * \
|
|
func(PyObject *v, PyObject *w) { \
|
|
return binary_op(v, w, NB_SLOT(op), op_name); \
|
|
}
|
|
|
|
BINARY_FUNC(PyNumber_Or, nb_or, "|")
|
|
BINARY_FUNC(PyNumber_Xor, nb_xor, "^")
|
|
BINARY_FUNC(PyNumber_And, nb_and, "&")
|
|
BINARY_FUNC(PyNumber_Lshift, nb_lshift, "<<")
|
|
BINARY_FUNC(PyNumber_Rshift, nb_rshift, ">>")
|
|
BINARY_FUNC(PyNumber_Subtract, nb_subtract, "-")
|
|
BINARY_FUNC(PyNumber_Divmod, nb_divmod, "divmod()")
|
|
|
|
PyObject *
|
|
PyNumber_Add(PyObject *v, PyObject *w)
|
|
{
|
|
PyObject *result = binary_op1(v, w, NB_SLOT(nb_add));
|
|
if (result == Py_NotImplemented) {
|
|
PySequenceMethods *m = v->ob_type->tp_as_sequence;
|
|
Py_DECREF(result);
|
|
if (m && m->sq_concat) {
|
|
return (*m->sq_concat)(v, w);
|
|
}
|
|
result = binop_type_error(v, w, "+");
|
|
}
|
|
return result;
|
|
}
|
|
|
|
static PyObject *
|
|
sequence_repeat(ssizeargfunc repeatfunc, PyObject *seq, PyObject *n)
|
|
{
|
|
Py_ssize_t count;
|
|
if (PyIndex_Check(n)) {
|
|
count = PyNumber_AsSsize_t(n, PyExc_OverflowError);
|
|
if (count == -1 && PyErr_Occurred())
|
|
return NULL;
|
|
}
|
|
else {
|
|
return type_error("can't multiply sequence by "
|
|
"non-int of type '%.200s'", n);
|
|
}
|
|
return (*repeatfunc)(seq, count);
|
|
}
|
|
|
|
PyObject *
|
|
PyNumber_Multiply(PyObject *v, PyObject *w)
|
|
{
|
|
PyObject *result = binary_op1(v, w, NB_SLOT(nb_multiply));
|
|
if (result == Py_NotImplemented) {
|
|
PySequenceMethods *mv = v->ob_type->tp_as_sequence;
|
|
PySequenceMethods *mw = w->ob_type->tp_as_sequence;
|
|
Py_DECREF(result);
|
|
if (mv && mv->sq_repeat) {
|
|
return sequence_repeat(mv->sq_repeat, v, w);
|
|
}
|
|
else if (mw && mw->sq_repeat) {
|
|
return sequence_repeat(mw->sq_repeat, w, v);
|
|
}
|
|
result = binop_type_error(v, w, "*");
|
|
}
|
|
return result;
|
|
}
|
|
|
|
PyObject *
|
|
PyNumber_FloorDivide(PyObject *v, PyObject *w)
|
|
{
|
|
/* XXX tp_flags test */
|
|
return binary_op(v, w, NB_SLOT(nb_floor_divide), "//");
|
|
}
|
|
|
|
PyObject *
|
|
PyNumber_TrueDivide(PyObject *v, PyObject *w)
|
|
{
|
|
/* XXX tp_flags test */
|
|
return binary_op(v, w, NB_SLOT(nb_true_divide), "/");
|
|
}
|
|
|
|
PyObject *
|
|
PyNumber_Remainder(PyObject *v, PyObject *w)
|
|
{
|
|
return binary_op(v, w, NB_SLOT(nb_remainder), "%");
|
|
}
|
|
|
|
PyObject *
|
|
PyNumber_Power(PyObject *v, PyObject *w, PyObject *z)
|
|
{
|
|
return ternary_op(v, w, z, NB_SLOT(nb_power), "** or pow()");
|
|
}
|
|
|
|
/* Binary in-place operators */
|
|
|
|
/* The in-place operators are defined to fall back to the 'normal',
|
|
non in-place operations, if the in-place methods are not in place.
|
|
|
|
- If the left hand object has the appropriate struct members, and
|
|
they are filled, call the appropriate function and return the
|
|
result. No coercion is done on the arguments; the left-hand object
|
|
is the one the operation is performed on, and it's up to the
|
|
function to deal with the right-hand object.
|
|
|
|
- Otherwise, in-place modification is not supported. Handle it exactly as
|
|
a non in-place operation of the same kind.
|
|
|
|
*/
|
|
|
|
static PyObject *
|
|
binary_iop1(PyObject *v, PyObject *w, const int iop_slot, const int op_slot)
|
|
{
|
|
PyNumberMethods *mv = v->ob_type->tp_as_number;
|
|
if (mv != NULL) {
|
|
binaryfunc slot = NB_BINOP(mv, iop_slot);
|
|
if (slot) {
|
|
PyObject *x = (slot)(v, w);
|
|
if (x != Py_NotImplemented) {
|
|
return x;
|
|
}
|
|
Py_DECREF(x);
|
|
}
|
|
}
|
|
return binary_op1(v, w, op_slot);
|
|
}
|
|
|
|
static PyObject *
|
|
binary_iop(PyObject *v, PyObject *w, const int iop_slot, const int op_slot,
|
|
const char *op_name)
|
|
{
|
|
PyObject *result = binary_iop1(v, w, iop_slot, op_slot);
|
|
if (result == Py_NotImplemented) {
|
|
Py_DECREF(result);
|
|
return binop_type_error(v, w, op_name);
|
|
}
|
|
return result;
|
|
}
|
|
|
|
#define INPLACE_BINOP(func, iop, op, op_name) \
|
|
PyObject * \
|
|
func(PyObject *v, PyObject *w) { \
|
|
return binary_iop(v, w, NB_SLOT(iop), NB_SLOT(op), op_name); \
|
|
}
|
|
|
|
INPLACE_BINOP(PyNumber_InPlaceOr, nb_inplace_or, nb_or, "|=")
|
|
INPLACE_BINOP(PyNumber_InPlaceXor, nb_inplace_xor, nb_xor, "^=")
|
|
INPLACE_BINOP(PyNumber_InPlaceAnd, nb_inplace_and, nb_and, "&=")
|
|
INPLACE_BINOP(PyNumber_InPlaceLshift, nb_inplace_lshift, nb_lshift, "<<=")
|
|
INPLACE_BINOP(PyNumber_InPlaceRshift, nb_inplace_rshift, nb_rshift, ">>=")
|
|
INPLACE_BINOP(PyNumber_InPlaceSubtract, nb_inplace_subtract, nb_subtract, "-=")
|
|
|
|
PyObject *
|
|
PyNumber_InPlaceFloorDivide(PyObject *v, PyObject *w)
|
|
{
|
|
/* XXX tp_flags test */
|
|
return binary_iop(v, w, NB_SLOT(nb_inplace_floor_divide),
|
|
NB_SLOT(nb_floor_divide), "//=");
|
|
}
|
|
|
|
PyObject *
|
|
PyNumber_InPlaceTrueDivide(PyObject *v, PyObject *w)
|
|
{
|
|
/* XXX tp_flags test */
|
|
return binary_iop(v, w, NB_SLOT(nb_inplace_true_divide),
|
|
NB_SLOT(nb_true_divide), "/=");
|
|
}
|
|
|
|
PyObject *
|
|
PyNumber_InPlaceAdd(PyObject *v, PyObject *w)
|
|
{
|
|
PyObject *result = binary_iop1(v, w, NB_SLOT(nb_inplace_add),
|
|
NB_SLOT(nb_add));
|
|
if (result == Py_NotImplemented) {
|
|
PySequenceMethods *m = v->ob_type->tp_as_sequence;
|
|
Py_DECREF(result);
|
|
if (m != NULL) {
|
|
binaryfunc f = NULL;
|
|
f = m->sq_inplace_concat;
|
|
if (f == NULL)
|
|
f = m->sq_concat;
|
|
if (f != NULL)
|
|
return (*f)(v, w);
|
|
}
|
|
result = binop_type_error(v, w, "+=");
|
|
}
|
|
return result;
|
|
}
|
|
|
|
PyObject *
|
|
PyNumber_InPlaceMultiply(PyObject *v, PyObject *w)
|
|
{
|
|
PyObject *result = binary_iop1(v, w, NB_SLOT(nb_inplace_multiply),
|
|
NB_SLOT(nb_multiply));
|
|
if (result == Py_NotImplemented) {
|
|
ssizeargfunc f = NULL;
|
|
PySequenceMethods *mv = v->ob_type->tp_as_sequence;
|
|
PySequenceMethods *mw = w->ob_type->tp_as_sequence;
|
|
Py_DECREF(result);
|
|
if (mv != NULL) {
|
|
f = mv->sq_inplace_repeat;
|
|
if (f == NULL)
|
|
f = mv->sq_repeat;
|
|
if (f != NULL)
|
|
return sequence_repeat(f, v, w);
|
|
}
|
|
else if (mw != NULL) {
|
|
/* Note that the right hand operand should not be
|
|
* mutated in this case so sq_inplace_repeat is not
|
|
* used. */
|
|
if (mw->sq_repeat)
|
|
return sequence_repeat(mw->sq_repeat, w, v);
|
|
}
|
|
result = binop_type_error(v, w, "*=");
|
|
}
|
|
return result;
|
|
}
|
|
|
|
PyObject *
|
|
PyNumber_InPlaceRemainder(PyObject *v, PyObject *w)
|
|
{
|
|
return binary_iop(v, w, NB_SLOT(nb_inplace_remainder),
|
|
NB_SLOT(nb_remainder), "%=");
|
|
}
|
|
|
|
PyObject *
|
|
PyNumber_InPlacePower(PyObject *v, PyObject *w, PyObject *z)
|
|
{
|
|
if (v->ob_type->tp_as_number &&
|
|
v->ob_type->tp_as_number->nb_inplace_power != NULL) {
|
|
return ternary_op(v, w, z, NB_SLOT(nb_inplace_power), "**=");
|
|
}
|
|
else {
|
|
return ternary_op(v, w, z, NB_SLOT(nb_power), "**=");
|
|
}
|
|
}
|
|
|
|
|
|
/* Unary operators and functions */
|
|
|
|
PyObject *
|
|
PyNumber_Negative(PyObject *o)
|
|
{
|
|
PyNumberMethods *m;
|
|
|
|
if (o == NULL)
|
|
return null_error();
|
|
m = o->ob_type->tp_as_number;
|
|
if (m && m->nb_negative)
|
|
return (*m->nb_negative)(o);
|
|
|
|
return type_error("bad operand type for unary -: '%.200s'", o);
|
|
}
|
|
|
|
PyObject *
|
|
PyNumber_Positive(PyObject *o)
|
|
{
|
|
PyNumberMethods *m;
|
|
|
|
if (o == NULL)
|
|
return null_error();
|
|
m = o->ob_type->tp_as_number;
|
|
if (m && m->nb_positive)
|
|
return (*m->nb_positive)(o);
|
|
|
|
return type_error("bad operand type for unary +: '%.200s'", o);
|
|
}
|
|
|
|
PyObject *
|
|
PyNumber_Invert(PyObject *o)
|
|
{
|
|
PyNumberMethods *m;
|
|
|
|
if (o == NULL)
|
|
return null_error();
|
|
m = o->ob_type->tp_as_number;
|
|
if (m && m->nb_invert)
|
|
return (*m->nb_invert)(o);
|
|
|
|
return type_error("bad operand type for unary ~: '%.200s'", o);
|
|
}
|
|
|
|
PyObject *
|
|
PyNumber_Absolute(PyObject *o)
|
|
{
|
|
PyNumberMethods *m;
|
|
|
|
if (o == NULL)
|
|
return null_error();
|
|
m = o->ob_type->tp_as_number;
|
|
if (m && m->nb_absolute)
|
|
return m->nb_absolute(o);
|
|
|
|
return type_error("bad operand type for abs(): '%.200s'", o);
|
|
}
|
|
|
|
/* Add a check for embedded NULL-bytes in the argument. */
|
|
static PyObject *
|
|
int_from_string(const char *s, Py_ssize_t len)
|
|
{
|
|
char *end;
|
|
PyObject *x;
|
|
|
|
x = PyInt_FromString((char*)s, &end, 10);
|
|
if (x == NULL)
|
|
return NULL;
|
|
if (end != s + len) {
|
|
PyErr_SetString(PyExc_ValueError,
|
|
"null byte in argument for int()");
|
|
Py_DECREF(x);
|
|
return NULL;
|
|
}
|
|
return x;
|
|
}
|
|
|
|
/* Return a Python Int or Long from the object item
|
|
Raise TypeError if the result is not an int-or-long
|
|
or if the object cannot be interpreted as an index.
|
|
*/
|
|
PyObject *
|
|
PyNumber_Index(PyObject *item)
|
|
{
|
|
PyObject *result = NULL;
|
|
if (item == NULL)
|
|
return null_error();
|
|
if (PyInt_Check(item) || PyLong_Check(item)) {
|
|
Py_INCREF(item);
|
|
return item;
|
|
}
|
|
if (PyIndex_Check(item)) {
|
|
result = item->ob_type->tp_as_number->nb_index(item);
|
|
if (result &&
|
|
!PyInt_Check(result) && !PyLong_Check(result)) {
|
|
PyErr_Format(PyExc_TypeError,
|
|
"__index__ returned non-(int,long) " \
|
|
"(type %.200s)",
|
|
result->ob_type->tp_name);
|
|
Py_DECREF(result);
|
|
return NULL;
|
|
}
|
|
}
|
|
else {
|
|
PyErr_Format(PyExc_TypeError,
|
|
"'%.200s' object cannot be interpreted "
|
|
"as an index", item->ob_type->tp_name);
|
|
}
|
|
return result;
|
|
}
|
|
|
|
/* Return an error on Overflow only if err is not NULL*/
|
|
|
|
Py_ssize_t
|
|
PyNumber_AsSsize_t(PyObject *item, PyObject *err)
|
|
{
|
|
Py_ssize_t result;
|
|
PyObject *runerr;
|
|
PyObject *value = PyNumber_Index(item);
|
|
if (value == NULL)
|
|
return -1;
|
|
|
|
/* We're done if PyInt_AsSsize_t() returns without error. */
|
|
result = PyInt_AsSsize_t(value);
|
|
if (result != -1 || !(runerr = PyErr_Occurred()))
|
|
goto finish;
|
|
|
|
/* Error handling code -- only manage OverflowError differently */
|
|
if (!PyErr_GivenExceptionMatches(runerr, PyExc_OverflowError))
|
|
goto finish;
|
|
|
|
PyErr_Clear();
|
|
/* If no error-handling desired then the default clipping
|
|
is sufficient.
|
|
*/
|
|
if (!err) {
|
|
assert(PyLong_Check(value));
|
|
/* Whether or not it is less than or equal to
|
|
zero is determined by the sign of ob_size
|
|
*/
|
|
if (_PyLong_Sign(value) < 0)
|
|
result = PY_SSIZE_T_MIN;
|
|
else
|
|
result = PY_SSIZE_T_MAX;
|
|
}
|
|
else {
|
|
/* Otherwise replace the error with caller's error object. */
|
|
PyErr_Format(err,
|
|
"cannot fit '%.200s' into an index-sized integer",
|
|
item->ob_type->tp_name);
|
|
}
|
|
|
|
finish:
|
|
Py_DECREF(value);
|
|
return result;
|
|
}
|
|
|
|
|
|
PyObject *
|
|
PyNumber_Int(PyObject *o)
|
|
{
|
|
PyNumberMethods *m;
|
|
const char *buffer;
|
|
Py_ssize_t buffer_len;
|
|
|
|
if (o == NULL)
|
|
return null_error();
|
|
if (PyInt_CheckExact(o)) {
|
|
Py_INCREF(o);
|
|
return o;
|
|
}
|
|
m = o->ob_type->tp_as_number;
|
|
if (m && m->nb_int) { /* This should include subclasses of int */
|
|
PyObject *res = m->nb_int(o);
|
|
if (res && (!PyInt_Check(res) && !PyLong_Check(res))) {
|
|
PyErr_Format(PyExc_TypeError,
|
|
"__int__ returned non-int (type %.200s)",
|
|
res->ob_type->tp_name);
|
|
Py_DECREF(res);
|
|
return NULL;
|
|
}
|
|
return res;
|
|
}
|
|
if (PyInt_Check(o)) { /* A int subclass without nb_int */
|
|
PyIntObject *io = (PyIntObject*)o;
|
|
return PyInt_FromLong(io->ob_ival);
|
|
}
|
|
if (PyString_Check(o))
|
|
return int_from_string(PyString_AS_STRING(o),
|
|
PyString_GET_SIZE(o));
|
|
#ifdef Py_USING_UNICODE
|
|
if (PyUnicode_Check(o))
|
|
return PyInt_FromUnicode(PyUnicode_AS_UNICODE(o),
|
|
PyUnicode_GET_SIZE(o),
|
|
10);
|
|
#endif
|
|
if (!PyObject_AsCharBuffer(o, &buffer, &buffer_len))
|
|
return int_from_string((char*)buffer, buffer_len);
|
|
|
|
return type_error("int() argument must be a string or a "
|
|
"number, not '%.200s'", o);
|
|
}
|
|
|
|
/* Add a check for embedded NULL-bytes in the argument. */
|
|
static PyObject *
|
|
long_from_string(const char *s, Py_ssize_t len)
|
|
{
|
|
char *end;
|
|
PyObject *x;
|
|
|
|
x = PyLong_FromString((char*)s, &end, 10);
|
|
if (x == NULL)
|
|
return NULL;
|
|
if (end != s + len) {
|
|
PyErr_SetString(PyExc_ValueError,
|
|
"null byte in argument for long()");
|
|
Py_DECREF(x);
|
|
return NULL;
|
|
}
|
|
return x;
|
|
}
|
|
|
|
PyObject *
|
|
PyNumber_Long(PyObject *o)
|
|
{
|
|
PyNumberMethods *m;
|
|
const char *buffer;
|
|
Py_ssize_t buffer_len;
|
|
|
|
if (o == NULL)
|
|
return null_error();
|
|
m = o->ob_type->tp_as_number;
|
|
if (m && m->nb_long) { /* This should include subclasses of long */
|
|
PyObject *res = m->nb_long(o);
|
|
if (res && (!PyInt_Check(res) && !PyLong_Check(res))) {
|
|
PyErr_Format(PyExc_TypeError,
|
|
"__long__ returned non-long (type %.200s)",
|
|
res->ob_type->tp_name);
|
|
Py_DECREF(res);
|
|
return NULL;
|
|
}
|
|
return res;
|
|
}
|
|
if (PyLong_Check(o)) /* A long subclass without nb_long */
|
|
return _PyLong_Copy((PyLongObject *)o);
|
|
if (PyString_Check(o))
|
|
/* need to do extra error checking that PyLong_FromString()
|
|
* doesn't do. In particular long('9.5') must raise an
|
|
* exception, not truncate the float.
|
|
*/
|
|
return long_from_string(PyString_AS_STRING(o),
|
|
PyString_GET_SIZE(o));
|
|
#ifdef Py_USING_UNICODE
|
|
if (PyUnicode_Check(o))
|
|
/* The above check is done in PyLong_FromUnicode(). */
|
|
return PyLong_FromUnicode(PyUnicode_AS_UNICODE(o),
|
|
PyUnicode_GET_SIZE(o),
|
|
10);
|
|
#endif
|
|
if (!PyObject_AsCharBuffer(o, &buffer, &buffer_len))
|
|
return long_from_string(buffer, buffer_len);
|
|
|
|
return type_error("long() argument must be a string or a "
|
|
"number, not '%.200s'", o);
|
|
}
|
|
|
|
PyObject *
|
|
PyNumber_Float(PyObject *o)
|
|
{
|
|
PyNumberMethods *m;
|
|
|
|
if (o == NULL)
|
|
return null_error();
|
|
m = o->ob_type->tp_as_number;
|
|
if (m && m->nb_float) { /* This should include subclasses of float */
|
|
PyObject *res = m->nb_float(o);
|
|
if (res && !PyFloat_Check(res)) {
|
|
PyErr_Format(PyExc_TypeError,
|
|
"__float__ returned non-float (type %.200s)",
|
|
res->ob_type->tp_name);
|
|
Py_DECREF(res);
|
|
return NULL;
|
|
}
|
|
return res;
|
|
}
|
|
if (PyFloat_Check(o)) { /* A float subclass with nb_float == NULL */
|
|
PyFloatObject *po = (PyFloatObject *)o;
|
|
return PyFloat_FromDouble(po->ob_fval);
|
|
}
|
|
return PyFloat_FromString(o, NULL);
|
|
}
|
|
|
|
/* Operations on sequences */
|
|
|
|
int
|
|
PySequence_Check(PyObject *s)
|
|
{
|
|
return s != NULL && s->ob_type->tp_as_sequence &&
|
|
s->ob_type->tp_as_sequence->sq_item != NULL;
|
|
}
|
|
|
|
Py_ssize_t
|
|
PySequence_Size(PyObject *s)
|
|
{
|
|
PySequenceMethods *m;
|
|
|
|
if (s == NULL) {
|
|
null_error();
|
|
return -1;
|
|
}
|
|
|
|
m = s->ob_type->tp_as_sequence;
|
|
if (m && m->sq_length)
|
|
return m->sq_length(s);
|
|
|
|
type_error("object of type '%.200s' has no len()", s);
|
|
return -1;
|
|
}
|
|
|
|
#undef PySequence_Length
|
|
Py_ssize_t
|
|
PySequence_Length(PyObject *s)
|
|
{
|
|
return PySequence_Size(s);
|
|
}
|
|
#define PySequence_Length PySequence_Size
|
|
|
|
PyObject *
|
|
PySequence_Concat(PyObject *s, PyObject *o)
|
|
{
|
|
PySequenceMethods *m;
|
|
|
|
if (s == NULL || o == NULL)
|
|
return null_error();
|
|
|
|
m = s->ob_type->tp_as_sequence;
|
|
if (m && m->sq_concat)
|
|
return m->sq_concat(s, o);
|
|
|
|
/* Instances of user classes defining an __add__() method only
|
|
have an nb_add slot, not an sq_concat slot. So we fall back
|
|
to nb_add if both arguments appear to be sequences. */
|
|
if (PySequence_Check(s) && PySequence_Check(o)) {
|
|
PyObject *result = binary_op1(s, o, NB_SLOT(nb_add));
|
|
if (result != Py_NotImplemented)
|
|
return result;
|
|
Py_DECREF(result);
|
|
}
|
|
return type_error("'%.200s' object can't be concatenated", s);
|
|
}
|
|
|
|
PyObject *
|
|
PySequence_Repeat(PyObject *o, Py_ssize_t count)
|
|
{
|
|
PySequenceMethods *m;
|
|
|
|
if (o == NULL)
|
|
return null_error();
|
|
|
|
m = o->ob_type->tp_as_sequence;
|
|
if (m && m->sq_repeat)
|
|
return m->sq_repeat(o, count);
|
|
|
|
/* Instances of user classes defining a __mul__() method only
|
|
have an nb_multiply slot, not an sq_repeat slot. so we fall back
|
|
to nb_multiply if o appears to be a sequence. */
|
|
if (PySequence_Check(o)) {
|
|
PyObject *n, *result;
|
|
n = PyInt_FromSsize_t(count);
|
|
if (n == NULL)
|
|
return NULL;
|
|
result = binary_op1(o, n, NB_SLOT(nb_multiply));
|
|
Py_DECREF(n);
|
|
if (result != Py_NotImplemented)
|
|
return result;
|
|
Py_DECREF(result);
|
|
}
|
|
return type_error("'%.200s' object can't be repeated", o);
|
|
}
|
|
|
|
PyObject *
|
|
PySequence_InPlaceConcat(PyObject *s, PyObject *o)
|
|
{
|
|
PySequenceMethods *m;
|
|
|
|
if (s == NULL || o == NULL)
|
|
return null_error();
|
|
|
|
m = s->ob_type->tp_as_sequence;
|
|
if (m && m->sq_inplace_concat)
|
|
return m->sq_inplace_concat(s, o);
|
|
if (m && m->sq_concat)
|
|
return m->sq_concat(s, o);
|
|
|
|
if (PySequence_Check(s) && PySequence_Check(o)) {
|
|
PyObject *result = binary_iop1(s, o, NB_SLOT(nb_inplace_add),
|
|
NB_SLOT(nb_add));
|
|
if (result != Py_NotImplemented)
|
|
return result;
|
|
Py_DECREF(result);
|
|
}
|
|
return type_error("'%.200s' object can't be concatenated", s);
|
|
}
|
|
|
|
PyObject *
|
|
PySequence_InPlaceRepeat(PyObject *o, Py_ssize_t count)
|
|
{
|
|
PySequenceMethods *m;
|
|
|
|
if (o == NULL)
|
|
return null_error();
|
|
|
|
m = o->ob_type->tp_as_sequence;
|
|
if (m && m->sq_inplace_repeat)
|
|
return m->sq_inplace_repeat(o, count);
|
|
if (m && m->sq_repeat)
|
|
return m->sq_repeat(o, count);
|
|
|
|
if (PySequence_Check(o)) {
|
|
PyObject *n, *result;
|
|
n = PyInt_FromSsize_t(count);
|
|
if (n == NULL)
|
|
return NULL;
|
|
result = binary_iop1(o, n, NB_SLOT(nb_inplace_multiply),
|
|
NB_SLOT(nb_multiply));
|
|
Py_DECREF(n);
|
|
if (result != Py_NotImplemented)
|
|
return result;
|
|
Py_DECREF(result);
|
|
}
|
|
return type_error("'%.200s' object can't be repeated", o);
|
|
}
|
|
|
|
PyObject *
|
|
PySequence_GetItem(PyObject *s, Py_ssize_t i)
|
|
{
|
|
PySequenceMethods *m;
|
|
|
|
if (s == NULL)
|
|
return null_error();
|
|
|
|
m = s->ob_type->tp_as_sequence;
|
|
if (m && m->sq_item) {
|
|
if (i < 0) {
|
|
if (m->sq_length) {
|
|
Py_ssize_t l = (*m->sq_length)(s);
|
|
if (l < 0)
|
|
return NULL;
|
|
i += l;
|
|
}
|
|
}
|
|
return m->sq_item(s, i);
|
|
}
|
|
|
|
return type_error("'%.200s' object is unindexable", s);
|
|
}
|
|
|
|
PyObject *
|
|
PySequence_GetSlice(PyObject *s, Py_ssize_t i1, Py_ssize_t i2)
|
|
{
|
|
PySequenceMethods *m;
|
|
PyMappingMethods *mp;
|
|
|
|
if (!s) return null_error();
|
|
|
|
m = s->ob_type->tp_as_sequence;
|
|
if (m && m->sq_slice) {
|
|
if (i1 < 0 || i2 < 0) {
|
|
if (m->sq_length) {
|
|
Py_ssize_t l = (*m->sq_length)(s);
|
|
if (l < 0)
|
|
return NULL;
|
|
if (i1 < 0)
|
|
i1 += l;
|
|
if (i2 < 0)
|
|
i2 += l;
|
|
}
|
|
}
|
|
return m->sq_slice(s, i1, i2);
|
|
} else if ((mp = s->ob_type->tp_as_mapping) && mp->mp_subscript) {
|
|
PyObject *res;
|
|
PyObject *slice = _PySlice_FromIndices(i1, i2);
|
|
if (!slice)
|
|
return NULL;
|
|
res = mp->mp_subscript(s, slice);
|
|
Py_DECREF(slice);
|
|
return res;
|
|
}
|
|
|
|
return type_error("'%.200s' object is unsliceable", s);
|
|
}
|
|
|
|
int
|
|
PySequence_SetItem(PyObject *s, Py_ssize_t i, PyObject *o)
|
|
{
|
|
PySequenceMethods *m;
|
|
|
|
if (s == NULL) {
|
|
null_error();
|
|
return -1;
|
|
}
|
|
|
|
m = s->ob_type->tp_as_sequence;
|
|
if (m && m->sq_ass_item) {
|
|
if (i < 0) {
|
|
if (m->sq_length) {
|
|
Py_ssize_t l = (*m->sq_length)(s);
|
|
if (l < 0)
|
|
return -1;
|
|
i += l;
|
|
}
|
|
}
|
|
return m->sq_ass_item(s, i, o);
|
|
}
|
|
|
|
type_error("'%.200s' object does not support item assignment", s);
|
|
return -1;
|
|
}
|
|
|
|
int
|
|
PySequence_DelItem(PyObject *s, Py_ssize_t i)
|
|
{
|
|
PySequenceMethods *m;
|
|
|
|
if (s == NULL) {
|
|
null_error();
|
|
return -1;
|
|
}
|
|
|
|
m = s->ob_type->tp_as_sequence;
|
|
if (m && m->sq_ass_item) {
|
|
if (i < 0) {
|
|
if (m->sq_length) {
|
|
Py_ssize_t l = (*m->sq_length)(s);
|
|
if (l < 0)
|
|
return -1;
|
|
i += l;
|
|
}
|
|
}
|
|
return m->sq_ass_item(s, i, (PyObject *)NULL);
|
|
}
|
|
|
|
type_error("'%.200s' object doesn't support item deletion", s);
|
|
return -1;
|
|
}
|
|
|
|
int
|
|
PySequence_SetSlice(PyObject *s, Py_ssize_t i1, Py_ssize_t i2, PyObject *o)
|
|
{
|
|
PySequenceMethods *m;
|
|
PyMappingMethods *mp;
|
|
|
|
if (s == NULL) {
|
|
null_error();
|
|
return -1;
|
|
}
|
|
|
|
m = s->ob_type->tp_as_sequence;
|
|
if (m && m->sq_ass_slice) {
|
|
if (i1 < 0 || i2 < 0) {
|
|
if (m->sq_length) {
|
|
Py_ssize_t l = (*m->sq_length)(s);
|
|
if (l < 0)
|
|
return -1;
|
|
if (i1 < 0)
|
|
i1 += l;
|
|
if (i2 < 0)
|
|
i2 += l;
|
|
}
|
|
}
|
|
return m->sq_ass_slice(s, i1, i2, o);
|
|
} else if ((mp = s->ob_type->tp_as_mapping) && mp->mp_ass_subscript) {
|
|
int res;
|
|
PyObject *slice = _PySlice_FromIndices(i1, i2);
|
|
if (!slice)
|
|
return -1;
|
|
res = mp->mp_ass_subscript(s, slice, o);
|
|
Py_DECREF(slice);
|
|
return res;
|
|
}
|
|
|
|
type_error("'%.200s' object doesn't support slice assignment", s);
|
|
return -1;
|
|
}
|
|
|
|
int
|
|
PySequence_DelSlice(PyObject *s, Py_ssize_t i1, Py_ssize_t i2)
|
|
{
|
|
PySequenceMethods *m;
|
|
|
|
if (s == NULL) {
|
|
null_error();
|
|
return -1;
|
|
}
|
|
|
|
m = s->ob_type->tp_as_sequence;
|
|
if (m && m->sq_ass_slice) {
|
|
if (i1 < 0 || i2 < 0) {
|
|
if (m->sq_length) {
|
|
Py_ssize_t l = (*m->sq_length)(s);
|
|
if (l < 0)
|
|
return -1;
|
|
if (i1 < 0)
|
|
i1 += l;
|
|
if (i2 < 0)
|
|
i2 += l;
|
|
}
|
|
}
|
|
return m->sq_ass_slice(s, i1, i2, (PyObject *)NULL);
|
|
}
|
|
type_error("'%.200s' object doesn't support slice deletion", s);
|
|
return -1;
|
|
}
|
|
|
|
PyObject *
|
|
PySequence_Tuple(PyObject *v)
|
|
{
|
|
PyObject *it; /* iter(v) */
|
|
Py_ssize_t n; /* guess for result tuple size */
|
|
PyObject *result;
|
|
Py_ssize_t j;
|
|
|
|
if (v == NULL)
|
|
return null_error();
|
|
|
|
/* Special-case the common tuple and list cases, for efficiency. */
|
|
if (PyTuple_CheckExact(v)) {
|
|
/* Note that we can't know whether it's safe to return
|
|
a tuple *subclass* instance as-is, hence the restriction
|
|
to exact tuples here. In contrast, lists always make
|
|
a copy, so there's no need for exactness below. */
|
|
Py_INCREF(v);
|
|
return v;
|
|
}
|
|
if (PyList_Check(v))
|
|
return PyList_AsTuple(v);
|
|
|
|
/* Get iterator. */
|
|
it = PyObject_GetIter(v);
|
|
if (it == NULL)
|
|
return NULL;
|
|
|
|
/* Guess result size and allocate space. */
|
|
n = _PyObject_LengthHint(v);
|
|
if (n < 0) {
|
|
if (!PyErr_ExceptionMatches(PyExc_TypeError) &&
|
|
!PyErr_ExceptionMatches(PyExc_AttributeError)) {
|
|
Py_DECREF(it);
|
|
return NULL;
|
|
}
|
|
PyErr_Clear();
|
|
n = 10; /* arbitrary */
|
|
}
|
|
result = PyTuple_New(n);
|
|
if (result == NULL)
|
|
goto Fail;
|
|
|
|
/* Fill the tuple. */
|
|
for (j = 0; ; ++j) {
|
|
PyObject *item = PyIter_Next(it);
|
|
if (item == NULL) {
|
|
if (PyErr_Occurred())
|
|
goto Fail;
|
|
break;
|
|
}
|
|
if (j >= n) {
|
|
Py_ssize_t oldn = n;
|
|
/* The over-allocation strategy can grow a bit faster
|
|
than for lists because unlike lists the
|
|
over-allocation isn't permanent -- we reclaim
|
|
the excess before the end of this routine.
|
|
So, grow by ten and then add 25%.
|
|
*/
|
|
n += 10;
|
|
n += n >> 2;
|
|
if (n < oldn) {
|
|
/* Check for overflow */
|
|
PyErr_NoMemory();
|
|
Py_DECREF(item);
|
|
goto Fail;
|
|
}
|
|
if (_PyTuple_Resize(&result, n) != 0) {
|
|
Py_DECREF(item);
|
|
goto Fail;
|
|
}
|
|
}
|
|
PyTuple_SET_ITEM(result, j, item);
|
|
}
|
|
|
|
/* Cut tuple back if guess was too large. */
|
|
if (j < n &&
|
|
_PyTuple_Resize(&result, j) != 0)
|
|
goto Fail;
|
|
|
|
Py_DECREF(it);
|
|
return result;
|
|
|
|
Fail:
|
|
Py_XDECREF(result);
|
|
Py_DECREF(it);
|
|
return NULL;
|
|
}
|
|
|
|
PyObject *
|
|
PySequence_List(PyObject *v)
|
|
{
|
|
PyObject *result; /* result list */
|
|
PyObject *rv; /* return value from PyList_Extend */
|
|
|
|
if (v == NULL)
|
|
return null_error();
|
|
|
|
result = PyList_New(0);
|
|
if (result == NULL)
|
|
return NULL;
|
|
|
|
rv = _PyList_Extend((PyListObject *)result, v);
|
|
if (rv == NULL) {
|
|
Py_DECREF(result);
|
|
return NULL;
|
|
}
|
|
Py_DECREF(rv);
|
|
return result;
|
|
}
|
|
|
|
PyObject *
|
|
PySequence_Fast(PyObject *v, const char *m)
|
|
{
|
|
PyObject *it;
|
|
|
|
if (v == NULL)
|
|
return null_error();
|
|
|
|
if (PyList_CheckExact(v) || PyTuple_CheckExact(v)) {
|
|
Py_INCREF(v);
|
|
return v;
|
|
}
|
|
|
|
it = PyObject_GetIter(v);
|
|
if (it == NULL) {
|
|
if (PyErr_ExceptionMatches(PyExc_TypeError))
|
|
PyErr_SetString(PyExc_TypeError, m);
|
|
return NULL;
|
|
}
|
|
|
|
v = PySequence_List(it);
|
|
Py_DECREF(it);
|
|
|
|
return v;
|
|
}
|
|
|
|
/* Iterate over seq. Result depends on the operation:
|
|
PY_ITERSEARCH_COUNT: -1 if error, else # of times obj appears in seq.
|
|
PY_ITERSEARCH_INDEX: 0-based index of first occurence 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.
|
|
*/
|
|
Py_ssize_t
|
|
_PySequence_IterSearch(PyObject *seq, PyObject *obj, int operation)
|
|
{
|
|
Py_ssize_t n;
|
|
int wrapped; /* for PY_ITERSEARCH_INDEX, true iff n wrapped around */
|
|
PyObject *it; /* iter(seq) */
|
|
|
|
if (seq == NULL || obj == NULL) {
|
|
null_error();
|
|
return -1;
|
|
}
|
|
|
|
it = PyObject_GetIter(seq);
|
|
if (it == NULL) {
|
|
type_error("argument of type '%.200s' is not iterable", seq);
|
|
return -1;
|
|
}
|
|
|
|
n = wrapped = 0;
|
|
for (;;) {
|
|
int cmp;
|
|
PyObject *item = PyIter_Next(it);
|
|
if (item == NULL) {
|
|
if (PyErr_Occurred())
|
|
goto Fail;
|
|
break;
|
|
}
|
|
|
|
cmp = PyObject_RichCompareBool(obj, item, Py_EQ);
|
|
Py_DECREF(item);
|
|
if (cmp < 0)
|
|
goto Fail;
|
|
if (cmp > 0) {
|
|
switch (operation) {
|
|
case PY_ITERSEARCH_COUNT:
|
|
++n;
|
|
if (n <= 0) {
|
|
/* XXX(nnorwitz): int means ssize_t */
|
|
PyErr_SetString(PyExc_OverflowError,
|
|
"count exceeds C int size");
|
|
goto Fail;
|
|
}
|
|
break;
|
|
|
|
case PY_ITERSEARCH_INDEX:
|
|
if (wrapped) {
|
|
/* XXX(nnorwitz): int means ssize_t */
|
|
PyErr_SetString(PyExc_OverflowError,
|
|
"index exceeds C int size");
|
|
goto Fail;
|
|
}
|
|
goto Done;
|
|
|
|
case PY_ITERSEARCH_CONTAINS:
|
|
n = 1;
|
|
goto Done;
|
|
|
|
default:
|
|
assert(!"unknown operation");
|
|
}
|
|
}
|
|
|
|
if (operation == PY_ITERSEARCH_INDEX) {
|
|
++n;
|
|
if (n <= 0)
|
|
wrapped = 1;
|
|
}
|
|
}
|
|
|
|
if (operation != PY_ITERSEARCH_INDEX)
|
|
goto Done;
|
|
|
|
PyErr_SetString(PyExc_ValueError,
|
|
"sequence.index(x): x not in sequence");
|
|
/* fall into failure code */
|
|
Fail:
|
|
n = -1;
|
|
/* fall through */
|
|
Done:
|
|
Py_DECREF(it);
|
|
return n;
|
|
|
|
}
|
|
|
|
/* Return # of times o appears in s. */
|
|
Py_ssize_t
|
|
PySequence_Count(PyObject *s, PyObject *o)
|
|
{
|
|
return _PySequence_IterSearch(s, o, PY_ITERSEARCH_COUNT);
|
|
}
|
|
|
|
/* Return -1 if error; 1 if ob in seq; 0 if ob not in seq.
|
|
* Use sq_contains if possible, else defer to _PySequence_IterSearch().
|
|
*/
|
|
int
|
|
PySequence_Contains(PyObject *seq, PyObject *ob)
|
|
{
|
|
Py_ssize_t result;
|
|
PySequenceMethods *sqm = seq->ob_type->tp_as_sequence;
|
|
if (sqm != NULL && sqm->sq_contains != NULL)
|
|
return (*sqm->sq_contains)(seq, ob);
|
|
result = _PySequence_IterSearch(seq, ob, PY_ITERSEARCH_CONTAINS);
|
|
return Py_SAFE_DOWNCAST(result, Py_ssize_t, int);
|
|
}
|
|
|
|
/* Backwards compatibility */
|
|
#undef PySequence_In
|
|
int
|
|
PySequence_In(PyObject *w, PyObject *v)
|
|
{
|
|
return PySequence_Contains(w, v);
|
|
}
|
|
|
|
Py_ssize_t
|
|
PySequence_Index(PyObject *s, PyObject *o)
|
|
{
|
|
return _PySequence_IterSearch(s, o, PY_ITERSEARCH_INDEX);
|
|
}
|
|
|
|
/* Operations on mappings */
|
|
|
|
int
|
|
PyMapping_Check(PyObject *o)
|
|
{
|
|
return o && o->ob_type->tp_as_mapping &&
|
|
o->ob_type->tp_as_mapping->mp_subscript &&
|
|
!(o->ob_type->tp_as_sequence &&
|
|
o->ob_type->tp_as_sequence->sq_slice);
|
|
}
|
|
|
|
Py_ssize_t
|
|
PyMapping_Size(PyObject *o)
|
|
{
|
|
PyMappingMethods *m;
|
|
|
|
if (o == NULL) {
|
|
null_error();
|
|
return -1;
|
|
}
|
|
|
|
m = o->ob_type->tp_as_mapping;
|
|
if (m && m->mp_length)
|
|
return m->mp_length(o);
|
|
|
|
type_error("object of type '%.200s' has no len()", o);
|
|
return -1;
|
|
}
|
|
|
|
#undef PyMapping_Length
|
|
Py_ssize_t
|
|
PyMapping_Length(PyObject *o)
|
|
{
|
|
return PyMapping_Size(o);
|
|
}
|
|
#define PyMapping_Length PyMapping_Size
|
|
|
|
PyObject *
|
|
PyMapping_GetItemString(PyObject *o, char *key)
|
|
{
|
|
PyObject *okey, *r;
|
|
|
|
if (key == NULL)
|
|
return null_error();
|
|
|
|
okey = PyString_FromString(key);
|
|
if (okey == NULL)
|
|
return NULL;
|
|
r = PyObject_GetItem(o, okey);
|
|
Py_DECREF(okey);
|
|
return r;
|
|
}
|
|
|
|
int
|
|
PyMapping_SetItemString(PyObject *o, char *key, PyObject *value)
|
|
{
|
|
PyObject *okey;
|
|
int r;
|
|
|
|
if (key == NULL) {
|
|
null_error();
|
|
return -1;
|
|
}
|
|
|
|
okey = PyString_FromString(key);
|
|
if (okey == NULL)
|
|
return -1;
|
|
r = PyObject_SetItem(o, okey, value);
|
|
Py_DECREF(okey);
|
|
return r;
|
|
}
|
|
|
|
int
|
|
PyMapping_HasKeyString(PyObject *o, char *key)
|
|
{
|
|
PyObject *v;
|
|
|
|
v = PyMapping_GetItemString(o, key);
|
|
if (v) {
|
|
Py_DECREF(v);
|
|
return 1;
|
|
}
|
|
PyErr_Clear();
|
|
return 0;
|
|
}
|
|
|
|
int
|
|
PyMapping_HasKey(PyObject *o, PyObject *key)
|
|
{
|
|
PyObject *v;
|
|
|
|
v = PyObject_GetItem(o, key);
|
|
if (v) {
|
|
Py_DECREF(v);
|
|
return 1;
|
|
}
|
|
PyErr_Clear();
|
|
return 0;
|
|
}
|
|
|
|
/* Operations on callable objects */
|
|
|
|
/* XXX PyCallable_Check() is in object.c */
|
|
|
|
PyObject *
|
|
PyObject_CallObject(PyObject *o, PyObject *a)
|
|
{
|
|
return PyEval_CallObjectWithKeywords(o, a, NULL);
|
|
}
|
|
|
|
PyObject *
|
|
PyObject_Call(PyObject *func, PyObject *arg, PyObject *kw)
|
|
{
|
|
ternaryfunc call;
|
|
|
|
if ((call = func->ob_type->tp_call) != NULL) {
|
|
PyObject *result = (*call)(func, arg, kw);
|
|
if (result == NULL && !PyErr_Occurred())
|
|
PyErr_SetString(
|
|
PyExc_SystemError,
|
|
"NULL result without error in PyObject_Call");
|
|
return result;
|
|
}
|
|
PyErr_Format(PyExc_TypeError, "'%.200s' object is not callable",
|
|
func->ob_type->tp_name);
|
|
return NULL;
|
|
}
|
|
|
|
static PyObject*
|
|
call_function_tail(PyObject *callable, PyObject *args)
|
|
{
|
|
PyObject *retval;
|
|
|
|
if (args == NULL)
|
|
return NULL;
|
|
|
|
if (!PyTuple_Check(args)) {
|
|
PyObject *a;
|
|
|
|
a = PyTuple_New(1);
|
|
if (a == NULL) {
|
|
Py_DECREF(args);
|
|
return NULL;
|
|
}
|
|
PyTuple_SET_ITEM(a, 0, args);
|
|
args = a;
|
|
}
|
|
retval = PyObject_Call(callable, args, NULL);
|
|
|
|
Py_DECREF(args);
|
|
|
|
return retval;
|
|
}
|
|
|
|
PyObject *
|
|
PyObject_CallFunction(PyObject *callable, char *format, ...)
|
|
{
|
|
va_list va;
|
|
PyObject *args;
|
|
|
|
if (callable == NULL)
|
|
return null_error();
|
|
|
|
if (format && *format) {
|
|
va_start(va, format);
|
|
args = Py_VaBuildValue(format, va);
|
|
va_end(va);
|
|
}
|
|
else
|
|
args = PyTuple_New(0);
|
|
|
|
return call_function_tail(callable, args);
|
|
}
|
|
|
|
PyObject *
|
|
_PyObject_CallFunction_SizeT(PyObject *callable, char *format, ...)
|
|
{
|
|
va_list va;
|
|
PyObject *args;
|
|
|
|
if (callable == NULL)
|
|
return null_error();
|
|
|
|
if (format && *format) {
|
|
va_start(va, format);
|
|
args = _Py_VaBuildValue_SizeT(format, va);
|
|
va_end(va);
|
|
}
|
|
else
|
|
args = PyTuple_New(0);
|
|
|
|
return call_function_tail(callable, args);
|
|
}
|
|
|
|
PyObject *
|
|
PyObject_CallMethod(PyObject *o, char *name, char *format, ...)
|
|
{
|
|
va_list va;
|
|
PyObject *args;
|
|
PyObject *func = NULL;
|
|
PyObject *retval = NULL;
|
|
|
|
if (o == NULL || name == NULL)
|
|
return null_error();
|
|
|
|
func = PyObject_GetAttrString(o, name);
|
|
if (func == NULL) {
|
|
PyErr_SetString(PyExc_AttributeError, name);
|
|
return 0;
|
|
}
|
|
|
|
if (!PyCallable_Check(func)) {
|
|
type_error("attribute of type '%.200s' is not callable", func);
|
|
goto exit;
|
|
}
|
|
|
|
if (format && *format) {
|
|
va_start(va, format);
|
|
args = Py_VaBuildValue(format, va);
|
|
va_end(va);
|
|
}
|
|
else
|
|
args = PyTuple_New(0);
|
|
|
|
retval = call_function_tail(func, args);
|
|
|
|
exit:
|
|
/* args gets consumed in call_function_tail */
|
|
Py_XDECREF(func);
|
|
|
|
return retval;
|
|
}
|
|
|
|
PyObject *
|
|
_PyObject_CallMethod_SizeT(PyObject *o, char *name, char *format, ...)
|
|
{
|
|
va_list va;
|
|
PyObject *args;
|
|
PyObject *func = NULL;
|
|
PyObject *retval = NULL;
|
|
|
|
if (o == NULL || name == NULL)
|
|
return null_error();
|
|
|
|
func = PyObject_GetAttrString(o, name);
|
|
if (func == NULL) {
|
|
PyErr_SetString(PyExc_AttributeError, name);
|
|
return 0;
|
|
}
|
|
|
|
if (!PyCallable_Check(func)) {
|
|
type_error("attribute of type '%.200s' is not callable", func);
|
|
goto exit;
|
|
}
|
|
|
|
if (format && *format) {
|
|
va_start(va, format);
|
|
args = _Py_VaBuildValue_SizeT(format, va);
|
|
va_end(va);
|
|
}
|
|
else
|
|
args = PyTuple_New(0);
|
|
|
|
retval = call_function_tail(func, args);
|
|
|
|
exit:
|
|
/* args gets consumed in call_function_tail */
|
|
Py_XDECREF(func);
|
|
|
|
return retval;
|
|
}
|
|
|
|
|
|
static PyObject *
|
|
objargs_mktuple(va_list va)
|
|
{
|
|
int i, n = 0;
|
|
va_list countva;
|
|
PyObject *result, *tmp;
|
|
|
|
#ifdef VA_LIST_IS_ARRAY
|
|
memcpy(countva, va, sizeof(va_list));
|
|
#else
|
|
#ifdef __va_copy
|
|
__va_copy(countva, va);
|
|
#else
|
|
countva = va;
|
|
#endif
|
|
#endif
|
|
|
|
while (((PyObject *)va_arg(countva, PyObject *)) != NULL)
|
|
++n;
|
|
result = PyTuple_New(n);
|
|
if (result != NULL && n > 0) {
|
|
for (i = 0; i < n; ++i) {
|
|
tmp = (PyObject *)va_arg(va, PyObject *);
|
|
PyTuple_SET_ITEM(result, i, tmp);
|
|
Py_INCREF(tmp);
|
|
}
|
|
}
|
|
return result;
|
|
}
|
|
|
|
PyObject *
|
|
PyObject_CallMethodObjArgs(PyObject *callable, PyObject *name, ...)
|
|
{
|
|
PyObject *args, *tmp;
|
|
va_list vargs;
|
|
|
|
if (callable == NULL || name == NULL)
|
|
return null_error();
|
|
|
|
callable = PyObject_GetAttr(callable, name);
|
|
if (callable == NULL)
|
|
return NULL;
|
|
|
|
/* count the args */
|
|
va_start(vargs, name);
|
|
args = objargs_mktuple(vargs);
|
|
va_end(vargs);
|
|
if (args == NULL) {
|
|
Py_DECREF(callable);
|
|
return NULL;
|
|
}
|
|
tmp = PyObject_Call(callable, args, NULL);
|
|
Py_DECREF(args);
|
|
Py_DECREF(callable);
|
|
|
|
return tmp;
|
|
}
|
|
|
|
PyObject *
|
|
PyObject_CallFunctionObjArgs(PyObject *callable, ...)
|
|
{
|
|
PyObject *args, *tmp;
|
|
va_list vargs;
|
|
|
|
if (callable == NULL)
|
|
return null_error();
|
|
|
|
/* count the args */
|
|
va_start(vargs, callable);
|
|
args = objargs_mktuple(vargs);
|
|
va_end(vargs);
|
|
if (args == NULL)
|
|
return NULL;
|
|
tmp = PyObject_Call(callable, args, NULL);
|
|
Py_DECREF(args);
|
|
|
|
return tmp;
|
|
}
|
|
|
|
|
|
/* isinstance(), issubclass() */
|
|
|
|
/* abstract_get_bases() has logically 4 return states, with a sort of 0th
|
|
* state that will almost never happen.
|
|
*
|
|
* 0. creating the __bases__ static string could get a MemoryError
|
|
* 1. getattr(cls, '__bases__') could raise an AttributeError
|
|
* 2. getattr(cls, '__bases__') could raise some other exception
|
|
* 3. getattr(cls, '__bases__') could return a tuple
|
|
* 4. getattr(cls, '__bases__') could return something other than a tuple
|
|
*
|
|
* Only state #3 is a non-error state and only it returns a non-NULL object
|
|
* (it returns the retrieved tuple).
|
|
*
|
|
* Any raised AttributeErrors are masked by clearing the exception and
|
|
* returning NULL. If an object other than a tuple comes out of __bases__,
|
|
* then again, the return value is NULL. So yes, these two situations
|
|
* produce exactly the same results: NULL is returned and no error is set.
|
|
*
|
|
* If some exception other than AttributeError is raised, then NULL is also
|
|
* returned, but the exception is not cleared. That's because we want the
|
|
* exception to be propagated along.
|
|
*
|
|
* Callers are expected to test for PyErr_Occurred() when the return value
|
|
* is NULL to decide whether a valid exception should be propagated or not.
|
|
* When there's no exception to propagate, it's customary for the caller to
|
|
* set a TypeError.
|
|
*/
|
|
static PyObject *
|
|
abstract_get_bases(PyObject *cls)
|
|
{
|
|
static PyObject *__bases__ = NULL;
|
|
PyObject *bases;
|
|
|
|
if (__bases__ == NULL) {
|
|
__bases__ = PyString_FromString("__bases__");
|
|
if (__bases__ == NULL)
|
|
return NULL;
|
|
}
|
|
bases = PyObject_GetAttr(cls, __bases__);
|
|
if (bases == NULL) {
|
|
if (PyErr_ExceptionMatches(PyExc_AttributeError))
|
|
PyErr_Clear();
|
|
return NULL;
|
|
}
|
|
if (!PyTuple_Check(bases)) {
|
|
Py_DECREF(bases);
|
|
return NULL;
|
|
}
|
|
return bases;
|
|
}
|
|
|
|
|
|
static int
|
|
abstract_issubclass(PyObject *derived, PyObject *cls)
|
|
{
|
|
PyObject *bases;
|
|
Py_ssize_t i, n;
|
|
int r = 0;
|
|
|
|
|
|
if (derived == cls)
|
|
return 1;
|
|
|
|
if (PyTuple_Check(cls)) {
|
|
/* Not a general sequence -- that opens up the road to
|
|
recursion and stack overflow. */
|
|
n = PyTuple_GET_SIZE(cls);
|
|
for (i = 0; i < n; i++) {
|
|
if (derived == PyTuple_GET_ITEM(cls, i))
|
|
return 1;
|
|
}
|
|
}
|
|
bases = abstract_get_bases(derived);
|
|
if (bases == NULL) {
|
|
if (PyErr_Occurred())
|
|
return -1;
|
|
return 0;
|
|
}
|
|
n = PyTuple_GET_SIZE(bases);
|
|
for (i = 0; i < n; i++) {
|
|
r = abstract_issubclass(PyTuple_GET_ITEM(bases, i), cls);
|
|
if (r != 0)
|
|
break;
|
|
}
|
|
|
|
Py_DECREF(bases);
|
|
|
|
return r;
|
|
}
|
|
|
|
static int
|
|
check_class(PyObject *cls, const char *error)
|
|
{
|
|
PyObject *bases = abstract_get_bases(cls);
|
|
if (bases == NULL) {
|
|
/* Do not mask errors. */
|
|
if (!PyErr_Occurred())
|
|
PyErr_SetString(PyExc_TypeError, error);
|
|
return 0;
|
|
}
|
|
Py_DECREF(bases);
|
|
return -1;
|
|
}
|
|
|
|
static int
|
|
recursive_isinstance(PyObject *inst, PyObject *cls, int recursion_depth)
|
|
{
|
|
PyObject *icls;
|
|
static PyObject *__class__ = NULL;
|
|
int retval = 0;
|
|
|
|
if (__class__ == NULL) {
|
|
__class__ = PyString_FromString("__class__");
|
|
if (__class__ == NULL)
|
|
return -1;
|
|
}
|
|
|
|
if (PyType_Check(cls)) {
|
|
retval = PyObject_TypeCheck(inst, (PyTypeObject *)cls);
|
|
if (retval == 0) {
|
|
PyObject *c = PyObject_GetAttr(inst, __class__);
|
|
if (c == NULL) {
|
|
PyErr_Clear();
|
|
}
|
|
else {
|
|
if (c != (PyObject *)(inst->ob_type) &&
|
|
PyType_Check(c))
|
|
retval = PyType_IsSubtype(
|
|
(PyTypeObject *)c,
|
|
(PyTypeObject *)cls);
|
|
Py_DECREF(c);
|
|
}
|
|
}
|
|
}
|
|
else if (PyTuple_Check(cls)) {
|
|
Py_ssize_t i, n;
|
|
|
|
if (!recursion_depth) {
|
|
PyErr_SetString(PyExc_RuntimeError,
|
|
"nest level of tuple too deep");
|
|
return -1;
|
|
}
|
|
|
|
n = PyTuple_GET_SIZE(cls);
|
|
for (i = 0; i < n; i++) {
|
|
retval = recursive_isinstance(
|
|
inst,
|
|
PyTuple_GET_ITEM(cls, i),
|
|
recursion_depth-1);
|
|
if (retval != 0)
|
|
break;
|
|
}
|
|
}
|
|
else {
|
|
if (!check_class(cls,
|
|
"isinstance() arg 2 must be a class, type,"
|
|
" or tuple of classes and types"))
|
|
return -1;
|
|
icls = PyObject_GetAttr(inst, __class__);
|
|
if (icls == NULL) {
|
|
PyErr_Clear();
|
|
retval = 0;
|
|
}
|
|
else {
|
|
retval = abstract_issubclass(icls, cls);
|
|
Py_DECREF(icls);
|
|
}
|
|
}
|
|
|
|
return retval;
|
|
}
|
|
|
|
int
|
|
PyObject_IsInstance(PyObject *inst, PyObject *cls)
|
|
{
|
|
return recursive_isinstance(inst, cls, Py_GetRecursionLimit());
|
|
}
|
|
|
|
static int
|
|
recursive_issubclass(PyObject *derived, PyObject *cls, int recursion_depth)
|
|
{
|
|
int retval;
|
|
|
|
{
|
|
if (!check_class(derived,
|
|
"issubclass() arg 1 must be a class"))
|
|
return -1;
|
|
|
|
if (PyTuple_Check(cls)) {
|
|
Py_ssize_t i;
|
|
Py_ssize_t n = PyTuple_GET_SIZE(cls);
|
|
|
|
if (!recursion_depth) {
|
|
PyErr_SetString(PyExc_RuntimeError,
|
|
"nest level of tuple too deep");
|
|
return -1;
|
|
}
|
|
for (i = 0; i < n; ++i) {
|
|
retval = recursive_issubclass(
|
|
derived,
|
|
PyTuple_GET_ITEM(cls, i),
|
|
recursion_depth-1);
|
|
if (retval != 0) {
|
|
/* either found it, or got an error */
|
|
return retval;
|
|
}
|
|
}
|
|
return 0;
|
|
}
|
|
else {
|
|
if (!check_class(cls,
|
|
"issubclass() arg 2 must be a class"
|
|
" or tuple of classes"))
|
|
return -1;
|
|
}
|
|
|
|
retval = abstract_issubclass(derived, cls);
|
|
}
|
|
|
|
return retval;
|
|
}
|
|
|
|
int
|
|
PyObject_IsSubclass(PyObject *derived, PyObject *cls)
|
|
{
|
|
return recursive_issubclass(derived, cls, Py_GetRecursionLimit());
|
|
}
|
|
|
|
|
|
PyObject *
|
|
PyObject_GetIter(PyObject *o)
|
|
{
|
|
PyTypeObject *t = o->ob_type;
|
|
getiterfunc f = NULL;
|
|
f = t->tp_iter;
|
|
if (f == NULL) {
|
|
if (PySequence_Check(o))
|
|
return PySeqIter_New(o);
|
|
return type_error("'%.200s' object is not iterable", o);
|
|
}
|
|
else {
|
|
PyObject *res = (*f)(o);
|
|
if (res != NULL && !PyIter_Check(res)) {
|
|
PyErr_Format(PyExc_TypeError,
|
|
"iter() returned non-iterator "
|
|
"of type '%.100s'",
|
|
res->ob_type->tp_name);
|
|
Py_DECREF(res);
|
|
res = NULL;
|
|
}
|
|
return res;
|
|
}
|
|
}
|
|
|
|
/* Return next item.
|
|
* If an error occurs, return NULL. PyErr_Occurred() will be true.
|
|
* If the iteration terminates normally, return NULL and clear the
|
|
* PyExc_StopIteration exception (if it was set). PyErr_Occurred()
|
|
* will be false.
|
|
* Else return the next object. PyErr_Occurred() will be false.
|
|
*/
|
|
PyObject *
|
|
PyIter_Next(PyObject *iter)
|
|
{
|
|
PyObject *result;
|
|
assert(PyIter_Check(iter));
|
|
result = (*iter->ob_type->tp_iternext)(iter);
|
|
if (result == NULL &&
|
|
PyErr_Occurred() &&
|
|
PyErr_ExceptionMatches(PyExc_StopIteration))
|
|
PyErr_Clear();
|
|
return result;
|
|
}
|