mirror of
https://github.com/python/cpython.git
synced 2025-08-03 16:39:00 +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) ........
2129 lines
51 KiB
C
2129 lines
51 KiB
C
/* Array object implementation */
|
|
|
|
/* An array is a uniform list -- all items have the same type.
|
|
The item type is restricted to simple C types like int or float */
|
|
|
|
#define PY_SSIZE_T_CLEAN
|
|
#include "Python.h"
|
|
#include "structmember.h"
|
|
|
|
#ifdef STDC_HEADERS
|
|
#include <stddef.h>
|
|
#else /* !STDC_HEADERS */
|
|
#ifdef HAVE_SYS_TYPES_H
|
|
#include <sys/types.h> /* For size_t */
|
|
#endif /* HAVE_SYS_TYPES_H */
|
|
#endif /* !STDC_HEADERS */
|
|
|
|
struct arrayobject; /* Forward */
|
|
|
|
/* All possible arraydescr values are defined in the vector "descriptors"
|
|
* below. That's defined later because the appropriate get and set
|
|
* functions aren't visible yet.
|
|
*/
|
|
struct arraydescr {
|
|
int typecode;
|
|
int itemsize;
|
|
PyObject * (*getitem)(struct arrayobject *, Py_ssize_t);
|
|
int (*setitem)(struct arrayobject *, Py_ssize_t, PyObject *);
|
|
};
|
|
|
|
typedef struct arrayobject {
|
|
PyObject_VAR_HEAD
|
|
char *ob_item;
|
|
Py_ssize_t allocated;
|
|
struct arraydescr *ob_descr;
|
|
PyObject *weakreflist; /* List of weak references */
|
|
} arrayobject;
|
|
|
|
static PyTypeObject Arraytype;
|
|
|
|
#define array_Check(op) PyObject_TypeCheck(op, &Arraytype)
|
|
#define array_CheckExact(op) ((op)->ob_type == &Arraytype)
|
|
|
|
static int
|
|
array_resize(arrayobject *self, Py_ssize_t newsize)
|
|
{
|
|
char *items;
|
|
size_t _new_size;
|
|
|
|
/* Bypass realloc() when a previous overallocation is large enough
|
|
to accommodate the newsize. If the newsize is 16 smaller than the
|
|
current size, then proceed with the realloc() to shrink the list.
|
|
*/
|
|
|
|
if (self->allocated >= newsize &&
|
|
self->ob_size < newsize + 16 &&
|
|
self->ob_item != NULL) {
|
|
self->ob_size = newsize;
|
|
return 0;
|
|
}
|
|
|
|
/* This over-allocates proportional to the array size, making room
|
|
* for additional growth. The over-allocation is mild, but is
|
|
* enough to give linear-time amortized behavior over a long
|
|
* sequence of appends() in the presence of a poorly-performing
|
|
* system realloc().
|
|
* The growth pattern is: 0, 4, 8, 16, 25, 34, 46, 56, 67, 79, ...
|
|
* Note, the pattern starts out the same as for lists but then
|
|
* grows at a smaller rate so that larger arrays only overallocate
|
|
* by about 1/16th -- this is done because arrays are presumed to be more
|
|
* memory critical.
|
|
*/
|
|
|
|
_new_size = (newsize >> 4) + (self->ob_size < 8 ? 3 : 7) + newsize;
|
|
items = self->ob_item;
|
|
/* XXX The following multiplication and division does not optimize away
|
|
like it does for lists since the size is not known at compile time */
|
|
if (_new_size <= ((~(size_t)0) / self->ob_descr->itemsize))
|
|
PyMem_RESIZE(items, char, (_new_size * self->ob_descr->itemsize));
|
|
else
|
|
items = NULL;
|
|
if (items == NULL) {
|
|
PyErr_NoMemory();
|
|
return -1;
|
|
}
|
|
self->ob_item = items;
|
|
self->ob_size = newsize;
|
|
self->allocated = _new_size;
|
|
return 0;
|
|
}
|
|
|
|
/****************************************************************************
|
|
Get and Set functions for each type.
|
|
A Get function takes an arrayobject* and an integer index, returning the
|
|
array value at that index wrapped in an appropriate PyObject*.
|
|
A Set function takes an arrayobject, integer index, and PyObject*; sets
|
|
the array value at that index to the raw C data extracted from the PyObject*,
|
|
and returns 0 if successful, else nonzero on failure (PyObject* not of an
|
|
appropriate type or value).
|
|
Note that the basic Get and Set functions do NOT check that the index is
|
|
in bounds; that's the responsibility of the caller.
|
|
****************************************************************************/
|
|
|
|
static PyObject *
|
|
c_getitem(arrayobject *ap, Py_ssize_t i)
|
|
{
|
|
return PyString_FromStringAndSize(&((char *)ap->ob_item)[i], 1);
|
|
}
|
|
|
|
static int
|
|
c_setitem(arrayobject *ap, Py_ssize_t i, PyObject *v)
|
|
{
|
|
char x;
|
|
if (!PyArg_Parse(v, "c;array item must be char", &x))
|
|
return -1;
|
|
if (i >= 0)
|
|
((char *)ap->ob_item)[i] = x;
|
|
return 0;
|
|
}
|
|
|
|
static PyObject *
|
|
b_getitem(arrayobject *ap, Py_ssize_t i)
|
|
{
|
|
long x = ((char *)ap->ob_item)[i];
|
|
if (x >= 128)
|
|
x -= 256;
|
|
return PyInt_FromLong(x);
|
|
}
|
|
|
|
static int
|
|
b_setitem(arrayobject *ap, Py_ssize_t i, PyObject *v)
|
|
{
|
|
short x;
|
|
/* PyArg_Parse's 'b' formatter is for an unsigned char, therefore
|
|
must use the next size up that is signed ('h') and manually do
|
|
the overflow checking */
|
|
if (!PyArg_Parse(v, "h;array item must be integer", &x))
|
|
return -1;
|
|
else if (x < -128) {
|
|
PyErr_SetString(PyExc_OverflowError,
|
|
"signed char is less than minimum");
|
|
return -1;
|
|
}
|
|
else if (x > 127) {
|
|
PyErr_SetString(PyExc_OverflowError,
|
|
"signed char is greater than maximum");
|
|
return -1;
|
|
}
|
|
if (i >= 0)
|
|
((char *)ap->ob_item)[i] = (char)x;
|
|
return 0;
|
|
}
|
|
|
|
static PyObject *
|
|
BB_getitem(arrayobject *ap, Py_ssize_t i)
|
|
{
|
|
long x = ((unsigned char *)ap->ob_item)[i];
|
|
return PyInt_FromLong(x);
|
|
}
|
|
|
|
static int
|
|
BB_setitem(arrayobject *ap, Py_ssize_t i, PyObject *v)
|
|
{
|
|
unsigned char x;
|
|
/* 'B' == unsigned char, maps to PyArg_Parse's 'b' formatter */
|
|
if (!PyArg_Parse(v, "b;array item must be integer", &x))
|
|
return -1;
|
|
if (i >= 0)
|
|
((char *)ap->ob_item)[i] = x;
|
|
return 0;
|
|
}
|
|
|
|
#ifdef Py_USING_UNICODE
|
|
static PyObject *
|
|
u_getitem(arrayobject *ap, Py_ssize_t i)
|
|
{
|
|
return PyUnicode_FromUnicode(&((Py_UNICODE *) ap->ob_item)[i], 1);
|
|
}
|
|
|
|
static int
|
|
u_setitem(arrayobject *ap, Py_ssize_t i, PyObject *v)
|
|
{
|
|
Py_UNICODE *p;
|
|
Py_ssize_t len;
|
|
|
|
if (!PyArg_Parse(v, "u#;array item must be unicode character", &p, &len))
|
|
return -1;
|
|
if (len != 1) {
|
|
PyErr_SetString(PyExc_TypeError,
|
|
"array item must be unicode character");
|
|
return -1;
|
|
}
|
|
if (i >= 0)
|
|
((Py_UNICODE *)ap->ob_item)[i] = p[0];
|
|
return 0;
|
|
}
|
|
#endif
|
|
|
|
static PyObject *
|
|
h_getitem(arrayobject *ap, Py_ssize_t i)
|
|
{
|
|
return PyInt_FromLong((long) ((short *)ap->ob_item)[i]);
|
|
}
|
|
|
|
static int
|
|
h_setitem(arrayobject *ap, Py_ssize_t i, PyObject *v)
|
|
{
|
|
short x;
|
|
/* 'h' == signed short, maps to PyArg_Parse's 'h' formatter */
|
|
if (!PyArg_Parse(v, "h;array item must be integer", &x))
|
|
return -1;
|
|
if (i >= 0)
|
|
((short *)ap->ob_item)[i] = x;
|
|
return 0;
|
|
}
|
|
|
|
static PyObject *
|
|
HH_getitem(arrayobject *ap, Py_ssize_t i)
|
|
{
|
|
return PyInt_FromLong((long) ((unsigned short *)ap->ob_item)[i]);
|
|
}
|
|
|
|
static int
|
|
HH_setitem(arrayobject *ap, Py_ssize_t i, PyObject *v)
|
|
{
|
|
int x;
|
|
/* PyArg_Parse's 'h' formatter is for a signed short, therefore
|
|
must use the next size up and manually do the overflow checking */
|
|
if (!PyArg_Parse(v, "i;array item must be integer", &x))
|
|
return -1;
|
|
else if (x < 0) {
|
|
PyErr_SetString(PyExc_OverflowError,
|
|
"unsigned short is less than minimum");
|
|
return -1;
|
|
}
|
|
else if (x > USHRT_MAX) {
|
|
PyErr_SetString(PyExc_OverflowError,
|
|
"unsigned short is greater than maximum");
|
|
return -1;
|
|
}
|
|
if (i >= 0)
|
|
((short *)ap->ob_item)[i] = (short)x;
|
|
return 0;
|
|
}
|
|
|
|
static PyObject *
|
|
i_getitem(arrayobject *ap, Py_ssize_t i)
|
|
{
|
|
return PyInt_FromLong((long) ((int *)ap->ob_item)[i]);
|
|
}
|
|
|
|
static int
|
|
i_setitem(arrayobject *ap, Py_ssize_t i, PyObject *v)
|
|
{
|
|
int x;
|
|
/* 'i' == signed int, maps to PyArg_Parse's 'i' formatter */
|
|
if (!PyArg_Parse(v, "i;array item must be integer", &x))
|
|
return -1;
|
|
if (i >= 0)
|
|
((int *)ap->ob_item)[i] = x;
|
|
return 0;
|
|
}
|
|
|
|
static PyObject *
|
|
II_getitem(arrayobject *ap, Py_ssize_t i)
|
|
{
|
|
return PyLong_FromUnsignedLong(
|
|
(unsigned long) ((unsigned int *)ap->ob_item)[i]);
|
|
}
|
|
|
|
static int
|
|
II_setitem(arrayobject *ap, Py_ssize_t i, PyObject *v)
|
|
{
|
|
unsigned long x;
|
|
if (PyLong_Check(v)) {
|
|
x = PyLong_AsUnsignedLong(v);
|
|
if (x == (unsigned long) -1 && PyErr_Occurred())
|
|
return -1;
|
|
}
|
|
else {
|
|
long y;
|
|
if (!PyArg_Parse(v, "l;array item must be integer", &y))
|
|
return -1;
|
|
if (y < 0) {
|
|
PyErr_SetString(PyExc_OverflowError,
|
|
"unsigned int is less than minimum");
|
|
return -1;
|
|
}
|
|
x = (unsigned long)y;
|
|
|
|
}
|
|
if (x > UINT_MAX) {
|
|
PyErr_SetString(PyExc_OverflowError,
|
|
"unsigned int is greater than maximum");
|
|
return -1;
|
|
}
|
|
|
|
if (i >= 0)
|
|
((unsigned int *)ap->ob_item)[i] = (unsigned int)x;
|
|
return 0;
|
|
}
|
|
|
|
static PyObject *
|
|
l_getitem(arrayobject *ap, Py_ssize_t i)
|
|
{
|
|
return PyInt_FromLong(((long *)ap->ob_item)[i]);
|
|
}
|
|
|
|
static int
|
|
l_setitem(arrayobject *ap, Py_ssize_t i, PyObject *v)
|
|
{
|
|
long x;
|
|
if (!PyArg_Parse(v, "l;array item must be integer", &x))
|
|
return -1;
|
|
if (i >= 0)
|
|
((long *)ap->ob_item)[i] = x;
|
|
return 0;
|
|
}
|
|
|
|
static PyObject *
|
|
LL_getitem(arrayobject *ap, Py_ssize_t i)
|
|
{
|
|
return PyLong_FromUnsignedLong(((unsigned long *)ap->ob_item)[i]);
|
|
}
|
|
|
|
static int
|
|
LL_setitem(arrayobject *ap, Py_ssize_t i, PyObject *v)
|
|
{
|
|
unsigned long x;
|
|
if (PyLong_Check(v)) {
|
|
x = PyLong_AsUnsignedLong(v);
|
|
if (x == (unsigned long) -1 && PyErr_Occurred())
|
|
return -1;
|
|
}
|
|
else {
|
|
long y;
|
|
if (!PyArg_Parse(v, "l;array item must be integer", &y))
|
|
return -1;
|
|
if (y < 0) {
|
|
PyErr_SetString(PyExc_OverflowError,
|
|
"unsigned long is less than minimum");
|
|
return -1;
|
|
}
|
|
x = (unsigned long)y;
|
|
|
|
}
|
|
if (x > ULONG_MAX) {
|
|
PyErr_SetString(PyExc_OverflowError,
|
|
"unsigned long is greater than maximum");
|
|
return -1;
|
|
}
|
|
|
|
if (i >= 0)
|
|
((unsigned long *)ap->ob_item)[i] = x;
|
|
return 0;
|
|
}
|
|
|
|
static PyObject *
|
|
f_getitem(arrayobject *ap, Py_ssize_t i)
|
|
{
|
|
return PyFloat_FromDouble((double) ((float *)ap->ob_item)[i]);
|
|
}
|
|
|
|
static int
|
|
f_setitem(arrayobject *ap, Py_ssize_t i, PyObject *v)
|
|
{
|
|
float x;
|
|
if (!PyArg_Parse(v, "f;array item must be float", &x))
|
|
return -1;
|
|
if (i >= 0)
|
|
((float *)ap->ob_item)[i] = x;
|
|
return 0;
|
|
}
|
|
|
|
static PyObject *
|
|
d_getitem(arrayobject *ap, Py_ssize_t i)
|
|
{
|
|
return PyFloat_FromDouble(((double *)ap->ob_item)[i]);
|
|
}
|
|
|
|
static int
|
|
d_setitem(arrayobject *ap, Py_ssize_t i, PyObject *v)
|
|
{
|
|
double x;
|
|
if (!PyArg_Parse(v, "d;array item must be float", &x))
|
|
return -1;
|
|
if (i >= 0)
|
|
((double *)ap->ob_item)[i] = x;
|
|
return 0;
|
|
}
|
|
|
|
/* Description of types */
|
|
static struct arraydescr descriptors[] = {
|
|
{'c', sizeof(char), c_getitem, c_setitem},
|
|
{'b', sizeof(char), b_getitem, b_setitem},
|
|
{'B', sizeof(char), BB_getitem, BB_setitem},
|
|
#ifdef Py_USING_UNICODE
|
|
{'u', sizeof(Py_UNICODE), u_getitem, u_setitem},
|
|
#endif
|
|
{'h', sizeof(short), h_getitem, h_setitem},
|
|
{'H', sizeof(short), HH_getitem, HH_setitem},
|
|
{'i', sizeof(int), i_getitem, i_setitem},
|
|
{'I', sizeof(int), II_getitem, II_setitem},
|
|
{'l', sizeof(long), l_getitem, l_setitem},
|
|
{'L', sizeof(long), LL_getitem, LL_setitem},
|
|
{'f', sizeof(float), f_getitem, f_setitem},
|
|
{'d', sizeof(double), d_getitem, d_setitem},
|
|
{'\0', 0, 0, 0} /* Sentinel */
|
|
};
|
|
|
|
/****************************************************************************
|
|
Implementations of array object methods.
|
|
****************************************************************************/
|
|
|
|
static PyObject *
|
|
newarrayobject(PyTypeObject *type, Py_ssize_t size, struct arraydescr *descr)
|
|
{
|
|
arrayobject *op;
|
|
size_t nbytes;
|
|
|
|
if (size < 0) {
|
|
PyErr_BadInternalCall();
|
|
return NULL;
|
|
}
|
|
|
|
nbytes = size * descr->itemsize;
|
|
/* Check for overflow */
|
|
if (nbytes / descr->itemsize != (size_t)size) {
|
|
return PyErr_NoMemory();
|
|
}
|
|
op = (arrayobject *) type->tp_alloc(type, 0);
|
|
if (op == NULL) {
|
|
return NULL;
|
|
}
|
|
op->ob_size = size;
|
|
if (size <= 0) {
|
|
op->ob_item = NULL;
|
|
}
|
|
else {
|
|
op->ob_item = PyMem_NEW(char, nbytes);
|
|
if (op->ob_item == NULL) {
|
|
PyObject_Del(op);
|
|
return PyErr_NoMemory();
|
|
}
|
|
}
|
|
op->ob_descr = descr;
|
|
op->allocated = size;
|
|
op->weakreflist = NULL;
|
|
return (PyObject *) op;
|
|
}
|
|
|
|
static PyObject *
|
|
getarrayitem(PyObject *op, Py_ssize_t i)
|
|
{
|
|
register arrayobject *ap;
|
|
assert(array_Check(op));
|
|
ap = (arrayobject *)op;
|
|
assert(i>=0 && i<ap->ob_size);
|
|
return (*ap->ob_descr->getitem)(ap, i);
|
|
}
|
|
|
|
static int
|
|
ins1(arrayobject *self, Py_ssize_t where, PyObject *v)
|
|
{
|
|
char *items;
|
|
Py_ssize_t n = self->ob_size;
|
|
if (v == NULL) {
|
|
PyErr_BadInternalCall();
|
|
return -1;
|
|
}
|
|
if ((*self->ob_descr->setitem)(self, -1, v) < 0)
|
|
return -1;
|
|
|
|
if (array_resize(self, n+1) == -1)
|
|
return -1;
|
|
items = self->ob_item;
|
|
if (where < 0) {
|
|
where += n;
|
|
if (where < 0)
|
|
where = 0;
|
|
}
|
|
if (where > n)
|
|
where = n;
|
|
/* appends don't need to call memmove() */
|
|
if (where != n)
|
|
memmove(items + (where+1)*self->ob_descr->itemsize,
|
|
items + where*self->ob_descr->itemsize,
|
|
(n-where)*self->ob_descr->itemsize);
|
|
return (*self->ob_descr->setitem)(self, where, v);
|
|
}
|
|
|
|
/* Methods */
|
|
|
|
static void
|
|
array_dealloc(arrayobject *op)
|
|
{
|
|
if (op->weakreflist != NULL)
|
|
PyObject_ClearWeakRefs((PyObject *) op);
|
|
if (op->ob_item != NULL)
|
|
PyMem_DEL(op->ob_item);
|
|
op->ob_type->tp_free((PyObject *)op);
|
|
}
|
|
|
|
static PyObject *
|
|
array_richcompare(PyObject *v, PyObject *w, int op)
|
|
{
|
|
arrayobject *va, *wa;
|
|
PyObject *vi = NULL;
|
|
PyObject *wi = NULL;
|
|
Py_ssize_t i, k;
|
|
PyObject *res;
|
|
|
|
if (!array_Check(v) || !array_Check(w)) {
|
|
Py_INCREF(Py_NotImplemented);
|
|
return Py_NotImplemented;
|
|
}
|
|
|
|
va = (arrayobject *)v;
|
|
wa = (arrayobject *)w;
|
|
|
|
if (va->ob_size != wa->ob_size && (op == Py_EQ || op == Py_NE)) {
|
|
/* Shortcut: if the lengths differ, the arrays differ */
|
|
if (op == Py_EQ)
|
|
res = Py_False;
|
|
else
|
|
res = Py_True;
|
|
Py_INCREF(res);
|
|
return res;
|
|
}
|
|
|
|
/* Search for the first index where items are different */
|
|
k = 1;
|
|
for (i = 0; i < va->ob_size && i < wa->ob_size; i++) {
|
|
vi = getarrayitem(v, i);
|
|
wi = getarrayitem(w, i);
|
|
if (vi == NULL || wi == NULL) {
|
|
Py_XDECREF(vi);
|
|
Py_XDECREF(wi);
|
|
return NULL;
|
|
}
|
|
k = PyObject_RichCompareBool(vi, wi, Py_EQ);
|
|
if (k == 0)
|
|
break; /* Keeping vi and wi alive! */
|
|
Py_DECREF(vi);
|
|
Py_DECREF(wi);
|
|
if (k < 0)
|
|
return NULL;
|
|
}
|
|
|
|
if (k) {
|
|
/* No more items to compare -- compare sizes */
|
|
Py_ssize_t vs = va->ob_size;
|
|
Py_ssize_t ws = wa->ob_size;
|
|
int cmp;
|
|
switch (op) {
|
|
case Py_LT: cmp = vs < ws; break;
|
|
case Py_LE: cmp = vs <= ws; break;
|
|
case Py_EQ: cmp = vs == ws; break;
|
|
case Py_NE: cmp = vs != ws; break;
|
|
case Py_GT: cmp = vs > ws; break;
|
|
case Py_GE: cmp = vs >= ws; break;
|
|
default: return NULL; /* cannot happen */
|
|
}
|
|
if (cmp)
|
|
res = Py_True;
|
|
else
|
|
res = Py_False;
|
|
Py_INCREF(res);
|
|
return res;
|
|
}
|
|
|
|
/* We have an item that differs. First, shortcuts for EQ/NE */
|
|
if (op == Py_EQ) {
|
|
Py_INCREF(Py_False);
|
|
res = Py_False;
|
|
}
|
|
else if (op == Py_NE) {
|
|
Py_INCREF(Py_True);
|
|
res = Py_True;
|
|
}
|
|
else {
|
|
/* Compare the final item again using the proper operator */
|
|
res = PyObject_RichCompare(vi, wi, op);
|
|
}
|
|
Py_DECREF(vi);
|
|
Py_DECREF(wi);
|
|
return res;
|
|
}
|
|
|
|
static Py_ssize_t
|
|
array_length(arrayobject *a)
|
|
{
|
|
return a->ob_size;
|
|
}
|
|
|
|
static PyObject *
|
|
array_item(arrayobject *a, Py_ssize_t i)
|
|
{
|
|
if (i < 0 || i >= a->ob_size) {
|
|
PyErr_SetString(PyExc_IndexError, "array index out of range");
|
|
return NULL;
|
|
}
|
|
return getarrayitem((PyObject *)a, i);
|
|
}
|
|
|
|
static PyObject *
|
|
array_slice(arrayobject *a, Py_ssize_t ilow, Py_ssize_t ihigh)
|
|
{
|
|
arrayobject *np;
|
|
if (ilow < 0)
|
|
ilow = 0;
|
|
else if (ilow > a->ob_size)
|
|
ilow = a->ob_size;
|
|
if (ihigh < 0)
|
|
ihigh = 0;
|
|
if (ihigh < ilow)
|
|
ihigh = ilow;
|
|
else if (ihigh > a->ob_size)
|
|
ihigh = a->ob_size;
|
|
np = (arrayobject *) newarrayobject(&Arraytype, ihigh - ilow, a->ob_descr);
|
|
if (np == NULL)
|
|
return NULL;
|
|
memcpy(np->ob_item, a->ob_item + ilow * a->ob_descr->itemsize,
|
|
(ihigh-ilow) * a->ob_descr->itemsize);
|
|
return (PyObject *)np;
|
|
}
|
|
|
|
static PyObject *
|
|
array_copy(arrayobject *a, PyObject *unused)
|
|
{
|
|
return array_slice(a, 0, a->ob_size);
|
|
}
|
|
|
|
PyDoc_STRVAR(copy_doc,
|
|
"copy(array)\n\
|
|
\n\
|
|
Return a copy of the array.");
|
|
|
|
static PyObject *
|
|
array_concat(arrayobject *a, PyObject *bb)
|
|
{
|
|
Py_ssize_t size;
|
|
arrayobject *np;
|
|
if (!array_Check(bb)) {
|
|
PyErr_Format(PyExc_TypeError,
|
|
"can only append array (not \"%.200s\") to array",
|
|
bb->ob_type->tp_name);
|
|
return NULL;
|
|
}
|
|
#define b ((arrayobject *)bb)
|
|
if (a->ob_descr != b->ob_descr) {
|
|
PyErr_BadArgument();
|
|
return NULL;
|
|
}
|
|
size = a->ob_size + b->ob_size;
|
|
np = (arrayobject *) newarrayobject(&Arraytype, size, a->ob_descr);
|
|
if (np == NULL) {
|
|
return NULL;
|
|
}
|
|
memcpy(np->ob_item, a->ob_item, a->ob_size*a->ob_descr->itemsize);
|
|
memcpy(np->ob_item + a->ob_size*a->ob_descr->itemsize,
|
|
b->ob_item, b->ob_size*b->ob_descr->itemsize);
|
|
return (PyObject *)np;
|
|
#undef b
|
|
}
|
|
|
|
static PyObject *
|
|
array_repeat(arrayobject *a, Py_ssize_t n)
|
|
{
|
|
Py_ssize_t i;
|
|
Py_ssize_t size;
|
|
arrayobject *np;
|
|
char *p;
|
|
Py_ssize_t nbytes;
|
|
if (n < 0)
|
|
n = 0;
|
|
size = a->ob_size * n;
|
|
np = (arrayobject *) newarrayobject(&Arraytype, size, a->ob_descr);
|
|
if (np == NULL)
|
|
return NULL;
|
|
p = np->ob_item;
|
|
nbytes = a->ob_size * a->ob_descr->itemsize;
|
|
for (i = 0; i < n; i++) {
|
|
memcpy(p, a->ob_item, nbytes);
|
|
p += nbytes;
|
|
}
|
|
return (PyObject *) np;
|
|
}
|
|
|
|
static int
|
|
array_ass_slice(arrayobject *a, Py_ssize_t ilow, Py_ssize_t ihigh, PyObject *v)
|
|
{
|
|
char *item;
|
|
Py_ssize_t n; /* Size of replacement array */
|
|
Py_ssize_t d; /* Change in size */
|
|
#define b ((arrayobject *)v)
|
|
if (v == NULL)
|
|
n = 0;
|
|
else if (array_Check(v)) {
|
|
n = b->ob_size;
|
|
if (a == b) {
|
|
/* Special case "a[i:j] = a" -- copy b first */
|
|
int ret;
|
|
v = array_slice(b, 0, n);
|
|
if (!v)
|
|
return -1;
|
|
ret = array_ass_slice(a, ilow, ihigh, v);
|
|
Py_DECREF(v);
|
|
return ret;
|
|
}
|
|
if (b->ob_descr != a->ob_descr) {
|
|
PyErr_BadArgument();
|
|
return -1;
|
|
}
|
|
}
|
|
else {
|
|
PyErr_Format(PyExc_TypeError,
|
|
"can only assign array (not \"%.200s\") to array slice",
|
|
v->ob_type->tp_name);
|
|
return -1;
|
|
}
|
|
if (ilow < 0)
|
|
ilow = 0;
|
|
else if (ilow > a->ob_size)
|
|
ilow = a->ob_size;
|
|
if (ihigh < 0)
|
|
ihigh = 0;
|
|
if (ihigh < ilow)
|
|
ihigh = ilow;
|
|
else if (ihigh > a->ob_size)
|
|
ihigh = a->ob_size;
|
|
item = a->ob_item;
|
|
d = n - (ihigh-ilow);
|
|
if (d < 0) { /* Delete -d items */
|
|
memmove(item + (ihigh+d)*a->ob_descr->itemsize,
|
|
item + ihigh*a->ob_descr->itemsize,
|
|
(a->ob_size-ihigh)*a->ob_descr->itemsize);
|
|
a->ob_size += d;
|
|
PyMem_RESIZE(item, char, a->ob_size*a->ob_descr->itemsize);
|
|
/* Can't fail */
|
|
a->ob_item = item;
|
|
a->allocated = a->ob_size;
|
|
}
|
|
else if (d > 0) { /* Insert d items */
|
|
PyMem_RESIZE(item, char,
|
|
(a->ob_size + d)*a->ob_descr->itemsize);
|
|
if (item == NULL) {
|
|
PyErr_NoMemory();
|
|
return -1;
|
|
}
|
|
memmove(item + (ihigh+d)*a->ob_descr->itemsize,
|
|
item + ihigh*a->ob_descr->itemsize,
|
|
(a->ob_size-ihigh)*a->ob_descr->itemsize);
|
|
a->ob_item = item;
|
|
a->ob_size += d;
|
|
a->allocated = a->ob_size;
|
|
}
|
|
if (n > 0)
|
|
memcpy(item + ilow*a->ob_descr->itemsize, b->ob_item,
|
|
n*b->ob_descr->itemsize);
|
|
return 0;
|
|
#undef b
|
|
}
|
|
|
|
static int
|
|
array_ass_item(arrayobject *a, Py_ssize_t i, PyObject *v)
|
|
{
|
|
if (i < 0 || i >= a->ob_size) {
|
|
PyErr_SetString(PyExc_IndexError,
|
|
"array assignment index out of range");
|
|
return -1;
|
|
}
|
|
if (v == NULL)
|
|
return array_ass_slice(a, i, i+1, v);
|
|
return (*a->ob_descr->setitem)(a, i, v);
|
|
}
|
|
|
|
static int
|
|
setarrayitem(PyObject *a, Py_ssize_t i, PyObject *v)
|
|
{
|
|
assert(array_Check(a));
|
|
return array_ass_item((arrayobject *)a, i, v);
|
|
}
|
|
|
|
static int
|
|
array_iter_extend(arrayobject *self, PyObject *bb)
|
|
{
|
|
PyObject *it, *v;
|
|
|
|
it = PyObject_GetIter(bb);
|
|
if (it == NULL)
|
|
return -1;
|
|
|
|
while ((v = PyIter_Next(it)) != NULL) {
|
|
if (ins1(self, (int) self->ob_size, v) != 0) {
|
|
Py_DECREF(v);
|
|
Py_DECREF(it);
|
|
return -1;
|
|
}
|
|
Py_DECREF(v);
|
|
}
|
|
Py_DECREF(it);
|
|
if (PyErr_Occurred())
|
|
return -1;
|
|
return 0;
|
|
}
|
|
|
|
static int
|
|
array_do_extend(arrayobject *self, PyObject *bb)
|
|
{
|
|
Py_ssize_t size;
|
|
|
|
if (!array_Check(bb))
|
|
return array_iter_extend(self, bb);
|
|
#define b ((arrayobject *)bb)
|
|
if (self->ob_descr != b->ob_descr) {
|
|
PyErr_SetString(PyExc_TypeError,
|
|
"can only extend with array of same kind");
|
|
return -1;
|
|
}
|
|
size = self->ob_size + b->ob_size;
|
|
PyMem_RESIZE(self->ob_item, char, size*self->ob_descr->itemsize);
|
|
if (self->ob_item == NULL) {
|
|
PyObject_Del(self);
|
|
PyErr_NoMemory();
|
|
return -1;
|
|
}
|
|
memcpy(self->ob_item + self->ob_size*self->ob_descr->itemsize,
|
|
b->ob_item, b->ob_size*b->ob_descr->itemsize);
|
|
self->ob_size = size;
|
|
self->allocated = size;
|
|
|
|
return 0;
|
|
#undef b
|
|
}
|
|
|
|
static PyObject *
|
|
array_inplace_concat(arrayobject *self, PyObject *bb)
|
|
{
|
|
if (!array_Check(bb)) {
|
|
PyErr_Format(PyExc_TypeError,
|
|
"can only extend array with array (not \"%.200s\")",
|
|
bb->ob_type->tp_name);
|
|
return NULL;
|
|
}
|
|
if (array_do_extend(self, bb) == -1)
|
|
return NULL;
|
|
Py_INCREF(self);
|
|
return (PyObject *)self;
|
|
}
|
|
|
|
static PyObject *
|
|
array_inplace_repeat(arrayobject *self, Py_ssize_t n)
|
|
{
|
|
char *items, *p;
|
|
Py_ssize_t size, i;
|
|
|
|
if (self->ob_size > 0) {
|
|
if (n < 0)
|
|
n = 0;
|
|
items = self->ob_item;
|
|
size = self->ob_size * self->ob_descr->itemsize;
|
|
if (n == 0) {
|
|
PyMem_FREE(items);
|
|
self->ob_item = NULL;
|
|
self->ob_size = 0;
|
|
self->allocated = 0;
|
|
}
|
|
else {
|
|
PyMem_Resize(items, char, n * size);
|
|
if (items == NULL)
|
|
return PyErr_NoMemory();
|
|
p = items;
|
|
for (i = 1; i < n; i++) {
|
|
p += size;
|
|
memcpy(p, items, size);
|
|
}
|
|
self->ob_item = items;
|
|
self->ob_size *= n;
|
|
self->allocated = self->ob_size;
|
|
}
|
|
}
|
|
Py_INCREF(self);
|
|
return (PyObject *)self;
|
|
}
|
|
|
|
|
|
static PyObject *
|
|
ins(arrayobject *self, Py_ssize_t where, PyObject *v)
|
|
{
|
|
if (ins1(self, where, v) != 0)
|
|
return NULL;
|
|
Py_INCREF(Py_None);
|
|
return Py_None;
|
|
}
|
|
|
|
static PyObject *
|
|
array_count(arrayobject *self, PyObject *v)
|
|
{
|
|
Py_ssize_t count = 0;
|
|
Py_ssize_t i;
|
|
|
|
for (i = 0; i < self->ob_size; i++) {
|
|
PyObject *selfi = getarrayitem((PyObject *)self, i);
|
|
int cmp = PyObject_RichCompareBool(selfi, v, Py_EQ);
|
|
Py_DECREF(selfi);
|
|
if (cmp > 0)
|
|
count++;
|
|
else if (cmp < 0)
|
|
return NULL;
|
|
}
|
|
return PyInt_FromSsize_t(count);
|
|
}
|
|
|
|
PyDoc_STRVAR(count_doc,
|
|
"count(x)\n\
|
|
\n\
|
|
Return number of occurences of x in the array.");
|
|
|
|
static PyObject *
|
|
array_index(arrayobject *self, PyObject *v)
|
|
{
|
|
Py_ssize_t i;
|
|
|
|
for (i = 0; i < self->ob_size; i++) {
|
|
PyObject *selfi = getarrayitem((PyObject *)self, i);
|
|
int cmp = PyObject_RichCompareBool(selfi, v, Py_EQ);
|
|
Py_DECREF(selfi);
|
|
if (cmp > 0) {
|
|
return PyInt_FromLong((long)i);
|
|
}
|
|
else if (cmp < 0)
|
|
return NULL;
|
|
}
|
|
PyErr_SetString(PyExc_ValueError, "array.index(x): x not in list");
|
|
return NULL;
|
|
}
|
|
|
|
PyDoc_STRVAR(index_doc,
|
|
"index(x)\n\
|
|
\n\
|
|
Return index of first occurence of x in the array.");
|
|
|
|
static int
|
|
array_contains(arrayobject *self, PyObject *v)
|
|
{
|
|
Py_ssize_t i;
|
|
int cmp;
|
|
|
|
for (i = 0, cmp = 0 ; cmp == 0 && i < self->ob_size; i++) {
|
|
PyObject *selfi = getarrayitem((PyObject *)self, i);
|
|
cmp = PyObject_RichCompareBool(selfi, v, Py_EQ);
|
|
Py_DECREF(selfi);
|
|
}
|
|
return cmp;
|
|
}
|
|
|
|
static PyObject *
|
|
array_remove(arrayobject *self, PyObject *v)
|
|
{
|
|
int i;
|
|
|
|
for (i = 0; i < self->ob_size; i++) {
|
|
PyObject *selfi = getarrayitem((PyObject *)self,i);
|
|
int cmp = PyObject_RichCompareBool(selfi, v, Py_EQ);
|
|
Py_DECREF(selfi);
|
|
if (cmp > 0) {
|
|
if (array_ass_slice(self, i, i+1,
|
|
(PyObject *)NULL) != 0)
|
|
return NULL;
|
|
Py_INCREF(Py_None);
|
|
return Py_None;
|
|
}
|
|
else if (cmp < 0)
|
|
return NULL;
|
|
}
|
|
PyErr_SetString(PyExc_ValueError, "array.remove(x): x not in list");
|
|
return NULL;
|
|
}
|
|
|
|
PyDoc_STRVAR(remove_doc,
|
|
"remove(x)\n\
|
|
\n\
|
|
Remove the first occurence of x in the array.");
|
|
|
|
static PyObject *
|
|
array_pop(arrayobject *self, PyObject *args)
|
|
{
|
|
Py_ssize_t i = -1;
|
|
PyObject *v;
|
|
if (!PyArg_ParseTuple(args, "|n:pop", &i))
|
|
return NULL;
|
|
if (self->ob_size == 0) {
|
|
/* Special-case most common failure cause */
|
|
PyErr_SetString(PyExc_IndexError, "pop from empty array");
|
|
return NULL;
|
|
}
|
|
if (i < 0)
|
|
i += self->ob_size;
|
|
if (i < 0 || i >= self->ob_size) {
|
|
PyErr_SetString(PyExc_IndexError, "pop index out of range");
|
|
return NULL;
|
|
}
|
|
v = getarrayitem((PyObject *)self,i);
|
|
if (array_ass_slice(self, i, i+1, (PyObject *)NULL) != 0) {
|
|
Py_DECREF(v);
|
|
return NULL;
|
|
}
|
|
return v;
|
|
}
|
|
|
|
PyDoc_STRVAR(pop_doc,
|
|
"pop([i])\n\
|
|
\n\
|
|
Return the i-th element and delete it from the array. i defaults to -1.");
|
|
|
|
static PyObject *
|
|
array_extend(arrayobject *self, PyObject *bb)
|
|
{
|
|
if (array_do_extend(self, bb) == -1)
|
|
return NULL;
|
|
Py_INCREF(Py_None);
|
|
return Py_None;
|
|
}
|
|
|
|
PyDoc_STRVAR(extend_doc,
|
|
"extend(array or iterable)\n\
|
|
\n\
|
|
Append items to the end of the array.");
|
|
|
|
static PyObject *
|
|
array_insert(arrayobject *self, PyObject *args)
|
|
{
|
|
Py_ssize_t i;
|
|
PyObject *v;
|
|
if (!PyArg_ParseTuple(args, "nO:insert", &i, &v))
|
|
return NULL;
|
|
return ins(self, i, v);
|
|
}
|
|
|
|
PyDoc_STRVAR(insert_doc,
|
|
"insert(i,x)\n\
|
|
\n\
|
|
Insert a new item x into the array before position i.");
|
|
|
|
|
|
static PyObject *
|
|
array_buffer_info(arrayobject *self, PyObject *unused)
|
|
{
|
|
PyObject* retval = NULL;
|
|
retval = PyTuple_New(2);
|
|
if (!retval)
|
|
return NULL;
|
|
|
|
PyTuple_SET_ITEM(retval, 0, PyLong_FromVoidPtr(self->ob_item));
|
|
PyTuple_SET_ITEM(retval, 1, PyInt_FromLong((long)(self->ob_size)));
|
|
|
|
return retval;
|
|
}
|
|
|
|
PyDoc_STRVAR(buffer_info_doc,
|
|
"buffer_info() -> (address, length)\n\
|
|
\n\
|
|
Return a tuple (address, length) giving the current memory address and\n\
|
|
the length in items of the buffer used to hold array's contents\n\
|
|
The length should be multiplied by the itemsize attribute to calculate\n\
|
|
the buffer length in bytes.");
|
|
|
|
|
|
static PyObject *
|
|
array_append(arrayobject *self, PyObject *v)
|
|
{
|
|
return ins(self, (int) self->ob_size, v);
|
|
}
|
|
|
|
PyDoc_STRVAR(append_doc,
|
|
"append(x)\n\
|
|
\n\
|
|
Append new value x to the end of the array.");
|
|
|
|
|
|
static PyObject *
|
|
array_byteswap(arrayobject *self, PyObject *unused)
|
|
{
|
|
char *p;
|
|
Py_ssize_t i;
|
|
|
|
switch (self->ob_descr->itemsize) {
|
|
case 1:
|
|
break;
|
|
case 2:
|
|
for (p = self->ob_item, i = self->ob_size; --i >= 0; p += 2) {
|
|
char p0 = p[0];
|
|
p[0] = p[1];
|
|
p[1] = p0;
|
|
}
|
|
break;
|
|
case 4:
|
|
for (p = self->ob_item, i = self->ob_size; --i >= 0; p += 4) {
|
|
char p0 = p[0];
|
|
char p1 = p[1];
|
|
p[0] = p[3];
|
|
p[1] = p[2];
|
|
p[2] = p1;
|
|
p[3] = p0;
|
|
}
|
|
break;
|
|
case 8:
|
|
for (p = self->ob_item, i = self->ob_size; --i >= 0; p += 8) {
|
|
char p0 = p[0];
|
|
char p1 = p[1];
|
|
char p2 = p[2];
|
|
char p3 = p[3];
|
|
p[0] = p[7];
|
|
p[1] = p[6];
|
|
p[2] = p[5];
|
|
p[3] = p[4];
|
|
p[4] = p3;
|
|
p[5] = p2;
|
|
p[6] = p1;
|
|
p[7] = p0;
|
|
}
|
|
break;
|
|
default:
|
|
PyErr_SetString(PyExc_RuntimeError,
|
|
"don't know how to byteswap this array type");
|
|
return NULL;
|
|
}
|
|
Py_INCREF(Py_None);
|
|
return Py_None;
|
|
}
|
|
|
|
PyDoc_STRVAR(byteswap_doc,
|
|
"byteswap()\n\
|
|
\n\
|
|
Byteswap all items of the array. If the items in the array are not 1, 2,\n\
|
|
4, or 8 bytes in size, RuntimeError is raised.");
|
|
|
|
static PyObject *
|
|
array_reduce(arrayobject *array)
|
|
{
|
|
PyObject *dict, *result;
|
|
|
|
dict = PyObject_GetAttrString((PyObject *)array, "__dict__");
|
|
if (dict == NULL) {
|
|
PyErr_Clear();
|
|
dict = Py_None;
|
|
Py_INCREF(dict);
|
|
}
|
|
result = Py_BuildValue("O(cs#)O",
|
|
array->ob_type,
|
|
array->ob_descr->typecode,
|
|
array->ob_item,
|
|
array->ob_size * array->ob_descr->itemsize,
|
|
dict);
|
|
Py_DECREF(dict);
|
|
return result;
|
|
}
|
|
|
|
PyDoc_STRVAR(array_doc, "Return state information for pickling.");
|
|
|
|
static PyObject *
|
|
array_reverse(arrayobject *self, PyObject *unused)
|
|
{
|
|
register Py_ssize_t itemsize = self->ob_descr->itemsize;
|
|
register char *p, *q;
|
|
/* little buffer to hold items while swapping */
|
|
char tmp[256]; /* 8 is probably enough -- but why skimp */
|
|
assert((size_t)itemsize <= sizeof(tmp));
|
|
|
|
if (self->ob_size > 1) {
|
|
for (p = self->ob_item,
|
|
q = self->ob_item + (self->ob_size - 1)*itemsize;
|
|
p < q;
|
|
p += itemsize, q -= itemsize) {
|
|
/* memory areas guaranteed disjoint, so memcpy
|
|
* is safe (& memmove may be slower).
|
|
*/
|
|
memcpy(tmp, p, itemsize);
|
|
memcpy(p, q, itemsize);
|
|
memcpy(q, tmp, itemsize);
|
|
}
|
|
}
|
|
|
|
Py_INCREF(Py_None);
|
|
return Py_None;
|
|
}
|
|
|
|
PyDoc_STRVAR(reverse_doc,
|
|
"reverse()\n\
|
|
\n\
|
|
Reverse the order of the items in the array.");
|
|
|
|
static PyObject *
|
|
array_fromfile(arrayobject *self, PyObject *args)
|
|
{
|
|
PyObject *f;
|
|
Py_ssize_t n;
|
|
FILE *fp;
|
|
if (!PyArg_ParseTuple(args, "On:fromfile", &f, &n))
|
|
return NULL;
|
|
fp = PyFile_AsFile(f);
|
|
if (fp == NULL) {
|
|
PyErr_SetString(PyExc_TypeError, "arg1 must be open file");
|
|
return NULL;
|
|
}
|
|
if (n > 0) {
|
|
char *item = self->ob_item;
|
|
Py_ssize_t itemsize = self->ob_descr->itemsize;
|
|
size_t nread;
|
|
Py_ssize_t newlength;
|
|
size_t newbytes;
|
|
/* Be careful here about overflow */
|
|
if ((newlength = self->ob_size + n) <= 0 ||
|
|
(newbytes = newlength * itemsize) / itemsize !=
|
|
(size_t)newlength)
|
|
goto nomem;
|
|
PyMem_RESIZE(item, char, newbytes);
|
|
if (item == NULL) {
|
|
nomem:
|
|
PyErr_NoMemory();
|
|
return NULL;
|
|
}
|
|
self->ob_item = item;
|
|
self->ob_size += n;
|
|
self->allocated = self->ob_size;
|
|
nread = fread(item + (self->ob_size - n) * itemsize,
|
|
itemsize, n, fp);
|
|
if (nread < (size_t)n) {
|
|
self->ob_size -= (n - nread);
|
|
PyMem_RESIZE(item, char, self->ob_size*itemsize);
|
|
self->ob_item = item;
|
|
self->allocated = self->ob_size;
|
|
PyErr_SetString(PyExc_EOFError,
|
|
"not enough items in file");
|
|
return NULL;
|
|
}
|
|
}
|
|
Py_INCREF(Py_None);
|
|
return Py_None;
|
|
}
|
|
|
|
PyDoc_STRVAR(fromfile_doc,
|
|
"fromfile(f, n)\n\
|
|
\n\
|
|
Read n objects from the file object f and append them to the end of the\n\
|
|
array. Also called as read.");
|
|
|
|
|
|
static PyObject *
|
|
array_tofile(arrayobject *self, PyObject *f)
|
|
{
|
|
FILE *fp;
|
|
|
|
fp = PyFile_AsFile(f);
|
|
if (fp == NULL) {
|
|
PyErr_SetString(PyExc_TypeError, "arg must be open file");
|
|
return NULL;
|
|
}
|
|
if (self->ob_size > 0) {
|
|
if (fwrite(self->ob_item, self->ob_descr->itemsize,
|
|
self->ob_size, fp) != (size_t)self->ob_size) {
|
|
PyErr_SetFromErrno(PyExc_IOError);
|
|
clearerr(fp);
|
|
return NULL;
|
|
}
|
|
}
|
|
Py_INCREF(Py_None);
|
|
return Py_None;
|
|
}
|
|
|
|
PyDoc_STRVAR(tofile_doc,
|
|
"tofile(f)\n\
|
|
\n\
|
|
Write all items (as machine values) to the file object f. Also called as\n\
|
|
write.");
|
|
|
|
|
|
static PyObject *
|
|
array_fromlist(arrayobject *self, PyObject *list)
|
|
{
|
|
Py_ssize_t n;
|
|
Py_ssize_t itemsize = self->ob_descr->itemsize;
|
|
|
|
if (!PyList_Check(list)) {
|
|
PyErr_SetString(PyExc_TypeError, "arg must be list");
|
|
return NULL;
|
|
}
|
|
n = PyList_Size(list);
|
|
if (n > 0) {
|
|
char *item = self->ob_item;
|
|
Py_ssize_t i;
|
|
PyMem_RESIZE(item, char, (self->ob_size + n) * itemsize);
|
|
if (item == NULL) {
|
|
PyErr_NoMemory();
|
|
return NULL;
|
|
}
|
|
self->ob_item = item;
|
|
self->ob_size += n;
|
|
self->allocated = self->ob_size;
|
|
for (i = 0; i < n; i++) {
|
|
PyObject *v = PyList_GetItem(list, i);
|
|
if ((*self->ob_descr->setitem)(self,
|
|
self->ob_size - n + i, v) != 0) {
|
|
self->ob_size -= n;
|
|
PyMem_RESIZE(item, char,
|
|
self->ob_size * itemsize);
|
|
self->ob_item = item;
|
|
self->allocated = self->ob_size;
|
|
return NULL;
|
|
}
|
|
}
|
|
}
|
|
Py_INCREF(Py_None);
|
|
return Py_None;
|
|
}
|
|
|
|
PyDoc_STRVAR(fromlist_doc,
|
|
"fromlist(list)\n\
|
|
\n\
|
|
Append items to array from list.");
|
|
|
|
|
|
static PyObject *
|
|
array_tolist(arrayobject *self, PyObject *unused)
|
|
{
|
|
PyObject *list = PyList_New(self->ob_size);
|
|
Py_ssize_t i;
|
|
|
|
if (list == NULL)
|
|
return NULL;
|
|
for (i = 0; i < self->ob_size; i++) {
|
|
PyObject *v = getarrayitem((PyObject *)self, i);
|
|
if (v == NULL) {
|
|
Py_DECREF(list);
|
|
return NULL;
|
|
}
|
|
PyList_SetItem(list, i, v);
|
|
}
|
|
return list;
|
|
}
|
|
|
|
PyDoc_STRVAR(tolist_doc,
|
|
"tolist() -> list\n\
|
|
\n\
|
|
Convert array to an ordinary list with the same items.");
|
|
|
|
|
|
static PyObject *
|
|
array_fromstring(arrayobject *self, PyObject *args)
|
|
{
|
|
char *str;
|
|
Py_ssize_t n;
|
|
int itemsize = self->ob_descr->itemsize;
|
|
if (!PyArg_ParseTuple(args, "s#:fromstring", &str, &n))
|
|
return NULL;
|
|
if (n % itemsize != 0) {
|
|
PyErr_SetString(PyExc_ValueError,
|
|
"string length not a multiple of item size");
|
|
return NULL;
|
|
}
|
|
n = n / itemsize;
|
|
if (n > 0) {
|
|
char *item = self->ob_item;
|
|
PyMem_RESIZE(item, char, (self->ob_size + n) * itemsize);
|
|
if (item == NULL) {
|
|
PyErr_NoMemory();
|
|
return NULL;
|
|
}
|
|
self->ob_item = item;
|
|
self->ob_size += n;
|
|
self->allocated = self->ob_size;
|
|
memcpy(item + (self->ob_size - n) * itemsize,
|
|
str, itemsize*n);
|
|
}
|
|
Py_INCREF(Py_None);
|
|
return Py_None;
|
|
}
|
|
|
|
PyDoc_STRVAR(fromstring_doc,
|
|
"fromstring(string)\n\
|
|
\n\
|
|
Appends items from the string, interpreting it as an array of machine\n\
|
|
values,as if it had been read from a file using the fromfile() method).");
|
|
|
|
|
|
static PyObject *
|
|
array_tostring(arrayobject *self, PyObject *unused)
|
|
{
|
|
return PyString_FromStringAndSize(self->ob_item,
|
|
self->ob_size * self->ob_descr->itemsize);
|
|
}
|
|
|
|
PyDoc_STRVAR(tostring_doc,
|
|
"tostring() -> string\n\
|
|
\n\
|
|
Convert the array to an array of machine values and return the string\n\
|
|
representation.");
|
|
|
|
|
|
|
|
#ifdef Py_USING_UNICODE
|
|
static PyObject *
|
|
array_fromunicode(arrayobject *self, PyObject *args)
|
|
{
|
|
Py_UNICODE *ustr;
|
|
Py_ssize_t n;
|
|
|
|
if (!PyArg_ParseTuple(args, "u#:fromunicode", &ustr, &n))
|
|
return NULL;
|
|
if (self->ob_descr->typecode != 'u') {
|
|
PyErr_SetString(PyExc_ValueError,
|
|
"fromunicode() may only be called on "
|
|
"type 'u' arrays");
|
|
return NULL;
|
|
}
|
|
if (n > 0) {
|
|
Py_UNICODE *item = (Py_UNICODE *) self->ob_item;
|
|
PyMem_RESIZE(item, Py_UNICODE, self->ob_size + n);
|
|
if (item == NULL) {
|
|
PyErr_NoMemory();
|
|
return NULL;
|
|
}
|
|
self->ob_item = (char *) item;
|
|
self->ob_size += n;
|
|
self->allocated = self->ob_size;
|
|
memcpy(item + self->ob_size - n,
|
|
ustr, n * sizeof(Py_UNICODE));
|
|
}
|
|
|
|
Py_INCREF(Py_None);
|
|
return Py_None;
|
|
}
|
|
|
|
PyDoc_STRVAR(fromunicode_doc,
|
|
"fromunicode(ustr)\n\
|
|
\n\
|
|
Extends this array with data from the unicode string ustr.\n\
|
|
The array must be a type 'u' array; otherwise a ValueError\n\
|
|
is raised. Use array.fromstring(ustr.decode(...)) to\n\
|
|
append Unicode data to an array of some other type.");
|
|
|
|
|
|
static PyObject *
|
|
array_tounicode(arrayobject *self, PyObject *unused)
|
|
{
|
|
if (self->ob_descr->typecode != 'u') {
|
|
PyErr_SetString(PyExc_ValueError,
|
|
"tounicode() may only be called on type 'u' arrays");
|
|
return NULL;
|
|
}
|
|
return PyUnicode_FromUnicode((Py_UNICODE *) self->ob_item, self->ob_size);
|
|
}
|
|
|
|
PyDoc_STRVAR(tounicode_doc,
|
|
"tounicode() -> unicode\n\
|
|
\n\
|
|
Convert the array to a unicode string. The array must be\n\
|
|
a type 'u' array; otherwise a ValueError is raised. Use\n\
|
|
array.tostring().decode() to obtain a unicode string from\n\
|
|
an array of some other type.");
|
|
|
|
#endif /* Py_USING_UNICODE */
|
|
|
|
|
|
static PyObject *
|
|
array_get_typecode(arrayobject *a, void *closure)
|
|
{
|
|
char tc = a->ob_descr->typecode;
|
|
return PyString_FromStringAndSize(&tc, 1);
|
|
}
|
|
|
|
static PyObject *
|
|
array_get_itemsize(arrayobject *a, void *closure)
|
|
{
|
|
return PyInt_FromLong((long)a->ob_descr->itemsize);
|
|
}
|
|
|
|
static PyGetSetDef array_getsets [] = {
|
|
{"typecode", (getter) array_get_typecode, NULL,
|
|
"the typecode character used to create the array"},
|
|
{"itemsize", (getter) array_get_itemsize, NULL,
|
|
"the size, in bytes, of one array item"},
|
|
{NULL}
|
|
};
|
|
|
|
PyMethodDef array_methods[] = {
|
|
{"append", (PyCFunction)array_append, METH_O,
|
|
append_doc},
|
|
{"buffer_info", (PyCFunction)array_buffer_info, METH_NOARGS,
|
|
buffer_info_doc},
|
|
{"byteswap", (PyCFunction)array_byteswap, METH_NOARGS,
|
|
byteswap_doc},
|
|
{"__copy__", (PyCFunction)array_copy, METH_NOARGS,
|
|
copy_doc},
|
|
{"count", (PyCFunction)array_count, METH_O,
|
|
count_doc},
|
|
{"__deepcopy__",(PyCFunction)array_copy, METH_NOARGS,
|
|
copy_doc},
|
|
{"extend", (PyCFunction)array_extend, METH_O,
|
|
extend_doc},
|
|
{"fromfile", (PyCFunction)array_fromfile, METH_VARARGS,
|
|
fromfile_doc},
|
|
{"fromlist", (PyCFunction)array_fromlist, METH_O,
|
|
fromlist_doc},
|
|
{"fromstring", (PyCFunction)array_fromstring, METH_VARARGS,
|
|
fromstring_doc},
|
|
#ifdef Py_USING_UNICODE
|
|
{"fromunicode", (PyCFunction)array_fromunicode, METH_VARARGS,
|
|
fromunicode_doc},
|
|
#endif
|
|
{"index", (PyCFunction)array_index, METH_O,
|
|
index_doc},
|
|
{"insert", (PyCFunction)array_insert, METH_VARARGS,
|
|
insert_doc},
|
|
{"pop", (PyCFunction)array_pop, METH_VARARGS,
|
|
pop_doc},
|
|
{"read", (PyCFunction)array_fromfile, METH_VARARGS,
|
|
fromfile_doc},
|
|
{"__reduce__", (PyCFunction)array_reduce, METH_NOARGS,
|
|
array_doc},
|
|
{"remove", (PyCFunction)array_remove, METH_O,
|
|
remove_doc},
|
|
{"reverse", (PyCFunction)array_reverse, METH_NOARGS,
|
|
reverse_doc},
|
|
/* {"sort", (PyCFunction)array_sort, METH_VARARGS,
|
|
sort_doc},*/
|
|
{"tofile", (PyCFunction)array_tofile, METH_O,
|
|
tofile_doc},
|
|
{"tolist", (PyCFunction)array_tolist, METH_NOARGS,
|
|
tolist_doc},
|
|
{"tostring", (PyCFunction)array_tostring, METH_NOARGS,
|
|
tostring_doc},
|
|
#ifdef Py_USING_UNICODE
|
|
{"tounicode", (PyCFunction)array_tounicode, METH_NOARGS,
|
|
tounicode_doc},
|
|
#endif
|
|
{"write", (PyCFunction)array_tofile, METH_O,
|
|
tofile_doc},
|
|
{NULL, NULL} /* sentinel */
|
|
};
|
|
|
|
static PyObject *
|
|
array_repr(arrayobject *a)
|
|
{
|
|
char buf[256], typecode;
|
|
PyObject *s, *t, *v = NULL;
|
|
Py_ssize_t len;
|
|
|
|
len = a->ob_size;
|
|
typecode = a->ob_descr->typecode;
|
|
if (len == 0) {
|
|
PyOS_snprintf(buf, sizeof(buf), "array('%c')", typecode);
|
|
return PyString_FromString(buf);
|
|
}
|
|
|
|
if (typecode == 'c')
|
|
v = array_tostring(a, NULL);
|
|
#ifdef Py_USING_UNICODE
|
|
else if (typecode == 'u')
|
|
v = array_tounicode(a, NULL);
|
|
#endif
|
|
else
|
|
v = array_tolist(a, NULL);
|
|
t = PyObject_Repr(v);
|
|
Py_XDECREF(v);
|
|
|
|
PyOS_snprintf(buf, sizeof(buf), "array('%c', ", typecode);
|
|
s = PyString_FromString(buf);
|
|
PyString_ConcatAndDel(&s, t);
|
|
PyString_ConcatAndDel(&s, PyString_FromString(")"));
|
|
return s;
|
|
}
|
|
|
|
static PyObject*
|
|
array_subscr(arrayobject* self, PyObject* item)
|
|
{
|
|
if (PyIndex_Check(item)) {
|
|
Py_ssize_t i = PyNumber_AsSsize_t(item, PyExc_IndexError);
|
|
if (i==-1 && PyErr_Occurred()) {
|
|
return NULL;
|
|
}
|
|
if (i < 0)
|
|
i += self->ob_size;
|
|
return array_item(self, i);
|
|
}
|
|
else if (PySlice_Check(item)) {
|
|
Py_ssize_t start, stop, step, slicelength, cur, i;
|
|
PyObject* result;
|
|
arrayobject* ar;
|
|
int itemsize = self->ob_descr->itemsize;
|
|
|
|
if (PySlice_GetIndicesEx((PySliceObject*)item, self->ob_size,
|
|
&start, &stop, &step, &slicelength) < 0) {
|
|
return NULL;
|
|
}
|
|
|
|
if (slicelength <= 0) {
|
|
return newarrayobject(&Arraytype, 0, self->ob_descr);
|
|
}
|
|
else {
|
|
result = newarrayobject(&Arraytype, slicelength, self->ob_descr);
|
|
if (!result) return NULL;
|
|
|
|
ar = (arrayobject*)result;
|
|
|
|
for (cur = start, i = 0; i < slicelength;
|
|
cur += step, i++) {
|
|
memcpy(ar->ob_item + i*itemsize,
|
|
self->ob_item + cur*itemsize,
|
|
itemsize);
|
|
}
|
|
|
|
return result;
|
|
}
|
|
}
|
|
else {
|
|
PyErr_SetString(PyExc_TypeError,
|
|
"list indices must be integers");
|
|
return NULL;
|
|
}
|
|
}
|
|
|
|
static int
|
|
array_ass_subscr(arrayobject* self, PyObject* item, PyObject* value)
|
|
{
|
|
if (PyIndex_Check(item)) {
|
|
Py_ssize_t i = PyNumber_AsSsize_t(item, PyExc_IndexError);
|
|
if (i==-1 && PyErr_Occurred())
|
|
return -1;
|
|
if (i < 0)
|
|
i += self->ob_size;
|
|
return array_ass_item(self, i, value);
|
|
}
|
|
else if (PySlice_Check(item)) {
|
|
Py_ssize_t start, stop, step, slicelength;
|
|
int itemsize = self->ob_descr->itemsize;
|
|
|
|
if (PySlice_GetIndicesEx((PySliceObject*)item, self->ob_size,
|
|
&start, &stop, &step, &slicelength) < 0) {
|
|
return -1;
|
|
}
|
|
|
|
/* treat A[slice(a,b)] = v _exactly_ like A[a:b] = v */
|
|
if (step == 1 && ((PySliceObject*)item)->step == Py_None)
|
|
return array_ass_slice(self, start, stop, value);
|
|
|
|
if (value == NULL) {
|
|
/* delete slice */
|
|
Py_ssize_t cur, i, extra;
|
|
|
|
if (slicelength <= 0)
|
|
return 0;
|
|
|
|
if (step < 0) {
|
|
stop = start + 1;
|
|
start = stop + step*(slicelength - 1) - 1;
|
|
step = -step;
|
|
}
|
|
|
|
for (cur = start, i = 0; i < slicelength - 1;
|
|
cur += step, i++) {
|
|
memmove(self->ob_item + (cur - i)*itemsize,
|
|
self->ob_item + (cur + 1)*itemsize,
|
|
(step - 1) * itemsize);
|
|
}
|
|
extra = self->ob_size - (cur + 1);
|
|
if (extra > 0) {
|
|
memmove(self->ob_item + (cur - i)*itemsize,
|
|
self->ob_item + (cur + 1)*itemsize,
|
|
extra*itemsize);
|
|
}
|
|
|
|
self->ob_size -= slicelength;
|
|
self->ob_item = (char *)PyMem_REALLOC(self->ob_item,
|
|
itemsize*self->ob_size);
|
|
self->allocated = self->ob_size;
|
|
|
|
return 0;
|
|
}
|
|
else {
|
|
/* assign slice */
|
|
Py_ssize_t cur, i;
|
|
arrayobject* av;
|
|
|
|
if (!array_Check(value)) {
|
|
PyErr_Format(PyExc_TypeError,
|
|
"must assign array (not \"%.200s\") to slice",
|
|
value->ob_type->tp_name);
|
|
return -1;
|
|
}
|
|
|
|
av = (arrayobject*)value;
|
|
|
|
if (av->ob_size != slicelength) {
|
|
PyErr_Format(PyExc_ValueError,
|
|
"attempt to assign array of size %ld to extended slice of size %ld",
|
|
/*XXX*/(long)av->ob_size, /*XXX*/(long)slicelength);
|
|
return -1;
|
|
}
|
|
|
|
if (!slicelength)
|
|
return 0;
|
|
|
|
/* protect against a[::-1] = a */
|
|
if (self == av) {
|
|
value = array_slice(av, 0, av->ob_size);
|
|
av = (arrayobject*)value;
|
|
if (!av)
|
|
return -1;
|
|
}
|
|
else {
|
|
Py_INCREF(value);
|
|
}
|
|
|
|
for (cur = start, i = 0; i < slicelength;
|
|
cur += step, i++) {
|
|
memcpy(self->ob_item + cur*itemsize,
|
|
av->ob_item + i*itemsize,
|
|
itemsize);
|
|
}
|
|
|
|
Py_DECREF(value);
|
|
|
|
return 0;
|
|
}
|
|
}
|
|
else {
|
|
PyErr_SetString(PyExc_TypeError,
|
|
"list indices must be integers");
|
|
return -1;
|
|
}
|
|
}
|
|
|
|
static PyMappingMethods array_as_mapping = {
|
|
(lenfunc)array_length,
|
|
(binaryfunc)array_subscr,
|
|
(objobjargproc)array_ass_subscr
|
|
};
|
|
|
|
static Py_ssize_t
|
|
array_buffer_getreadbuf(arrayobject *self, Py_ssize_t index, const void **ptr)
|
|
{
|
|
if ( index != 0 ) {
|
|
PyErr_SetString(PyExc_SystemError,
|
|
"Accessing non-existent array segment");
|
|
return -1;
|
|
}
|
|
*ptr = (void *)self->ob_item;
|
|
return self->ob_size*self->ob_descr->itemsize;
|
|
}
|
|
|
|
static Py_ssize_t
|
|
array_buffer_getwritebuf(arrayobject *self, Py_ssize_t index, const void **ptr)
|
|
{
|
|
if ( index != 0 ) {
|
|
PyErr_SetString(PyExc_SystemError,
|
|
"Accessing non-existent array segment");
|
|
return -1;
|
|
}
|
|
*ptr = (void *)self->ob_item;
|
|
return self->ob_size*self->ob_descr->itemsize;
|
|
}
|
|
|
|
static Py_ssize_t
|
|
array_buffer_getsegcount(arrayobject *self, Py_ssize_t *lenp)
|
|
{
|
|
if ( lenp )
|
|
*lenp = self->ob_size*self->ob_descr->itemsize;
|
|
return 1;
|
|
}
|
|
|
|
static PySequenceMethods array_as_sequence = {
|
|
(lenfunc)array_length, /*sq_length*/
|
|
(binaryfunc)array_concat, /*sq_concat*/
|
|
(ssizeargfunc)array_repeat, /*sq_repeat*/
|
|
(ssizeargfunc)array_item, /*sq_item*/
|
|
(ssizessizeargfunc)array_slice, /*sq_slice*/
|
|
(ssizeobjargproc)array_ass_item, /*sq_ass_item*/
|
|
(ssizessizeobjargproc)array_ass_slice, /*sq_ass_slice*/
|
|
(objobjproc)array_contains, /*sq_contains*/
|
|
(binaryfunc)array_inplace_concat, /*sq_inplace_concat*/
|
|
(ssizeargfunc)array_inplace_repeat /*sq_inplace_repeat*/
|
|
};
|
|
|
|
static PyBufferProcs array_as_buffer = {
|
|
(readbufferproc)array_buffer_getreadbuf,
|
|
(writebufferproc)array_buffer_getwritebuf,
|
|
(segcountproc)array_buffer_getsegcount,
|
|
NULL,
|
|
};
|
|
|
|
static PyObject *
|
|
array_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
|
|
{
|
|
char c;
|
|
PyObject *initial = NULL, *it = NULL;
|
|
struct arraydescr *descr;
|
|
|
|
if (!_PyArg_NoKeywords("array.array()", kwds))
|
|
return NULL;
|
|
|
|
if (!PyArg_ParseTuple(args, "c|O:array", &c, &initial))
|
|
return NULL;
|
|
|
|
if (!(initial == NULL || PyList_Check(initial)
|
|
|| PyString_Check(initial) || PyTuple_Check(initial)
|
|
|| (c == 'u' && PyUnicode_Check(initial)))) {
|
|
it = PyObject_GetIter(initial);
|
|
if (it == NULL)
|
|
return NULL;
|
|
/* We set initial to NULL so that the subsequent code
|
|
will create an empty array of the appropriate type
|
|
and afterwards we can use array_iter_extend to populate
|
|
the array.
|
|
*/
|
|
initial = NULL;
|
|
}
|
|
for (descr = descriptors; descr->typecode != '\0'; descr++) {
|
|
if (descr->typecode == c) {
|
|
PyObject *a;
|
|
Py_ssize_t len;
|
|
|
|
if (initial == NULL || !(PyList_Check(initial)
|
|
|| PyTuple_Check(initial)))
|
|
len = 0;
|
|
else
|
|
len = PySequence_Size(initial);
|
|
|
|
a = newarrayobject(type, len, descr);
|
|
if (a == NULL)
|
|
return NULL;
|
|
|
|
if (len > 0) {
|
|
Py_ssize_t i;
|
|
for (i = 0; i < len; i++) {
|
|
PyObject *v =
|
|
PySequence_GetItem(initial, i);
|
|
if (v == NULL) {
|
|
Py_DECREF(a);
|
|
return NULL;
|
|
}
|
|
if (setarrayitem(a, i, v) != 0) {
|
|
Py_DECREF(v);
|
|
Py_DECREF(a);
|
|
return NULL;
|
|
}
|
|
Py_DECREF(v);
|
|
}
|
|
} else if (initial != NULL && PyString_Check(initial)) {
|
|
PyObject *t_initial, *v;
|
|
t_initial = PyTuple_Pack(1, initial);
|
|
if (t_initial == NULL) {
|
|
Py_DECREF(a);
|
|
return NULL;
|
|
}
|
|
v = array_fromstring((arrayobject *)a,
|
|
t_initial);
|
|
Py_DECREF(t_initial);
|
|
if (v == NULL) {
|
|
Py_DECREF(a);
|
|
return NULL;
|
|
}
|
|
Py_DECREF(v);
|
|
#ifdef Py_USING_UNICODE
|
|
} else if (initial != NULL && PyUnicode_Check(initial)) {
|
|
Py_ssize_t n = PyUnicode_GET_DATA_SIZE(initial);
|
|
if (n > 0) {
|
|
arrayobject *self = (arrayobject *)a;
|
|
char *item = self->ob_item;
|
|
item = (char *)PyMem_Realloc(item, n);
|
|
if (item == NULL) {
|
|
PyErr_NoMemory();
|
|
Py_DECREF(a);
|
|
return NULL;
|
|
}
|
|
self->ob_item = item;
|
|
self->ob_size = n / sizeof(Py_UNICODE);
|
|
memcpy(item, PyUnicode_AS_DATA(initial), n);
|
|
self->allocated = self->ob_size;
|
|
}
|
|
#endif
|
|
}
|
|
if (it != NULL) {
|
|
if (array_iter_extend((arrayobject *)a, it) == -1) {
|
|
Py_DECREF(it);
|
|
Py_DECREF(a);
|
|
return NULL;
|
|
}
|
|
Py_DECREF(it);
|
|
}
|
|
return a;
|
|
}
|
|
}
|
|
PyErr_SetString(PyExc_ValueError,
|
|
"bad typecode (must be c, b, B, u, h, H, i, I, l, L, f or d)");
|
|
return NULL;
|
|
}
|
|
|
|
|
|
PyDoc_STRVAR(module_doc,
|
|
"This module defines an object type which can efficiently represent\n\
|
|
an array of basic values: characters, integers, floating point\n\
|
|
numbers. Arrays are sequence types and behave very much like lists,\n\
|
|
except that the type of objects stored in them is constrained. The\n\
|
|
type is specified at object creation time by using a type code, which\n\
|
|
is a single character. The following type codes are defined:\n\
|
|
\n\
|
|
Type code C Type Minimum size in bytes \n\
|
|
'c' character 1 \n\
|
|
'b' signed integer 1 \n\
|
|
'B' unsigned integer 1 \n\
|
|
'u' Unicode character 2 \n\
|
|
'h' signed integer 2 \n\
|
|
'H' unsigned integer 2 \n\
|
|
'i' signed integer 2 \n\
|
|
'I' unsigned integer 2 \n\
|
|
'l' signed integer 4 \n\
|
|
'L' unsigned integer 4 \n\
|
|
'f' floating point 4 \n\
|
|
'd' floating point 8 \n\
|
|
\n\
|
|
The constructor is:\n\
|
|
\n\
|
|
array(typecode [, initializer]) -- create a new array\n\
|
|
");
|
|
|
|
PyDoc_STRVAR(arraytype_doc,
|
|
"array(typecode [, initializer]) -> array\n\
|
|
\n\
|
|
Return a new array whose items are restricted by typecode, and\n\
|
|
initialized from the optional initializer value, which must be a list,\n\
|
|
string. or iterable over elements of the appropriate type.\n\
|
|
\n\
|
|
Arrays represent basic values and behave very much like lists, except\n\
|
|
the type of objects stored in them is constrained.\n\
|
|
\n\
|
|
Methods:\n\
|
|
\n\
|
|
append() -- append a new item to the end of the array\n\
|
|
buffer_info() -- return information giving the current memory info\n\
|
|
byteswap() -- byteswap all the items of the array\n\
|
|
count() -- return number of occurences of an object\n\
|
|
extend() -- extend array by appending multiple elements from an iterable\n\
|
|
fromfile() -- read items from a file object\n\
|
|
fromlist() -- append items from the list\n\
|
|
fromstring() -- append items from the string\n\
|
|
index() -- return index of first occurence of an object\n\
|
|
insert() -- insert a new item into the array at a provided position\n\
|
|
pop() -- remove and return item (default last)\n\
|
|
read() -- DEPRECATED, use fromfile()\n\
|
|
remove() -- remove first occurence of an object\n\
|
|
reverse() -- reverse the order of the items in the array\n\
|
|
tofile() -- write all items to a file object\n\
|
|
tolist() -- return the array converted to an ordinary list\n\
|
|
tostring() -- return the array converted to a string\n\
|
|
write() -- DEPRECATED, use tofile()\n\
|
|
\n\
|
|
Attributes:\n\
|
|
\n\
|
|
typecode -- the typecode character used to create the array\n\
|
|
itemsize -- the length in bytes of one array item\n\
|
|
");
|
|
|
|
static PyObject *array_iter(arrayobject *ao);
|
|
|
|
static PyTypeObject Arraytype = {
|
|
PyObject_HEAD_INIT(NULL)
|
|
0,
|
|
"array.array",
|
|
sizeof(arrayobject),
|
|
0,
|
|
(destructor)array_dealloc, /* tp_dealloc */
|
|
0, /* tp_print */
|
|
0, /* tp_getattr */
|
|
0, /* tp_setattr */
|
|
0, /* tp_compare */
|
|
(reprfunc)array_repr, /* tp_repr */
|
|
0, /* tp_as_number*/
|
|
&array_as_sequence, /* tp_as_sequence*/
|
|
&array_as_mapping, /* tp_as_mapping*/
|
|
0, /* tp_hash */
|
|
0, /* tp_call */
|
|
0, /* tp_str */
|
|
PyObject_GenericGetAttr, /* tp_getattro */
|
|
0, /* tp_setattro */
|
|
&array_as_buffer, /* tp_as_buffer*/
|
|
Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, /* tp_flags */
|
|
arraytype_doc, /* tp_doc */
|
|
0, /* tp_traverse */
|
|
0, /* tp_clear */
|
|
array_richcompare, /* tp_richcompare */
|
|
offsetof(arrayobject, weakreflist), /* tp_weaklistoffset */
|
|
(getiterfunc)array_iter, /* tp_iter */
|
|
0, /* tp_iternext */
|
|
array_methods, /* tp_methods */
|
|
0, /* tp_members */
|
|
array_getsets, /* tp_getset */
|
|
0, /* tp_base */
|
|
0, /* tp_dict */
|
|
0, /* tp_descr_get */
|
|
0, /* tp_descr_set */
|
|
0, /* tp_dictoffset */
|
|
0, /* tp_init */
|
|
PyType_GenericAlloc, /* tp_alloc */
|
|
array_new, /* tp_new */
|
|
PyObject_Del, /* tp_free */
|
|
};
|
|
|
|
|
|
/*********************** Array Iterator **************************/
|
|
|
|
typedef struct {
|
|
PyObject_HEAD
|
|
Py_ssize_t index;
|
|
arrayobject *ao;
|
|
PyObject * (*getitem)(struct arrayobject *, Py_ssize_t);
|
|
} arrayiterobject;
|
|
|
|
static PyTypeObject PyArrayIter_Type;
|
|
|
|
#define PyArrayIter_Check(op) PyObject_TypeCheck(op, &PyArrayIter_Type)
|
|
|
|
static PyObject *
|
|
array_iter(arrayobject *ao)
|
|
{
|
|
arrayiterobject *it;
|
|
|
|
if (!array_Check(ao)) {
|
|
PyErr_BadInternalCall();
|
|
return NULL;
|
|
}
|
|
|
|
it = PyObject_GC_New(arrayiterobject, &PyArrayIter_Type);
|
|
if (it == NULL)
|
|
return NULL;
|
|
|
|
Py_INCREF(ao);
|
|
it->ao = ao;
|
|
it->index = 0;
|
|
it->getitem = ao->ob_descr->getitem;
|
|
PyObject_GC_Track(it);
|
|
return (PyObject *)it;
|
|
}
|
|
|
|
static PyObject *
|
|
arrayiter_next(arrayiterobject *it)
|
|
{
|
|
assert(PyArrayIter_Check(it));
|
|
if (it->index < it->ao->ob_size)
|
|
return (*it->getitem)(it->ao, it->index++);
|
|
return NULL;
|
|
}
|
|
|
|
static void
|
|
arrayiter_dealloc(arrayiterobject *it)
|
|
{
|
|
PyObject_GC_UnTrack(it);
|
|
Py_XDECREF(it->ao);
|
|
PyObject_GC_Del(it);
|
|
}
|
|
|
|
static int
|
|
arrayiter_traverse(arrayiterobject *it, visitproc visit, void *arg)
|
|
{
|
|
Py_VISIT(it->ao);
|
|
return 0;
|
|
}
|
|
|
|
static PyTypeObject PyArrayIter_Type = {
|
|
PyObject_HEAD_INIT(NULL)
|
|
0, /* ob_size */
|
|
"arrayiterator", /* tp_name */
|
|
sizeof(arrayiterobject), /* tp_basicsize */
|
|
0, /* tp_itemsize */
|
|
/* methods */
|
|
(destructor)arrayiter_dealloc, /* tp_dealloc */
|
|
0, /* tp_print */
|
|
0, /* tp_getattr */
|
|
0, /* tp_setattr */
|
|
0, /* tp_compare */
|
|
0, /* tp_repr */
|
|
0, /* tp_as_number */
|
|
0, /* tp_as_sequence */
|
|
0, /* tp_as_mapping */
|
|
0, /* tp_hash */
|
|
0, /* tp_call */
|
|
0, /* tp_str */
|
|
PyObject_GenericGetAttr, /* tp_getattro */
|
|
0, /* tp_setattro */
|
|
0, /* tp_as_buffer */
|
|
Py_TPFLAGS_DEFAULT | Py_TPFLAGS_HAVE_GC,/* tp_flags */
|
|
0, /* tp_doc */
|
|
(traverseproc)arrayiter_traverse, /* tp_traverse */
|
|
0, /* tp_clear */
|
|
0, /* tp_richcompare */
|
|
0, /* tp_weaklistoffset */
|
|
PyObject_SelfIter, /* tp_iter */
|
|
(iternextfunc)arrayiter_next, /* tp_iternext */
|
|
0, /* tp_methods */
|
|
};
|
|
|
|
|
|
/*********************** Install Module **************************/
|
|
|
|
/* No functions in array module. */
|
|
static PyMethodDef a_methods[] = {
|
|
{NULL, NULL, 0, NULL} /* Sentinel */
|
|
};
|
|
|
|
|
|
PyMODINIT_FUNC
|
|
initarray(void)
|
|
{
|
|
PyObject *m;
|
|
|
|
if (PyType_Ready(&Arraytype) < 0)
|
|
return;
|
|
PyArrayIter_Type.ob_type = &PyType_Type;
|
|
m = Py_InitModule3("array", a_methods, module_doc);
|
|
if (m == NULL)
|
|
return;
|
|
|
|
Py_INCREF((PyObject *)&Arraytype);
|
|
PyModule_AddObject(m, "ArrayType", (PyObject *)&Arraytype);
|
|
Py_INCREF((PyObject *)&Arraytype);
|
|
PyModule_AddObject(m, "array", (PyObject *)&Arraytype);
|
|
/* No need to check the error here, the caller will do that */
|
|
}
|