1995-07-18 22:12:02 +08:00
|
|
|
/* Abstract Object Interface (many thanks to Jim Fulton) */
|
1998-05-22 08:47:05 +08:00
|
|
|
|
1995-07-18 22:12:02 +08:00
|
|
|
#include "Python.h"
|
2020-04-15 08:35:41 +08:00
|
|
|
#include "pycore_abstract.h" // _PyIndex_Check()
|
|
|
|
#include "pycore_ceval.h" // _Py_EnterRecursiveCall()
|
2021-01-28 00:39:16 +08:00
|
|
|
#include "pycore_object.h" // _Py_CheckSlotResult()
|
2020-06-23 21:55:06 +08:00
|
|
|
#include "pycore_pyerrors.h" // _PyErr_Occurred()
|
2020-04-15 08:35:41 +08:00
|
|
|
#include "pycore_pystate.h" // _PyThreadState_GET()
|
2021-01-28 00:39:16 +08:00
|
|
|
#include "pycore_unionobject.h" // _Py_UnionType && _Py_Union()
|
1998-05-22 23:23:36 +08:00
|
|
|
#include <ctype.h>
|
2020-04-15 08:35:41 +08:00
|
|
|
#include <stddef.h> // offsetof()
|
2001-09-11 04:52:51 +08:00
|
|
|
#include "longintrepr.h"
|
2001-01-04 09:39:06 +08:00
|
|
|
|
2006-04-21 18:40:58 +08:00
|
|
|
|
Merge current trunk into p3yk. This includes the PyNumber_Index API change,
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)
........
2006-08-22 03:07:27 +08:00
|
|
|
|
1998-05-22 08:47:05 +08:00
|
|
|
/* Shorthands to return certain errors */
|
1995-07-18 22:12:02 +08:00
|
|
|
|
|
|
|
static PyObject *
|
Merged revisions 46753-51188 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r46755 | brett.cannon | 2006-06-08 18:23:04 +0200 (Thu, 08 Jun 2006) | 4 lines
Make binascii.hexlify() use s# for its arguments instead of t# to actually
match its documentation stating it accepts any read-only buffer.
........
r46757 | brett.cannon | 2006-06-08 19:00:45 +0200 (Thu, 08 Jun 2006) | 8 lines
Buffer objects would return the read or write buffer for a wrapped object when
the char buffer was requested. Now it actually returns the char buffer if
available or raises a TypeError if it isn't (as is raised for the other buffer
types if they are not present but requested).
Not a backport candidate since it does change semantics of the buffer object
(although it could be argued this is enough of a bug to bother backporting).
........
r46760 | andrew.kuchling | 2006-06-09 03:10:17 +0200 (Fri, 09 Jun 2006) | 1 line
Update functools section
........
r46762 | tim.peters | 2006-06-09 04:11:02 +0200 (Fri, 09 Jun 2006) | 6 lines
Whitespace normalization.
Since test_file is implicated in mysterious test failures
when followed by test_optparse, if I had any brains I'd
look at the checkin that last changed test_file ;-)
........
r46763 | tim.peters | 2006-06-09 05:09:42 +0200 (Fri, 09 Jun 2006) | 5 lines
To boost morale :-), force test_optparse to run immediately
after test_file until we can figure out how to fix it.
(See python-dev; at the moment we don't even know which checkin
caused the problem.)
........
r46764 | tim.peters | 2006-06-09 05:51:41 +0200 (Fri, 09 Jun 2006) | 6 lines
AutoFileTests.tearDown(): Removed mysterious undocumented
try/except. Remove TESTFN.
Throughout: used open() instead of file(), and wrapped
long lines.
........
r46765 | tim.peters | 2006-06-09 06:02:06 +0200 (Fri, 09 Jun 2006) | 8 lines
testUnicodeOpen(): I have no idea why, but making this
test clean up after itself appears to fix the test failures
when test_optparse follows test_file.
test_main(): Get rid of TESTFN no matter what. That's
also enough to fix the mystery failures. Doesn't hurt
to fix them twice :-)
........
r46766 | tim.peters | 2006-06-09 07:12:40 +0200 (Fri, 09 Jun 2006) | 6 lines
Remove the temporary hack to force test_optparse to
run immediately after test_file. At least 8 buildbot
boxes passed since the underlying problem got fixed,
and they all failed before the fix, so there's no point
to this anymore.
........
r46767 | neal.norwitz | 2006-06-09 07:54:18 +0200 (Fri, 09 Jun 2006) | 1 line
Fix grammar and reflow
........
r46769 | andrew.kuchling | 2006-06-09 12:22:35 +0200 (Fri, 09 Jun 2006) | 1 line
Markup fix
........
r46773 | andrew.kuchling | 2006-06-09 15:15:57 +0200 (Fri, 09 Jun 2006) | 1 line
[Bug #1472827] Make saxutils.XMLGenerator handle \r\n\t in attribute values by escaping them properly. 2.4 bugfix candidate.
........
r46778 | kristjan.jonsson | 2006-06-09 18:28:01 +0200 (Fri, 09 Jun 2006) | 2 lines
Turn off warning about deprecated CRT functions on for VisualStudio .NET 2005.
Make the definition #ARRAYSIZE conditional. VisualStudio .NET 2005 already has it defined using a better gimmick.
........
r46779 | phillip.eby | 2006-06-09 18:40:18 +0200 (Fri, 09 Jun 2006) | 2 lines
Import wsgiref into the stdlib, as of the external version 0.1-r2181.
........
r46783 | andrew.kuchling | 2006-06-09 18:44:40 +0200 (Fri, 09 Jun 2006) | 1 line
Add note about XMLGenerator bugfix
........
r46784 | andrew.kuchling | 2006-06-09 18:46:51 +0200 (Fri, 09 Jun 2006) | 1 line
Add note about wsgiref
........
r46785 | brett.cannon | 2006-06-09 19:05:48 +0200 (Fri, 09 Jun 2006) | 2 lines
Fix inconsistency in naming within an enum.
........
r46787 | tim.peters | 2006-06-09 19:47:00 +0200 (Fri, 09 Jun 2006) | 2 lines
Whitespace normalization.
........
r46792 | georg.brandl | 2006-06-09 20:29:52 +0200 (Fri, 09 Jun 2006) | 3 lines
Test file.__exit__.
........
r46794 | brett.cannon | 2006-06-09 20:40:46 +0200 (Fri, 09 Jun 2006) | 2 lines
svn:ignore .pyc and .pyo files.
........
r46795 | georg.brandl | 2006-06-09 20:45:48 +0200 (Fri, 09 Jun 2006) | 3 lines
RFE #1491485: str/unicode.endswith()/startswith() now accept a tuple as first argument.
........
r46798 | andrew.kuchling | 2006-06-09 21:03:16 +0200 (Fri, 09 Jun 2006) | 1 line
Describe startswith()/endswiith() change; add reminder about wsgiref
........
r46799 | tim.peters | 2006-06-09 21:24:44 +0200 (Fri, 09 Jun 2006) | 11 lines
Implementing a happy idea from Georg Brandl: make runtest() try to
clean up files and directories the tests often leave behind by
mistake. This is the first time in history I don't have a bogus
"db_home" directory after running the tests ;-)
Also worked on runtest's docstring, to say something about all the
arguments, and to document the non-obvious return values.
New functions runtest_inner() and cleanup_test_droppings() in
support of the above.
........
r46800 | andrew.kuchling | 2006-06-09 21:43:25 +0200 (Fri, 09 Jun 2006) | 1 line
Remove unused variable
........
r46801 | andrew.kuchling | 2006-06-09 21:56:05 +0200 (Fri, 09 Jun 2006) | 1 line
Add some wsgiref text
........
r46803 | thomas.heller | 2006-06-09 21:59:11 +0200 (Fri, 09 Jun 2006) | 1 line
set eol-style svn property
........
r46804 | thomas.heller | 2006-06-09 22:01:01 +0200 (Fri, 09 Jun 2006) | 1 line
set eol-style svn property
........
r46805 | georg.brandl | 2006-06-09 22:43:48 +0200 (Fri, 09 Jun 2006) | 3 lines
Make use of new str.startswith/endswith semantics.
Occurences in email and compiler were ignored due to backwards compat requirements.
........
r46806 | brett.cannon | 2006-06-10 00:31:23 +0200 (Sat, 10 Jun 2006) | 4 lines
An object with __call__ as an attribute, when called, will have that attribute checked for __call__ itself, and will continue to look until it finds an object without the attribute. This can lead to an infinite recursion.
Closes bug #532646, again. Will be backported.
........
r46808 | brett.cannon | 2006-06-10 00:45:54 +0200 (Sat, 10 Jun 2006) | 2 lines
Fix bug introduced in rev. 46806 by not having variable declaration at the top of a block.
........
r46812 | georg.brandl | 2006-06-10 08:40:50 +0200 (Sat, 10 Jun 2006) | 4 lines
Apply perky's fix for #1503157: "/".join([u"", u""]) raising OverflowError.
Also improve error message on overflow.
........
r46817 | martin.v.loewis | 2006-06-10 10:14:03 +0200 (Sat, 10 Jun 2006) | 2 lines
Port cygwin kill_python changes from 2.4 branch.
........
r46818 | armin.rigo | 2006-06-10 12:57:40 +0200 (Sat, 10 Jun 2006) | 4 lines
SF bug #1503294.
PyThreadState_GET() complains if the tstate is NULL, but only in debug mode.
........
r46819 | martin.v.loewis | 2006-06-10 14:23:46 +0200 (Sat, 10 Jun 2006) | 4 lines
Patch #1495999: Part two of Windows CE changes.
- update header checks, using autoconf
- provide dummies for getenv, environ, and GetVersion
- adjust MSC_VER check in socketmodule.c
........
r46820 | skip.montanaro | 2006-06-10 16:09:11 +0200 (Sat, 10 Jun 2006) | 1 line
document the class, not its initializer
........
r46821 | greg.ward | 2006-06-10 18:40:01 +0200 (Sat, 10 Jun 2006) | 4 lines
Sync with Optik docs (rev 518):
* restore "Extending optparse" section
* document ALWAYS_TYPED_ACTIONS (SF #1449311)
........
r46824 | thomas.heller | 2006-06-10 21:51:46 +0200 (Sat, 10 Jun 2006) | 8 lines
Upgrade to ctypes version 0.9.9.7.
Summary of changes:
- support for 'variable sized' data
- support for anonymous structure/union fields
- fix severe bug with certain arrays or structures containing more than 256 fields
........
r46825 | thomas.heller | 2006-06-10 21:55:36 +0200 (Sat, 10 Jun 2006) | 8 lines
Upgrade to ctypes version 0.9.9.7.
Summary of changes:
- support for 'variable sized' data
- support for anonymous structure/union fields
- fix severe bug with certain arrays or structures containing more than 256 fields
........
r46826 | fred.drake | 2006-06-10 22:01:34 +0200 (Sat, 10 Jun 2006) | 4 lines
SF patch #1303595: improve description of __builtins__, explaining how it
varies between __main__ and other modules, and strongly suggest not touching
it but using __builtin__ if absolutely necessary
........
r46827 | fred.drake | 2006-06-10 22:02:58 +0200 (Sat, 10 Jun 2006) | 1 line
credit for SF patch #1303595
........
r46831 | thomas.heller | 2006-06-10 22:29:34 +0200 (Sat, 10 Jun 2006) | 2 lines
New docs for ctypes.
........
r46834 | thomas.heller | 2006-06-10 23:07:19 +0200 (Sat, 10 Jun 2006) | 1 line
Fix a wrong printf format.
........
r46835 | thomas.heller | 2006-06-10 23:17:58 +0200 (Sat, 10 Jun 2006) | 1 line
Fix the second occurrence of the problematic printf format.
........
r46837 | thomas.heller | 2006-06-10 23:56:03 +0200 (Sat, 10 Jun 2006) | 1 line
Don't use C++ comment.
........
r46838 | thomas.heller | 2006-06-11 00:01:50 +0200 (Sun, 11 Jun 2006) | 1 line
Handle failure of PyMem_Realloc.
........
r46839 | skip.montanaro | 2006-06-11 00:38:13 +0200 (Sun, 11 Jun 2006) | 2 lines
Suppress warning on MacOSX about possible use before set of proc.
........
r46840 | tim.peters | 2006-06-11 00:51:45 +0200 (Sun, 11 Jun 2006) | 8 lines
shuffle() doscstring: Removed warning about sequence length
versus generator period. While this was a real weakness of the
older WH generator for lists with just a few dozen elements,
and so could potentially bite the naive ;-), the Twister should
show excellent behavior up to at least 600 elements.
Module docstring: reflowed some jarringly short lines.
........
r46844 | greg.ward | 2006-06-11 02:40:49 +0200 (Sun, 11 Jun 2006) | 4 lines
Bug #1361643: fix textwrap.dedent() so it handles tabs appropriately,
i.e. do *not* expand tabs, but treat them as whitespace that is not
equivalent to spaces. Add a couple of test cases. Clarify docs.
........
r46850 | neal.norwitz | 2006-06-11 07:44:18 +0200 (Sun, 11 Jun 2006) | 5 lines
Fix Coverity # 146. newDBSequenceObject would deref dbobj, so it can't be NULL.
We know it's not NULL from the ParseTuple and DbObject_Check will verify
it's not NULL.
........
r46851 | neal.norwitz | 2006-06-11 07:45:25 +0200 (Sun, 11 Jun 2006) | 4 lines
Wrap some long lines
Top/Bottom factor out some common expressions
Add a XXX comment about widing offset.
........
r46852 | neal.norwitz | 2006-06-11 07:45:47 +0200 (Sun, 11 Jun 2006) | 1 line
Add versionadded to doc
........
r46853 | neal.norwitz | 2006-06-11 07:47:14 +0200 (Sun, 11 Jun 2006) | 3 lines
Update doc to make it agree with code.
Bottom factor out some common code.
........
r46854 | neal.norwitz | 2006-06-11 07:48:14 +0200 (Sun, 11 Jun 2006) | 3 lines
f_code can't be NULL based on Frame_New and other code that derefs it.
So there doesn't seem to be much point to checking here.
........
r46855 | neal.norwitz | 2006-06-11 09:26:27 +0200 (Sun, 11 Jun 2006) | 1 line
Fix errors found by pychecker
........
r46856 | neal.norwitz | 2006-06-11 09:26:50 +0200 (Sun, 11 Jun 2006) | 1 line
warnings was imported at module scope, no need to import again
........
r46857 | neal.norwitz | 2006-06-11 09:27:56 +0200 (Sun, 11 Jun 2006) | 5 lines
Fix errors found by pychecker.
I think these changes are correct, but I'm not sure. Could someone
who knows how this module works test it? It can at least start on
the cmd line.
........
r46858 | neal.norwitz | 2006-06-11 10:35:14 +0200 (Sun, 11 Jun 2006) | 1 line
Fix errors found by pychecker
........
r46859 | ronald.oussoren | 2006-06-11 16:33:36 +0200 (Sun, 11 Jun 2006) | 4 lines
This patch improves the L&F of IDLE on OSX. The changes are conditionalized on
being in an IDLE.app bundle on darwin. This does a slight reorganisation of the
menus and adds support for file-open events.
........
r46860 | greg.ward | 2006-06-11 16:42:41 +0200 (Sun, 11 Jun 2006) | 1 line
SF #1366250: optparse docs: fix inconsistency in variable name; minor tweaks.
........
r46861 | greg.ward | 2006-06-11 18:24:11 +0200 (Sun, 11 Jun 2006) | 3 lines
Bug #1498146: fix optparse to handle Unicode strings in option help,
description, and epilog.
........
r46862 | thomas.heller | 2006-06-11 19:04:22 +0200 (Sun, 11 Jun 2006) | 2 lines
Release the GIL during COM method calls, to avoid deadlocks in
Python coded COM objects.
........
r46863 | tim.peters | 2006-06-11 21:42:51 +0200 (Sun, 11 Jun 2006) | 2 lines
Whitespace normalization.
........
r46864 | tim.peters | 2006-06-11 21:43:49 +0200 (Sun, 11 Jun 2006) | 2 lines
Add missing svn:eol-style property to text files.
........
r46865 | ronald.oussoren | 2006-06-11 21:45:57 +0200 (Sun, 11 Jun 2006) | 2 lines
Remove message about using make frameworkinstall, that's no longer necesssary
........
r46866 | ronald.oussoren | 2006-06-11 22:23:29 +0200 (Sun, 11 Jun 2006) | 2 lines
Use configure to substitute the correct prefix instead of hardcoding
........
r46867 | ronald.oussoren | 2006-06-11 22:24:45 +0200 (Sun, 11 Jun 2006) | 4 lines
- Change fixapplepython23.py to ensure that it will run with /usr/bin/python
on intel macs.
- Fix some minor problems in the installer for OSX
........
r46868 | neal.norwitz | 2006-06-11 22:25:56 +0200 (Sun, 11 Jun 2006) | 5 lines
Try to fix several networking tests. The problem is that if hosts have
a search path setup, some of these hosts resolve to the wrong address.
By appending a period to the hostname, the hostname should only resolve
to what we want it to resolve to. Hopefully this doesn't break different bots.
........
r46869 | neal.norwitz | 2006-06-11 22:42:02 +0200 (Sun, 11 Jun 2006) | 7 lines
Try to fix another networking test. The problem is that if hosts have
a search path setup, some of these hosts resolve to the wrong address.
By appending a period to the hostname, the hostname should only resolve
to what we want it to resolve to. Hopefully this doesn't break different bots.
Also add more info to failure message to aid debugging test failure.
........
r46870 | neal.norwitz | 2006-06-11 22:46:46 +0200 (Sun, 11 Jun 2006) | 4 lines
Fix test on PPC64 buildbot. It raised an IOError (really an URLError which
derives from an IOError). That seems valid. Env Error includes both OSError
and IOError, so this seems like a reasonable fix.
........
r46871 | tim.peters | 2006-06-11 22:52:59 +0200 (Sun, 11 Jun 2006) | 10 lines
compare_generic_iter(): Fixed the failure of test_wsgiref's testFileWrapper
when running with -O.
test_simple_validation_error still fails under -O. That appears to be because
wsgiref's validate.py uses `assert` statements all over the place to check
arguments for sanity. That should all be changed (it's not a logical error
in the software if a user passes bogus arguments, so this isn't a reasonable
use for `assert` -- checking external preconditions should generally raise
ValueError or TypeError instead, as appropriate).
........
r46872 | neal.norwitz | 2006-06-11 23:38:38 +0200 (Sun, 11 Jun 2006) | 1 line
Get test to pass on S/390. Shout if you think this change is incorrect.
........
r46873 | neal.norwitz | 2006-06-12 04:05:55 +0200 (Mon, 12 Jun 2006) | 1 line
Cleanup Py_ssize_t a little (get rid of second #ifdef)
........
r46874 | neal.norwitz | 2006-06-12 04:06:17 +0200 (Mon, 12 Jun 2006) | 1 line
Fix some Py_ssize_t issues
........
r46875 | neal.norwitz | 2006-06-12 04:06:42 +0200 (Mon, 12 Jun 2006) | 1 line
Fix some Py_ssize_t issues
........
r46876 | neal.norwitz | 2006-06-12 04:07:24 +0200 (Mon, 12 Jun 2006) | 2 lines
Cleanup: Remove import of types to get StringTypes, we can just use basestring.
........
r46877 | neal.norwitz | 2006-06-12 04:07:57 +0200 (Mon, 12 Jun 2006) | 1 line
Don't truncate if size_t is bigger than uint
........
r46878 | neal.norwitz | 2006-06-12 04:08:41 +0200 (Mon, 12 Jun 2006) | 1 line
Don't leak the list object if there's an error allocating the item storage. Backport candidate
........
r46879 | neal.norwitz | 2006-06-12 04:09:03 +0200 (Mon, 12 Jun 2006) | 1 line
Fix typo. Backport if anyone cares. :-)
........
r46880 | neal.norwitz | 2006-06-12 04:09:34 +0200 (Mon, 12 Jun 2006) | 1 line
Fix indentation of case and a Py_ssize_t issue.
........
r46881 | neal.norwitz | 2006-06-12 04:11:18 +0200 (Mon, 12 Jun 2006) | 3 lines
Get rid of f_restricted too. Doc the other 4 ints that were already removed
at the NeedForSpeed sprint.
........
r46882 | neal.norwitz | 2006-06-12 04:13:21 +0200 (Mon, 12 Jun 2006) | 1 line
Fix the socket tests so they can be run concurrently. Backport candidate
........
r46883 | neal.norwitz | 2006-06-12 04:16:10 +0200 (Mon, 12 Jun 2006) | 1 line
i and j are initialized below when used. No need to do it twice
........
r46884 | neal.norwitz | 2006-06-12 05:05:03 +0200 (Mon, 12 Jun 2006) | 1 line
Remove unused import
........
r46885 | neal.norwitz | 2006-06-12 05:05:40 +0200 (Mon, 12 Jun 2006) | 1 line
Impl ssize_t
........
r46886 | neal.norwitz | 2006-06-12 05:33:09 +0200 (Mon, 12 Jun 2006) | 6 lines
Patch #1503046, Conditional compilation of zlib.(de)compressobj.copy
copy is only in newer versions of zlib. This should allow zlibmodule
to work with older versions like the Tru64 buildbot.
........
r46887 | phillip.eby | 2006-06-12 06:04:32 +0200 (Mon, 12 Jun 2006) | 2 lines
Sync w/external release 0.1.2. Please see PEP 360 before making changes to external packages.
........
r46888 | martin.v.loewis | 2006-06-12 06:26:31 +0200 (Mon, 12 Jun 2006) | 2 lines
Get rid of function pointer cast.
........
r46889 | thomas.heller | 2006-06-12 08:05:57 +0200 (Mon, 12 Jun 2006) | 3 lines
I don't know how that happend, but the entire file contents was
duplicated. Thanks to Simon Percivall for the heads up.
........
r46890 | nick.coghlan | 2006-06-12 10:19:37 +0200 (Mon, 12 Jun 2006) | 1 line
Fix site module docstring to match the code
........
r46891 | nick.coghlan | 2006-06-12 10:23:02 +0200 (Mon, 12 Jun 2006) | 1 line
Fix site module docstring to match the code for Mac OSX, too
........
r46892 | nick.coghlan | 2006-06-12 10:27:13 +0200 (Mon, 12 Jun 2006) | 1 line
The site module documentation also described the Windows behaviour incorrectly.
........
r46893 | nick.coghlan | 2006-06-12 12:17:11 +0200 (Mon, 12 Jun 2006) | 1 line
Make the -m switch conform to the documentation of sys.path by behaving like the -c switch
........
r46894 | kristjan.jonsson | 2006-06-12 17:45:12 +0200 (Mon, 12 Jun 2006) | 2 lines
Fix the CRT argument error handling for VisualStudio .NET 2005. Install a CRT error handler and disable the assertion for debug builds. This causes CRT to set errno to EINVAL.
This update fixes crash cases in the test suite where the default CRT error handler would cause process exit.
........
r46899 | thomas.heller | 2006-06-12 22:56:48 +0200 (Mon, 12 Jun 2006) | 1 line
Add pep-291 compatibility markers.
........
r46901 | ka-ping.yee | 2006-06-13 01:47:52 +0200 (Tue, 13 Jun 2006) | 5 lines
Add the uuid module.
This module has been tested so far on Windows XP (Python 2.4 and 2.5a2),
Mac OS X (Python 2.3, 2.4, and 2.5a2), and Linux (Python 2.4 and 2.5a2).
........
r46902 | tim.peters | 2006-06-13 02:30:01 +0200 (Tue, 13 Jun 2006) | 2 lines
Whitespace normalization.
........
r46903 | tim.peters | 2006-06-13 02:30:50 +0200 (Tue, 13 Jun 2006) | 2 lines
Added missing svn:eol-style property to text files.
........
r46905 | tim.peters | 2006-06-13 05:30:07 +0200 (Tue, 13 Jun 2006) | 5 lines
get_matching_blocks(): rewrote code & comments so they match; added
more comments about why it's this way at all; and removed what looked
like needless expense (sorting (i, j, k) triples directly should give
exactly the same order as sorting (i, (i, j, k)) pairs).
........
r46906 | neal.norwitz | 2006-06-13 06:08:53 +0200 (Tue, 13 Jun 2006) | 1 line
Don't fail if another process is listening on our port.
........
r46908 | neal.norwitz | 2006-06-13 10:28:19 +0200 (Tue, 13 Jun 2006) | 2 lines
Initialize the type object so pychecker can't crash the interpreter.
........
r46909 | neal.norwitz | 2006-06-13 10:41:06 +0200 (Tue, 13 Jun 2006) | 1 line
Verify the crash due to EncodingMap not initialized does not return
........
r46910 | thomas.heller | 2006-06-13 10:56:14 +0200 (Tue, 13 Jun 2006) | 3 lines
Add some windows datatypes that were missing from this file, and add
the aliases defined in windows header files for the structures.
........
r46911 | thomas.heller | 2006-06-13 11:40:14 +0200 (Tue, 13 Jun 2006) | 3 lines
Add back WCHAR, UINT, DOUBLE, _LARGE_INTEGER, _ULARGE_INTEGER.
VARIANT_BOOL is a special _ctypes data type, not c_short.
........
r46912 | ronald.oussoren | 2006-06-13 13:19:56 +0200 (Tue, 13 Jun 2006) | 4 lines
Linecache contains support for PEP302 loaders, but fails to deal with loaders
that return None to indicate that the module is valid but no source is
available. This patch fixes that.
........
r46913 | andrew.kuchling | 2006-06-13 13:57:04 +0200 (Tue, 13 Jun 2006) | 1 line
Mention uuid module
........
r46915 | walter.doerwald | 2006-06-13 14:02:12 +0200 (Tue, 13 Jun 2006) | 2 lines
Fix passing errors to the encoder and decoder functions.
........
r46917 | walter.doerwald | 2006-06-13 14:04:43 +0200 (Tue, 13 Jun 2006) | 3 lines
errors is an attribute in the incremental decoder
not an argument.
........
r46919 | andrew.macintyre | 2006-06-13 17:04:24 +0200 (Tue, 13 Jun 2006) | 11 lines
Patch #1454481: Make thread stack size runtime tunable.
Heavily revised, comprising revisions:
46640 - original trunk revision (backed out in r46655)
46647 - markup fix (backed out in r46655)
46692:46918 merged from branch aimacintyre-sf1454481
branch tested on buildbots (Windows buildbots had problems
not related to these changes).
........
r46920 | brett.cannon | 2006-06-13 18:06:55 +0200 (Tue, 13 Jun 2006) | 2 lines
Remove unused variable.
........
r46921 | andrew.kuchling | 2006-06-13 18:41:41 +0200 (Tue, 13 Jun 2006) | 1 line
Add ability to set stack size
........
r46923 | marc-andre.lemburg | 2006-06-13 19:04:26 +0200 (Tue, 13 Jun 2006) | 2 lines
Update pybench to version 2.0.
........
r46924 | marc-andre.lemburg | 2006-06-13 19:07:14 +0200 (Tue, 13 Jun 2006) | 2 lines
Revert wrong svn copy.
........
r46925 | andrew.macintyre | 2006-06-13 19:14:36 +0200 (Tue, 13 Jun 2006) | 2 lines
fix exception usage
........
r46927 | tim.peters | 2006-06-13 20:37:07 +0200 (Tue, 13 Jun 2006) | 2 lines
Whitespace normalization.
........
r46928 | marc-andre.lemburg | 2006-06-13 20:56:56 +0200 (Tue, 13 Jun 2006) | 9 lines
Updated to pybench 2.0.
See svn.python.org/external/pybench-2.0 for the original import of that
version.
Note that platform.py was not copied over from pybench-2.0 since
it is already part of Python 2.5.
........
r46929 | andrew.macintyre | 2006-06-13 21:02:35 +0200 (Tue, 13 Jun 2006) | 5 lines
Increase the small thread stack size to get the test
to pass reliably on the one buildbot that insists on
more than 32kB of thread stack.
........
r46930 | marc-andre.lemburg | 2006-06-13 21:20:07 +0200 (Tue, 13 Jun 2006) | 2 lines
Whitespace normalization.
........
r46931 | thomas.heller | 2006-06-13 22:18:43 +0200 (Tue, 13 Jun 2006) | 2 lines
More docs for ctypes.
........
r46932 | brett.cannon | 2006-06-13 23:34:24 +0200 (Tue, 13 Jun 2006) | 2 lines
Ignore .pyc and .pyo files in Pybench.
........
r46933 | brett.cannon | 2006-06-13 23:46:41 +0200 (Tue, 13 Jun 2006) | 7 lines
If a classic class defined a __coerce__() method that just returned its two
arguments in reverse, the interpreter would infinitely recourse trying to get a
coercion that worked. So put in a recursion check after a coercion is made and
the next call to attempt to use the coerced values.
Fixes bug #992017 and closes crashers/coerce.py .
........
r46936 | gerhard.haering | 2006-06-14 00:24:47 +0200 (Wed, 14 Jun 2006) | 3 lines
Merged changes from external pysqlite 2.3.0 release. Documentation updates will
follow in a few hours at the latest. Then we should be ready for beta1.
........
r46937 | brett.cannon | 2006-06-14 00:26:13 +0200 (Wed, 14 Jun 2006) | 2 lines
Missed test for rev. 46933; infinite recursion from __coerce__() returning its arguments reversed.
........
r46938 | gerhard.haering | 2006-06-14 00:53:48 +0200 (Wed, 14 Jun 2006) | 2 lines
Updated documentation for pysqlite 2.3.0 API.
........
r46939 | tim.peters | 2006-06-14 06:09:25 +0200 (Wed, 14 Jun 2006) | 10 lines
SequenceMatcher.get_matching_blocks(): This now guarantees that
adjacent triples in the result list describe non-adjacent matching
blocks. That's _nice_ to have, and Guido said he wanted it.
Not a bugfix candidate: Guido or not ;-), this changes visible
endcase semantics (note that some tests had to change), and
nothing about this was documented before. Since it was working
as designed, and behavior was consistent with the docs, it wasn't
"a bug".
........
r46940 | tim.peters | 2006-06-14 06:13:00 +0200 (Wed, 14 Jun 2006) | 2 lines
Repaired typo in new comment.
........
r46941 | tim.peters | 2006-06-14 06:15:27 +0200 (Wed, 14 Jun 2006) | 2 lines
Whitespace normalization.
........
r46942 | fred.drake | 2006-06-14 06:25:02 +0200 (Wed, 14 Jun 2006) | 3 lines
- make some disabled tests run what they intend when enabled
- remove some over-zealous triple-quoting
........
r46943 | fred.drake | 2006-06-14 07:04:47 +0200 (Wed, 14 Jun 2006) | 3 lines
add tests for two cases that are handled correctly in the current code,
but that SF patch 1504676 as written mis-handles
........
r46944 | fred.drake | 2006-06-14 07:15:51 +0200 (Wed, 14 Jun 2006) | 1 line
explain an XXX in more detail
........
r46945 | martin.v.loewis | 2006-06-14 07:21:04 +0200 (Wed, 14 Jun 2006) | 1 line
Patch #1455898: Incremental mode for "mbcs" codec.
........
r46946 | georg.brandl | 2006-06-14 08:08:31 +0200 (Wed, 14 Jun 2006) | 3 lines
Bug #1339007: Shelf objects now don't raise an exception in their
__del__ method when initialization failed.
........
r46948 | thomas.heller | 2006-06-14 08:18:15 +0200 (Wed, 14 Jun 2006) | 1 line
Fix docstring.
........
r46949 | georg.brandl | 2006-06-14 08:29:07 +0200 (Wed, 14 Jun 2006) | 2 lines
Bug #1501122: mention __gt__ &co in description of comparison order.
........
r46951 | thomas.heller | 2006-06-14 09:08:38 +0200 (Wed, 14 Jun 2006) | 1 line
Write more docs.
........
r46952 | georg.brandl | 2006-06-14 10:31:39 +0200 (Wed, 14 Jun 2006) | 3 lines
Bug #1153163: describe __add__ vs __radd__ behavior when adding
objects of same type/of subclasses of the other.
........
r46954 | georg.brandl | 2006-06-14 10:42:11 +0200 (Wed, 14 Jun 2006) | 3 lines
Bug #1202018: add some common mime.types locations.
........
r46955 | georg.brandl | 2006-06-14 10:50:03 +0200 (Wed, 14 Jun 2006) | 3 lines
Bug #1117556: SimpleHTTPServer now tries to find and use the system's
mime.types file for determining MIME types.
........
r46957 | thomas.heller | 2006-06-14 11:09:08 +0200 (Wed, 14 Jun 2006) | 1 line
Document paramflags.
........
r46958 | thomas.heller | 2006-06-14 11:20:11 +0200 (Wed, 14 Jun 2006) | 1 line
Add an __all__ list, since this module does 'from ctypes import *'.
........
r46959 | andrew.kuchling | 2006-06-14 15:59:15 +0200 (Wed, 14 Jun 2006) | 1 line
Add item
........
r46961 | georg.brandl | 2006-06-14 18:46:43 +0200 (Wed, 14 Jun 2006) | 3 lines
Bug #805015: doc error in PyUnicode_FromEncodedObject.
........
r46962 | gerhard.haering | 2006-06-15 00:28:37 +0200 (Thu, 15 Jun 2006) | 10 lines
- Added version checks in C code to make sure we don't trigger bugs in older
SQLite versions.
- Added version checks in test suite so that we don't execute tests that we
know will fail with older (buggy) SQLite versions.
Now, all tests should run against all SQLite versions from 3.0.8 until 3.3.6
(latest one now). The sqlite3 module can be built against all these SQLite
versions and the sqlite3 module does its best to not trigger bugs in SQLite,
but using SQLite 3.3.3 or later is recommended.
........
r46963 | tim.peters | 2006-06-15 00:38:13 +0200 (Thu, 15 Jun 2006) | 2 lines
Whitespace normalization.
........
r46964 | neal.norwitz | 2006-06-15 06:54:29 +0200 (Thu, 15 Jun 2006) | 9 lines
Speculative checkin (requires approval of Gerhard Haering)
This backs out the test changes in 46962 which prevented crashes
by not running the tests via a version check. All the version checks
added in that rev were removed from the tests.
Code was added to the error handler in connection.c that seems
to work with older versions of sqlite including 3.1.3.
........
r46965 | neal.norwitz | 2006-06-15 07:55:49 +0200 (Thu, 15 Jun 2006) | 1 line
Try to narrow window of failure on slow/busy boxes (ppc64 buildbot)
........
r46966 | martin.v.loewis | 2006-06-15 08:45:05 +0200 (Thu, 15 Jun 2006) | 2 lines
Make import/lookup of mbcs fail on non-Windows systems.
........
r46967 | ronald.oussoren | 2006-06-15 10:14:18 +0200 (Thu, 15 Jun 2006) | 2 lines
Patch #1446489 (zipfile: support for ZIP64)
........
r46968 | neal.norwitz | 2006-06-15 10:16:44 +0200 (Thu, 15 Jun 2006) | 6 lines
Re-revert this change. Install the version check and don't run the test
until Gerhard has time to fully debug the issue. This affects versions
before 3.2.1 (possibly only versions earlier than 3.1.3).
Based on discussion on python-checkins.
........
r46969 | gregory.p.smith | 2006-06-15 10:52:32 +0200 (Thu, 15 Jun 2006) | 6 lines
- bsddb: multithreaded DB access using the simple bsddb module interface
now works reliably. It has been updated to use automatic BerkeleyDB
deadlock detection and the bsddb.dbutils.DeadlockWrap wrapper to retry
database calls that would previously deadlock. [SF python bug #775414]
........
r46970 | gregory.p.smith | 2006-06-15 11:23:52 +0200 (Thu, 15 Jun 2006) | 2 lines
minor documentation cleanup. mention the bsddb.db interface explicitly by name.
........
r46971 | neal.norwitz | 2006-06-15 11:57:03 +0200 (Thu, 15 Jun 2006) | 5 lines
Steal the trick from test_compiler to print out a slow msg.
This will hopefully get the buildbots to pass. Not sure this
test will be feasible or even work. But everything is red now,
so it can't get much worse.
........
r46972 | neal.norwitz | 2006-06-15 12:24:49 +0200 (Thu, 15 Jun 2006) | 1 line
Print some more info to get an idea of how much longer the test will last
........
r46981 | tim.peters | 2006-06-15 20:04:40 +0200 (Thu, 15 Jun 2006) | 6 lines
Try to reduce the extreme peak memory and disk-space use
of this test. It probably still requires more disk space
than most buildbots have, and in any case is still so
intrusive that if we don't find another way to test this I'm
taking my buildbot offline permanently ;-)
........
r46982 | tim.peters | 2006-06-15 20:06:29 +0200 (Thu, 15 Jun 2006) | 2 lines
Whitespace normalization.
........
r46983 | tim.peters | 2006-06-15 20:07:28 +0200 (Thu, 15 Jun 2006) | 2 lines
Add missing svn:eol-style property to text files.
........
r46984 | tim.peters | 2006-06-15 20:38:19 +0200 (Thu, 15 Jun 2006) | 2 lines
Oops -- I introduced an off-by-6436159488 error.
........
r46990 | neal.norwitz | 2006-06-16 06:30:34 +0200 (Fri, 16 Jun 2006) | 1 line
Disable this test until we can determine what to do about it
........
r46991 | neal.norwitz | 2006-06-16 06:31:06 +0200 (Fri, 16 Jun 2006) | 1 line
Param name is dir, not directory. Update docstring. Backport candidate
........
r46992 | neal.norwitz | 2006-06-16 06:31:28 +0200 (Fri, 16 Jun 2006) | 1 line
Add missing period in comment.
........
r46993 | neal.norwitz | 2006-06-16 06:32:43 +0200 (Fri, 16 Jun 2006) | 1 line
Fix whitespace, there are memory leaks in this module.
........
r46995 | fred.drake | 2006-06-17 01:45:06 +0200 (Sat, 17 Jun 2006) | 3 lines
SF patch 1504676: Make sgmllib char and entity references pluggable
(implementation/tests contributed by Sam Ruby)
........
r46996 | fred.drake | 2006-06-17 03:07:54 +0200 (Sat, 17 Jun 2006) | 1 line
fix change that broke the htmllib tests
........
r46998 | martin.v.loewis | 2006-06-17 11:15:14 +0200 (Sat, 17 Jun 2006) | 3 lines
Patch #763580: Add name and value arguments to
Tkinter variable classes.
........
r46999 | martin.v.loewis | 2006-06-17 11:20:41 +0200 (Sat, 17 Jun 2006) | 2 lines
Patch #1096231: Add default argument to wm_iconbitmap.
........
r47000 | martin.v.loewis | 2006-06-17 11:25:15 +0200 (Sat, 17 Jun 2006) | 2 lines
Patch #1494750: Destroy master after deleting children.
........
r47003 | george.yoshida | 2006-06-17 18:31:52 +0200 (Sat, 17 Jun 2006) | 2 lines
markup fix
........
r47005 | george.yoshida | 2006-06-17 18:39:13 +0200 (Sat, 17 Jun 2006) | 4 lines
Update url.
Old url returned status code:301 Moved permanently.
........
r47007 | martin.v.loewis | 2006-06-17 20:44:27 +0200 (Sat, 17 Jun 2006) | 2 lines
Patch #812986: Update the canvas even if not tracing.
........
r47008 | martin.v.loewis | 2006-06-17 21:03:26 +0200 (Sat, 17 Jun 2006) | 2 lines
Patch #815924: Restore ability to pass type= and icon=
........
r47009 | neal.norwitz | 2006-06-18 00:37:45 +0200 (Sun, 18 Jun 2006) | 1 line
Fix typo in docstring
........
r47010 | neal.norwitz | 2006-06-18 00:38:15 +0200 (Sun, 18 Jun 2006) | 1 line
Fix memory leak reported by valgrind while running test_subprocess
........
r47011 | fred.drake | 2006-06-18 04:57:35 +0200 (Sun, 18 Jun 2006) | 1 line
remove unnecessary markup
........
r47013 | neal.norwitz | 2006-06-18 21:35:01 +0200 (Sun, 18 Jun 2006) | 7 lines
Prevent spurious leaks when running regrtest.py -R. There may be more
issues that crop up from time to time, but this change seems to have been
pretty stable (no spurious warnings) for about a week.
Other modules which use threads may require similar use of
threading_setup/threading_cleanup from test_support.
........
r47014 | neal.norwitz | 2006-06-18 21:37:40 +0200 (Sun, 18 Jun 2006) | 9 lines
The hppa ubuntu box sometimes hangs forever in these tests. My guess
is that the wait is failing for some reason. Use WNOHANG, so we won't
wait until the buildbot kills the test suite.
I haven't been able to reproduce the failure, so I'm not sure if
this will help or not. Hopefully, this change will cause the test
to fail, rather than hang. That will be better since we will get
the rest of the test results. It may also help us debug the real problem.
........
r47015 | neal.norwitz | 2006-06-18 22:10:24 +0200 (Sun, 18 Jun 2006) | 1 line
Revert 47014 until it is more robust
........
r47016 | thomas.heller | 2006-06-18 23:27:04 +0200 (Sun, 18 Jun 2006) | 6 lines
Fix typos.
Fix doctest example.
Mention in the tutorial that 'errcheck' is explained in the ref manual.
Use better wording in some places.
Remoce code examples that shouldn't be in the tutorial.
Remove some XXX notices.
........
r47017 | georg.brandl | 2006-06-19 00:17:29 +0200 (Mon, 19 Jun 2006) | 3 lines
Patch #1507676: improve exception messages in abstract.c, object.c and typeobject.c.
........
r47018 | neal.norwitz | 2006-06-19 07:40:44 +0200 (Mon, 19 Jun 2006) | 1 line
Use Py_ssize_t
........
r47019 | georg.brandl | 2006-06-19 08:35:54 +0200 (Mon, 19 Jun 2006) | 3 lines
Add news entry about error msg improvement.
........
r47020 | thomas.heller | 2006-06-19 09:07:49 +0200 (Mon, 19 Jun 2006) | 2 lines
Try to repair the failing test on the OpenBSD buildbot. Trial and error...
........
r47021 | tim.peters | 2006-06-19 09:45:16 +0200 (Mon, 19 Jun 2006) | 2 lines
Whitespace normalization.
........
r47022 | walter.doerwald | 2006-06-19 10:07:50 +0200 (Mon, 19 Jun 2006) | 4 lines
Patch #1506645: add Python wrappers for the curses functions
is_term_resized, resize_term and resizeterm. This uses three
separate configure checks (one for each function).
........
r47023 | walter.doerwald | 2006-06-19 10:14:09 +0200 (Mon, 19 Jun 2006) | 2 lines
Make check order match in configure and configure.in.
........
r47024 | tim.peters | 2006-06-19 10:14:28 +0200 (Mon, 19 Jun 2006) | 3 lines
Repair KeyError when running test_threaded_import under -R,
as reported by Neal on python-dev.
........
r47025 | thomas.heller | 2006-06-19 10:32:46 +0200 (Mon, 19 Jun 2006) | 3 lines
Next try to fix the OpenBSD buildbot tests:
Use ctypes.util.find_library to locate the C runtime library
on platforms where is returns useful results.
........
r47026 | tim.peters | 2006-06-19 11:09:44 +0200 (Mon, 19 Jun 2006) | 13 lines
TestHelp.make_parser(): This was making a permanent change to
os.environ (setting envar COLUMNS), which at least caused
test_float_default() to fail if the tests were run more than once.
This repairs the test_optparse -R failures Neal reported on
python-dev. It also explains some seemingly bizarre test_optparse
failures we saw a couple weeks ago on the buildbots, when
test_optparse failed due to test_file failing to clean up after
itself, and then test_optparse failed in an entirely different
way when regrtest's -w option ran test_optparse a second time.
It's now obvious that make_parser() permanently changing os.environ
was responsible for the second half of that.
........
r47027 | anthony.baxter | 2006-06-19 14:04:15 +0200 (Mon, 19 Jun 2006) | 2 lines
Preparing for 2.5b1.
........
r47029 | fred.drake | 2006-06-19 19:31:16 +0200 (Mon, 19 Jun 2006) | 1 line
remove non-working document formats from edist
........
r47030 | gerhard.haering | 2006-06-19 23:17:35 +0200 (Mon, 19 Jun 2006) | 5 lines
Fixed a memory leak that was introduced with incorrect usage of the Python weak
reference API in pysqlite 2.2.1.
Bumbed pysqlite version number to upcoming pysqlite 2.3.1 release.
........
r47032 | ka-ping.yee | 2006-06-20 00:49:36 +0200 (Tue, 20 Jun 2006) | 2 lines
Remove Python 2.3 compatibility comment.
........
r47033 | trent.mick | 2006-06-20 01:21:25 +0200 (Tue, 20 Jun 2006) | 2 lines
Upgrade pyexpat to expat 2.0.0 (http://python.org/sf/1462338).
........
r47034 | trent.mick | 2006-06-20 01:57:41 +0200 (Tue, 20 Jun 2006) | 3 lines
[ 1295808 ] expat symbols should be namespaced in pyexpat
(http://python.org/sf/1295808)
........
r47039 | andrew.kuchling | 2006-06-20 13:52:16 +0200 (Tue, 20 Jun 2006) | 1 line
Uncomment wsgiref section
........
r47040 | andrew.kuchling | 2006-06-20 14:15:09 +0200 (Tue, 20 Jun 2006) | 1 line
Add four library items
........
r47041 | andrew.kuchling | 2006-06-20 14:19:54 +0200 (Tue, 20 Jun 2006) | 1 line
Terminology and typography fixes
........
r47042 | andrew.kuchling | 2006-06-20 15:05:12 +0200 (Tue, 20 Jun 2006) | 1 line
Add introductory paragraphs summarizing the release; minor edits
........
r47043 | andrew.kuchling | 2006-06-20 15:11:29 +0200 (Tue, 20 Jun 2006) | 1 line
Minor edits and rearrangements; markup fix
........
r47044 | andrew.kuchling | 2006-06-20 15:20:30 +0200 (Tue, 20 Jun 2006) | 1 line
[Bug #1504456] Mention xml -> xmlcore change
........
r47047 | brett.cannon | 2006-06-20 19:30:26 +0200 (Tue, 20 Jun 2006) | 2 lines
Raise TestSkipped when the test socket connection is refused.
........
r47049 | brett.cannon | 2006-06-20 21:20:17 +0200 (Tue, 20 Jun 2006) | 2 lines
Fix typo of exception name.
........
r47053 | brett.cannon | 2006-06-21 18:57:57 +0200 (Wed, 21 Jun 2006) | 5 lines
At the C level, tuple arguments are passed in directly to the exception
constructor, meaning it is treated as *args, not as a single argument. This
means using the 'message' attribute won't work (until Py3K comes around),
and so one must grab from 'arg' to get the error number.
........
r47054 | andrew.kuchling | 2006-06-21 19:10:18 +0200 (Wed, 21 Jun 2006) | 1 line
Link to LibRef module documentation
........
r47055 | andrew.kuchling | 2006-06-21 19:17:10 +0200 (Wed, 21 Jun 2006) | 1 line
Note some of Barry's work
........
r47056 | andrew.kuchling | 2006-06-21 19:17:28 +0200 (Wed, 21 Jun 2006) | 1 line
Bump version
........
r47057 | georg.brandl | 2006-06-21 19:45:17 +0200 (Wed, 21 Jun 2006) | 3 lines
fix [ 1509132 ] compiler module builds incorrect AST for TryExceptFinally
........
r47058 | georg.brandl | 2006-06-21 19:52:36 +0200 (Wed, 21 Jun 2006) | 3 lines
Make test_fcntl aware of netbsd3.
........
r47059 | georg.brandl | 2006-06-21 19:53:17 +0200 (Wed, 21 Jun 2006) | 3 lines
Patch #1509001: expected skips for netbsd3.
........
r47060 | gerhard.haering | 2006-06-21 22:55:04 +0200 (Wed, 21 Jun 2006) | 2 lines
Removed call to enable_callback_tracebacks that slipped in by accident.
........
r47061 | armin.rigo | 2006-06-21 23:58:50 +0200 (Wed, 21 Jun 2006) | 13 lines
Fix for an obscure bug introduced by revs 46806 and 46808, with a test.
The problem of checking too eagerly for recursive calls is the
following: if a RuntimeError is caused by recursion, and if code needs
to normalize it immediately (as in the 2nd test), then
PyErr_NormalizeException() needs a call to the RuntimeError class to
instantiate it, and this hits the recursion limit again... causing
PyErr_NormalizeException() to never finish.
Moved this particular recursion check to slot_tp_call(), which is not
involved in instantiating built-in exceptions.
Backport candidate.
........
r47064 | neal.norwitz | 2006-06-22 08:30:50 +0200 (Thu, 22 Jun 2006) | 3 lines
Copy the wsgiref package during make install.
........
r47065 | neal.norwitz | 2006-06-22 08:35:30 +0200 (Thu, 22 Jun 2006) | 1 line
Reset the doc date to today for the automatic doc builds
........
r47067 | andrew.kuchling | 2006-06-22 15:10:23 +0200 (Thu, 22 Jun 2006) | 1 line
Mention how to suppress warnings
........
r47069 | georg.brandl | 2006-06-22 16:46:17 +0200 (Thu, 22 Jun 2006) | 3 lines
Set lineno correctly on list, tuple and dict literals.
........
r47070 | georg.brandl | 2006-06-22 16:46:46 +0200 (Thu, 22 Jun 2006) | 4 lines
Test for correct compilation of try-except-finally stmt.
Test for correct lineno on list, tuple, dict literals.
........
r47071 | fred.drake | 2006-06-22 17:50:08 +0200 (Thu, 22 Jun 2006) | 1 line
fix markup nit
........
r47072 | brett.cannon | 2006-06-22 18:49:14 +0200 (Thu, 22 Jun 2006) | 6 lines
'warning's was improperly requiring that a command-line Warning category be
both a subclass of Warning and a subclass of types.ClassType. The latter is no
longer true thanks to new-style exceptions.
Closes bug #1510580. Thanks to AMK for the test.
........
r47073 | ronald.oussoren | 2006-06-22 20:33:54 +0200 (Thu, 22 Jun 2006) | 3 lines
MacOSX: Add a message to the first screen of the installer that tells
users how to avoid updates to their shell profile.
........
r47074 | georg.brandl | 2006-06-22 21:02:18 +0200 (Thu, 22 Jun 2006) | 3 lines
Fix my name ;)
........
r47075 | thomas.heller | 2006-06-22 21:07:36 +0200 (Thu, 22 Jun 2006) | 2 lines
Small fixes, mostly in the markup.
........
r47076 | peter.astrand | 2006-06-22 22:06:46 +0200 (Thu, 22 Jun 2006) | 1 line
Make it possible to run test_subprocess.py on Python 2.2, which lacks test_support.is_resource_enabled.
........
r47077 | peter.astrand | 2006-06-22 22:21:26 +0200 (Thu, 22 Jun 2006) | 1 line
Applied patch #1506758: Prevent MemoryErrors with large MAXFD.
........
r47079 | neal.norwitz | 2006-06-23 05:32:44 +0200 (Fri, 23 Jun 2006) | 1 line
Fix refleak
........
r47080 | fred.drake | 2006-06-23 08:03:45 +0200 (Fri, 23 Jun 2006) | 9 lines
- SF bug #853506: IP6 address parsing in sgmllib
('[' and ']' were not accepted in unquoted attribute values)
- cleaned up tests of character and entity reference decoding so the
tests cover the documented relationships among handle_charref,
handle_entityref, convert_charref, convert_codepoint, and
convert_entityref, without bringing up Unicode issues that sgmllib
cannot be involved in
........
r47085 | andrew.kuchling | 2006-06-23 21:23:40 +0200 (Fri, 23 Jun 2006) | 11 lines
Fit Makefile for the Python doc environment better; this is a step toward
including the howtos in the build process.
* Put LaTeX output in ../paper-<whatever>/.
* Put HTML output in ../html/
* Explain some of the Makefile variables
* Remove some cruft dating to my environment (e.g. the 'web' target)
This makefile isn't currently invoked by the documentation build process,
so these changes won't destabilize anything.
........
r47086 | hyeshik.chang | 2006-06-23 23:16:18 +0200 (Fri, 23 Jun 2006) | 5 lines
Bug #1511381: codec_getstreamcodec() in codec.c is corrected to
omit a default "error" argument for NULL pointer. This allows
the parser to take a codec from cjkcodecs again.
(Reported by Taewook Kang and reviewed by Walter Doerwald)
........
r47091 | ronald.oussoren | 2006-06-25 22:44:16 +0200 (Sun, 25 Jun 2006) | 6 lines
Workaround for bug #1512124
Without this patch IDLE will get unresponsive when you open the debugger
window on OSX. This is both using the system Tcl/Tk on Tiger as the latest
universal download from tk-components.sf.net.
........
r47092 | ronald.oussoren | 2006-06-25 23:14:19 +0200 (Sun, 25 Jun 2006) | 3 lines
Drop the calldll demo's for macos, calldll isn't present anymore, no need
to keep the demo's around.
........
r47093 | ronald.oussoren | 2006-06-25 23:15:58 +0200 (Sun, 25 Jun 2006) | 3 lines
Use a path without a double slash to compile the .py files after installation
(macosx, binary installer). This fixes bug #1508369 for python 2.5.
........
r47094 | ronald.oussoren | 2006-06-25 23:19:06 +0200 (Sun, 25 Jun 2006) | 3 lines
Also install the .egg-info files in Lib. This will cause wsgiref.egg-info to
be installed.
........
r47097 | andrew.kuchling | 2006-06-26 14:40:02 +0200 (Mon, 26 Jun 2006) | 1 line
[Bug #1511998] Various comments from Nick Coghlan; thanks!
........
r47098 | andrew.kuchling | 2006-06-26 14:43:43 +0200 (Mon, 26 Jun 2006) | 1 line
Describe workaround for PyRange_New()'s removal
........
r47099 | andrew.kuchling | 2006-06-26 15:08:24 +0200 (Mon, 26 Jun 2006) | 5 lines
[Bug #1512163] Fix typo.
This change will probably break tests on FreeBSD buildbots, but I'll check in
a fix for that next.
........
r47100 | andrew.kuchling | 2006-06-26 15:12:16 +0200 (Mon, 26 Jun 2006) | 9 lines
[Bug #1512163] Use one set of locking methods, lockf();
remove the flock() calls.
On FreeBSD, the two methods lockf() and flock() end up using the same
mechanism and the second one fails. A Linux man page claims that the
two methods are orthogonal (so locks acquired one way don't interact
with locks acquired the other way) but that clearly must be false.
........
r47101 | andrew.kuchling | 2006-06-26 15:23:10 +0200 (Mon, 26 Jun 2006) | 5 lines
Add a test for a conflicting lock.
On slow machines, maybe the time intervals (2 sec, 0.5 sec) will be too tight.
I'll see how the buildbots like it.
........
r47103 | andrew.kuchling | 2006-06-26 16:33:24 +0200 (Mon, 26 Jun 2006) | 1 line
Windows doesn't have os.fork(). I'll just disable this test for now
........
r47106 | andrew.kuchling | 2006-06-26 19:00:35 +0200 (Mon, 26 Jun 2006) | 9 lines
Attempt to fix build failure on OS X and Debian alpha; the symptom is
consistent with os.wait() returning immediately because some other
subprocess had previously exited; the test suite then immediately
tries to lock the mailbox and gets an error saying it's already
locked.
To fix this, do a waitpid() so the test suite only continues once
the intended child process has exited.
........
r47113 | neal.norwitz | 2006-06-27 06:06:46 +0200 (Tue, 27 Jun 2006) | 1 line
Ignore some more warnings in the dynamic linker on an older gentoo
........
r47114 | neal.norwitz | 2006-06-27 06:09:13 +0200 (Tue, 27 Jun 2006) | 6 lines
Instead of doing a make test, run the regression tests out of the installed
copy. This will hopefully catch problems where directories are added
under Lib/ but not to Makefile.pre.in. This breaks out the 2 runs
of the test suite with and without -O which is also nicer.
........
r47115 | neal.norwitz | 2006-06-27 06:12:58 +0200 (Tue, 27 Jun 2006) | 5 lines
Fix SF bug #1513032, 'make install' failure on FreeBSD 5.3.
No need to install lib-old, it's empty in 2.5.
........
r47116 | neal.norwitz | 2006-06-27 06:23:06 +0200 (Tue, 27 Jun 2006) | 1 line
Test unimportant change to verify buildbot does not try to build
........
r47117 | neal.norwitz | 2006-06-27 06:26:30 +0200 (Tue, 27 Jun 2006) | 1 line
Try again: test unimportant change to verify buildbot does not try to build
........
r47118 | neal.norwitz | 2006-06-27 06:28:56 +0200 (Tue, 27 Jun 2006) | 1 line
Verify buildbot picks up these changes (really needs testing after last change to Makefile.pre.in)
........
r47121 | vinay.sajip | 2006-06-27 09:34:37 +0200 (Tue, 27 Jun 2006) | 1 line
Removed buggy exception handling in doRollover of rotating file handlers. Exceptions now propagate to caller.
........
r47123 | ronald.oussoren | 2006-06-27 12:08:25 +0200 (Tue, 27 Jun 2006) | 3 lines
MacOSX: fix rather dumb buglet that made it impossible to create extensions on
OSX 10.3 when using a binary distribution build on 10.4.
........
r47125 | tim.peters | 2006-06-27 13:52:49 +0200 (Tue, 27 Jun 2006) | 2 lines
Whitespace normalization.
........
r47128 | ronald.oussoren | 2006-06-27 14:53:52 +0200 (Tue, 27 Jun 2006) | 8 lines
Use staticly build copies of zlib and bzip2 to build the OSX installer, that
way the resulting binaries have a better change of running on 10.3.
This patch also updates the search logic for sleepycat db3/4, without this
patch you cannot use a sleepycat build with a non-standard prefix; with this
you can (at least on OSX) if you add the prefix to CPPFLAGS/LDFLAGS at
configure-time. This change is needed to build the binary installer for OSX.
........
r47131 | ronald.oussoren | 2006-06-27 17:45:32 +0200 (Tue, 27 Jun 2006) | 5 lines
macosx: Install a libpython2.5.a inside the framework as a symlink to the actual
dylib at the root of the framework, that way tools that expect a unix-like
install (python-config, but more importantly external products like
mod_python) work correctly.
........
r47137 | neal.norwitz | 2006-06-28 07:03:22 +0200 (Wed, 28 Jun 2006) | 4 lines
According to the man pages on Gentoo Linux and Tru64, EACCES or EAGAIN
can be returned if fcntl (lockf) fails. This fixes the test failure
on Tru64 by checking for either error rather than just EAGAIN.
........
r47139 | neal.norwitz | 2006-06-28 08:28:31 +0200 (Wed, 28 Jun 2006) | 5 lines
Fix bug #1512695: cPickle.loads could crash if it was interrupted with
a KeyboardInterrupt since PyTuple_Pack was passed a NULL.
Will backport.
........
r47142 | nick.coghlan | 2006-06-28 12:41:47 +0200 (Wed, 28 Jun 2006) | 1 line
Make full module name available as __module_name__ even when __name__ is set to something else (like '__main__')
........
r47143 | armin.rigo | 2006-06-28 12:49:51 +0200 (Wed, 28 Jun 2006) | 2 lines
A couple of crashers of the "won't fix" kind.
........
r47147 | andrew.kuchling | 2006-06-28 16:25:20 +0200 (Wed, 28 Jun 2006) | 1 line
[Bug #1508766] Add docs for uuid module; docs written by George Yoshida, with minor rearrangements by me.
........
r47148 | andrew.kuchling | 2006-06-28 16:27:21 +0200 (Wed, 28 Jun 2006) | 1 line
[Bug #1508766] Add docs for uuid module; this puts the module in the 'Internet Protocols' section. Arguably this module could also have gone in the chapters on strings or encodings, maybe even the crypto chapter. Fred, please move if you see fit.
........
r47151 | georg.brandl | 2006-06-28 22:23:25 +0200 (Wed, 28 Jun 2006) | 3 lines
Fix end_fill().
........
r47153 | trent.mick | 2006-06-28 22:30:41 +0200 (Wed, 28 Jun 2006) | 2 lines
Mention the expat upgrade and pyexpat fix I put in 2.5b1.
........
r47154 | fred.drake | 2006-06-29 02:51:53 +0200 (Thu, 29 Jun 2006) | 6 lines
SF bug #1504333: sgmlib should allow angle brackets in quoted values
(modified patch by Sam Ruby; changed to use separate REs for start and end
tags to reduce matching cost for end tags; extended tests; updated to avoid
breaking previous changes to support IPv6 addresses in unquoted attribute
values)
........
r47156 | fred.drake | 2006-06-29 04:57:48 +0200 (Thu, 29 Jun 2006) | 1 line
document recent bugfixes in sgmllib
........
r47158 | neal.norwitz | 2006-06-29 06:10:08 +0200 (Thu, 29 Jun 2006) | 10 lines
Add new utility function, reap_children(), to test_support. This should
be called at the end of each test that spawns children (perhaps it
should be called from regrtest instead?). This will hopefully prevent
some of the unexplained failures in the buildbots (hppa and alpha)
during tests that spawn children. The problems were not reproducible.
There were many zombies that remained at the end of several tests.
In the worst case, this shouldn't cause any more problems,
though it may not help either. Time will tell.
........
r47159 | neal.norwitz | 2006-06-29 07:48:14 +0200 (Thu, 29 Jun 2006) | 5 lines
This should fix the buildbot failure on s/390 which can't connect to gmail.org.
It makes the error message consistent and always sends to stderr.
It would be much better for all the networking tests to hit only python.org.
........
r47161 | thomas.heller | 2006-06-29 20:34:15 +0200 (Thu, 29 Jun 2006) | 3 lines
Protect the thread api calls in the _ctypes extension module within
#ifdef WITH_THREADS/#endif blocks. Found by Sam Rushing.
........
r47162 | martin.v.loewis | 2006-06-29 20:58:44 +0200 (Thu, 29 Jun 2006) | 2 lines
Patch #1509163: MS Toolkit Compiler no longer available
........
r47163 | skip.montanaro | 2006-06-29 21:20:09 +0200 (Thu, 29 Jun 2006) | 1 line
add string methods to index
........
r47164 | vinay.sajip | 2006-06-30 02:13:08 +0200 (Fri, 30 Jun 2006) | 1 line
Fixed bug in fileConfig() which failed to clear logging._handlerList
........
r47166 | tim.peters | 2006-06-30 08:18:39 +0200 (Fri, 30 Jun 2006) | 2 lines
Whitespace normalization.
........
r47170 | neal.norwitz | 2006-06-30 09:32:16 +0200 (Fri, 30 Jun 2006) | 1 line
Silence compiler warning
........
r47171 | neal.norwitz | 2006-06-30 09:32:46 +0200 (Fri, 30 Jun 2006) | 1 line
Another problem reported by Coverity. Backport candidate.
........
r47175 | thomas.heller | 2006-06-30 19:44:54 +0200 (Fri, 30 Jun 2006) | 2 lines
Revert the use of PY_FORMAT_SIZE_T in PyErr_Format.
........
r47176 | tim.peters | 2006-06-30 20:34:51 +0200 (Fri, 30 Jun 2006) | 2 lines
Remove now-unused fidding with PY_FORMAT_SIZE_T.
........
r47177 | georg.brandl | 2006-06-30 20:47:56 +0200 (Fri, 30 Jun 2006) | 3 lines
Document decorator usage of property.
........
r47181 | fred.drake | 2006-06-30 21:29:25 +0200 (Fri, 30 Jun 2006) | 4 lines
- consistency nit: always include "()" in \function and \method
(*should* be done by the presentation, but that requires changes all over)
- avoid spreading the __name meme
........
r47188 | vinay.sajip | 2006-07-01 12:45:20 +0200 (Sat, 01 Jul 2006) | 1 line
Added entry for fileConfig() bugfix.
........
r47189 | vinay.sajip | 2006-07-01 12:47:20 +0200 (Sat, 01 Jul 2006) | 1 line
Added duplicate call to fileConfig() to ensure that it cleans up after itself correctly.
........
r47190 | martin.v.loewis | 2006-07-01 17:33:37 +0200 (Sat, 01 Jul 2006) | 2 lines
Release all forwarded functions in .close. Fixes #1513223.
........
r47191 | fred.drake | 2006-07-01 18:28:20 +0200 (Sat, 01 Jul 2006) | 7 lines
SF bug #1296433 (Expat bug #1515266): Unchecked calls to character data
handler would cause a segfault. This merges in Expat's lib/xmlparse.c
revisions 1.154 and 1.155, which fix this and a closely related problem
(the later does not affect Python).
Moved the crasher test to the tests for xml.parsers.expat.
........
r47197 | gerhard.haering | 2006-07-02 19:48:30 +0200 (Sun, 02 Jul 2006) | 4 lines
The sqlite3 module did cut off data from the SQLite database at the first null
character before sending it to a custom converter. This has been fixed now.
........
r47198 | martin.v.loewis | 2006-07-02 20:44:00 +0200 (Sun, 02 Jul 2006) | 1 line
Correct arithmetic in access on Win32. Fixes #1513646.
........
r47203 | thomas.heller | 2006-07-03 09:58:09 +0200 (Mon, 03 Jul 2006) | 1 line
Cleanup: Remove commented out code.
........
r47204 | thomas.heller | 2006-07-03 09:59:50 +0200 (Mon, 03 Jul 2006) | 1 line
Don't run the doctests with Python 2.3 because it doesn't have the ELLIPSIS flag.
........
r47205 | thomas.heller | 2006-07-03 10:04:05 +0200 (Mon, 03 Jul 2006) | 7 lines
Fixes so that _ctypes can be compiled with the MingW compiler.
It seems that the definition of '__attribute__(x)' was responsible for
the compiler ignoring the '__fastcall' attribute on the
ffi_closure_SYSV function in libffi_msvc/ffi.c, took me quite some
time to figure this out.
........
r47206 | thomas.heller | 2006-07-03 10:08:14 +0200 (Mon, 03 Jul 2006) | 11 lines
Add a new function uses_seh() to the _ctypes extension module. This
will return True if Windows Structured Exception handling (SEH) is
used when calling functions, False otherwise.
Currently, only MSVC supports SEH.
Fix the test so that it doesn't crash when run with MingW compiled
_ctypes. Note that two tests are still failing when mingw is used, I
suspect structure layout differences and function calling conventions
between MSVC and MingW.
........
r47207 | tim.peters | 2006-07-03 10:23:19 +0200 (Mon, 03 Jul 2006) | 2 lines
Whitespace normalization.
........
r47208 | martin.v.loewis | 2006-07-03 11:44:00 +0200 (Mon, 03 Jul 2006) | 3 lines
Only setup canvas when it is first created.
Fixes #1514703
........
r47209 | martin.v.loewis | 2006-07-03 12:05:30 +0200 (Mon, 03 Jul 2006) | 3 lines
Reimplement turtle.circle using a polyline, to allow correct
filling of arcs. Also fixes #1514693.
........
r47210 | martin.v.loewis | 2006-07-03 12:19:49 +0200 (Mon, 03 Jul 2006) | 3 lines
Bug #1514693: Update turtle's heading when switching between
degrees and radians.
........
r47211 | martin.v.loewis | 2006-07-03 13:12:06 +0200 (Mon, 03 Jul 2006) | 2 lines
Document functions added in 2.3 and 2.5.
........
r47212 | martin.v.loewis | 2006-07-03 14:19:50 +0200 (Mon, 03 Jul 2006) | 3 lines
Bug #1417699: Reject locale-specific decimal point in float()
and atof().
........
r47213 | martin.v.loewis | 2006-07-03 14:28:58 +0200 (Mon, 03 Jul 2006) | 3 lines
Bug #1267547: Put proper recursive setup.py call into the
spec file generated by bdist_rpm.
........
r47215 | martin.v.loewis | 2006-07-03 15:01:35 +0200 (Mon, 03 Jul 2006) | 3 lines
Patch #825417: Fix timeout processing in expect,
read_until. Will backport to 2.4.
........
r47218 | martin.v.loewis | 2006-07-03 15:47:40 +0200 (Mon, 03 Jul 2006) | 2 lines
Put method-wrappers into trashcan. Fixes #927248.
........
r47219 | andrew.kuchling | 2006-07-03 16:07:30 +0200 (Mon, 03 Jul 2006) | 1 line
[Bug #1515932] Clarify description of slice assignment
........
r47220 | andrew.kuchling | 2006-07-03 16:16:09 +0200 (Mon, 03 Jul 2006) | 4 lines
[Bug #1511911] Clarify description of optional arguments to sorted()
by improving the xref to the section on lists, and by
copying the explanations of the arguments (with a slight modification).
........
r47223 | kristjan.jonsson | 2006-07-03 16:59:05 +0200 (Mon, 03 Jul 2006) | 1 line
Fix build problems with the platform SDK on windows. It is not sufficient to test for the C compiler version when determining if we have the secure CRT from microsoft. Must test with an undocumented macro, __STDC_SECURE_LIB__ too.
........
r47224 | ronald.oussoren | 2006-07-04 14:30:22 +0200 (Tue, 04 Jul 2006) | 7 lines
Sync the darwin/x86 port libffi with the copy in PyObjC. This fixes a number
of bugs in that port. The most annoying ones were due to some subtle differences
between the document ABI and the actual implementation :-(
(there are no python unittests that fail without this patch, but without it
some of libffi's unittests fail).
........
r47234 | georg.brandl | 2006-07-05 10:21:00 +0200 (Wed, 05 Jul 2006) | 3 lines
Remove remaining references to OverflowWarning.
........
r47236 | thomas.heller | 2006-07-05 11:13:56 +0200 (Wed, 05 Jul 2006) | 3 lines
Fix the bitfield test when _ctypes is compiled with MingW. Structures
containing bitfields may have different layout on MSVC and MingW .
........
r47237 | thomas.wouters | 2006-07-05 13:03:49 +0200 (Wed, 05 Jul 2006) | 15 lines
Fix bug in passing tuples to string.Template. All other values (with working
str() or repr()) would work, just not multi-value tuples. Probably not a
backport candidate, since it changes the behaviour of passing a
single-element tuple:
>>> string.Template("$foo").substitute(dict(foo=(1,)))
'(1,)'
versus
'1'
........
r47241 | georg.brandl | 2006-07-05 16:18:45 +0200 (Wed, 05 Jul 2006) | 2 lines
Patch #1517490: fix glitches in filter() docs.
........
r47244 | georg.brandl | 2006-07-05 17:50:05 +0200 (Wed, 05 Jul 2006) | 2 lines
no need to elaborate "string".
........
r47251 | neal.norwitz | 2006-07-06 06:28:59 +0200 (Thu, 06 Jul 2006) | 3 lines
Fix refleaks reported by Shane Hathaway in SF patch #1515361. This change
contains only the changes related to leaking the copy variable.
........
r47253 | fred.drake | 2006-07-06 07:13:22 +0200 (Thu, 06 Jul 2006) | 4 lines
- back out Expat change; the final fix to Expat will be different
- change the pyexpat wrapper to not be so sensitive to this detail of the
Expat implementation (the ex-crasher test still passes)
........
r47257 | neal.norwitz | 2006-07-06 08:45:08 +0200 (Thu, 06 Jul 2006) | 1 line
Add a NEWS entry for a recent pyexpat fix
........
r47258 | martin.v.loewis | 2006-07-06 08:55:58 +0200 (Thu, 06 Jul 2006) | 2 lines
Add sqlite3.dll to the DLLs component, not to the TkDLLs component.
Fixes #1517388.
........
r47259 | martin.v.loewis | 2006-07-06 09:05:21 +0200 (Thu, 06 Jul 2006) | 1 line
Properly quote compileall and Lib paths in case TARGETDIR has a space.
........
r47260 | thomas.heller | 2006-07-06 09:50:18 +0200 (Thu, 06 Jul 2006) | 5 lines
Revert the change done in svn revision 47206:
Add a new function uses_seh() to the _ctypes extension module. This
will return True if Windows Structured Exception handling (SEH) is
used when calling functions, False otherwise.
........
r47261 | armin.rigo | 2006-07-06 09:58:18 +0200 (Thu, 06 Jul 2006) | 3 lines
A couple of examples about how to attack the fact that _PyType_Lookup()
returns a borrowed ref. Many of the calls are open to attack.
........
r47262 | thomas.heller | 2006-07-06 10:28:14 +0200 (Thu, 06 Jul 2006) | 2 lines
The test that calls a function with invalid arguments and catches the
resulting Windows access violation will not be run by default.
........
r47263 | thomas.heller | 2006-07-06 10:48:35 +0200 (Thu, 06 Jul 2006) | 5 lines
Patch #1517790: It is now possible to use custom objects in the ctypes
foreign function argtypes sequence as long as they provide a
from_param method, no longer is it required that the object is a
ctypes type.
........
r47264 | thomas.heller | 2006-07-06 10:58:40 +0200 (Thu, 06 Jul 2006) | 2 lines
Document the Struture and Union constructors.
........
r47265 | thomas.heller | 2006-07-06 11:11:22 +0200 (Thu, 06 Jul 2006) | 2 lines
Document the changes in svn revision 47263, from patch #1517790.
........
r47267 | ronald.oussoren | 2006-07-06 12:13:35 +0200 (Thu, 06 Jul 2006) | 7 lines
This patch solves the problem Skip was seeing with zlib, this patch ensures that
configure uses similar compiler flags as setup.py when doing the zlib test.
Without this patch configure would use the first shared library on the linker
path, with this patch it uses the first shared or static library on that path
just like setup.py.
........
r47268 | thomas.wouters | 2006-07-06 12:48:28 +0200 (Thu, 06 Jul 2006) | 4 lines
NEWS entry for r47267: fixing configure's zlib probing.
........
r47269 | fredrik.lundh | 2006-07-06 14:29:24 +0200 (Thu, 06 Jul 2006) | 3 lines
added XMLParser alias for cElementTree compatibility
........
r47271 | nick.coghlan | 2006-07-06 14:53:04 +0200 (Thu, 06 Jul 2006) | 1 line
Revert the __module_name__ changes made in rev 47142. We'll revisit this in Python 2.6
........
r47272 | nick.coghlan | 2006-07-06 15:04:56 +0200 (Thu, 06 Jul 2006) | 1 line
Update the tutorial section on relative imports
........
r47273 | nick.coghlan | 2006-07-06 15:35:27 +0200 (Thu, 06 Jul 2006) | 1 line
Ignore ImportWarning by default
........
r47274 | nick.coghlan | 2006-07-06 15:41:34 +0200 (Thu, 06 Jul 2006) | 1 line
Cover ImportWarning, PendingDeprecationWarning and simplefilter() in the warnings module docs
........
r47275 | nick.coghlan | 2006-07-06 15:47:18 +0200 (Thu, 06 Jul 2006) | 1 line
Add NEWS entries for the ImportWarning change and documentation update
........
r47276 | andrew.kuchling | 2006-07-06 15:57:28 +0200 (Thu, 06 Jul 2006) | 1 line
ImportWarning is now silent by default
........
r47277 | thomas.heller | 2006-07-06 17:06:05 +0200 (Thu, 06 Jul 2006) | 2 lines
Document the correct return type of PyLong_AsUnsignedLongLongMask.
........
r47278 | hyeshik.chang | 2006-07-06 17:21:52 +0200 (Thu, 06 Jul 2006) | 2 lines
Add a testcase for r47086 which fixed a bug in codec_getstreamcodec().
........
r47279 | hyeshik.chang | 2006-07-06 17:39:24 +0200 (Thu, 06 Jul 2006) | 3 lines
Test using all CJK encodings for the testcases which don't require
specific encodings.
........
r47280 | martin.v.loewis | 2006-07-06 21:28:03 +0200 (Thu, 06 Jul 2006) | 2 lines
Properly generate logical file ids. Fixes #1515998.
Also correct typo in Control.mapping.
........
r47287 | neal.norwitz | 2006-07-07 08:03:15 +0200 (Fri, 07 Jul 2006) | 17 lines
Restore rev 47014:
The hppa ubuntu box sometimes hangs forever in these tests. My guess
is that the wait is failing for some reason. Use WNOHANG, so we won't
wait until the buildbot kills the test suite.
I haven't been able to reproduce the failure, so I'm not sure if
this will help or not. Hopefully, this change will cause the test
to fail, rather than hang. That will be better since we will get
the rest of the test results. It may also help us debug the real problem.
*** The reason this originally failed was because there were many
zombie children outstanding before rev 47158 cleaned them up.
There are still hangs in test_subprocess that need to be addressed,
but that will take more work. This should close some holes.
........
r47289 | georg.brandl | 2006-07-07 10:15:12 +0200 (Fri, 07 Jul 2006) | 3 lines
Fix RFC number.
........
r50489 | neal.norwitz | 2006-07-08 07:31:37 +0200 (Sat, 08 Jul 2006) | 1 line
Fix SF bug #1519018: 'as' is now validated properly in import statements
........
r50490 | georg.brandl | 2006-07-08 14:15:27 +0200 (Sat, 08 Jul 2006) | 3 lines
Add an additional test for bug #1519018.
........
r50491 | tim.peters | 2006-07-08 21:55:05 +0200 (Sat, 08 Jul 2006) | 2 lines
Whitespace normalization.
........
r50493 | neil.schemenauer | 2006-07-09 18:16:34 +0200 (Sun, 09 Jul 2006) | 2 lines
Fix AST compiler bug #1501934: incorrect LOAD/STORE_GLOBAL generation.
........
r50495 | neil.schemenauer | 2006-07-09 23:19:29 +0200 (Sun, 09 Jul 2006) | 2 lines
Fix SF bug 1441486: bad unary minus folding in compiler.
........
r50497 | neal.norwitz | 2006-07-10 00:14:42 +0200 (Mon, 10 Jul 2006) | 4 lines
On 64 bit systems, int literals that use less than 64 bits are now ints
rather than longs. This also fixes the test for eval(-sys.maxint - 1).
........
r50500 | neal.norwitz | 2006-07-10 02:04:44 +0200 (Mon, 10 Jul 2006) | 4 lines
Bug #1512814, Fix incorrect lineno's when code at module scope
started after line 256.
........
r50501 | neal.norwitz | 2006-07-10 02:05:34 +0200 (Mon, 10 Jul 2006) | 1 line
Fix doco. Backport candidate.
........
r50503 | neal.norwitz | 2006-07-10 02:23:17 +0200 (Mon, 10 Jul 2006) | 5 lines
Part of SF patch #1484695. This removes dead code. The chksum was
already verified in .frombuf() on the lines above. If there was
a problem an exception is raised, so there was no way this condition
could have been true.
........
r50504 | neal.norwitz | 2006-07-10 03:18:57 +0200 (Mon, 10 Jul 2006) | 3 lines
Patch #1516912: improve Modules support for OpenVMS.
........
r50506 | neal.norwitz | 2006-07-10 04:36:41 +0200 (Mon, 10 Jul 2006) | 7 lines
Patch #1504046: Add documentation for xml.etree.
/F wrote the text docs, Englebert Gruber massaged it to latex and I
did some more massaging to try and improve the consistency and
fix some name mismatches between the declaration and text.
........
r50509 | martin.v.loewis | 2006-07-10 09:23:48 +0200 (Mon, 10 Jul 2006) | 2 lines
Introduce DISTUTILS_USE_SDK as a flag to determine whether the
SDK environment should be used. Fixes #1508010.
........
r50510 | martin.v.loewis | 2006-07-10 09:26:41 +0200 (Mon, 10 Jul 2006) | 1 line
Change error message to indicate that VS2003 is necessary to build extension modules, not the .NET SDK.
........
r50511 | martin.v.loewis | 2006-07-10 09:29:41 +0200 (Mon, 10 Jul 2006) | 1 line
Add svn:ignore.
........
r50512 | anthony.baxter | 2006-07-10 09:41:04 +0200 (Mon, 10 Jul 2006) | 1 line
preparing for 2.5b2
........
r50513 | thomas.heller | 2006-07-10 11:10:28 +0200 (Mon, 10 Jul 2006) | 2 lines
Fix bug #1518190: accept any integer or long value in the
ctypes.c_void_p constructor.
........
r50514 | thomas.heller | 2006-07-10 11:31:06 +0200 (Mon, 10 Jul 2006) | 3 lines
Fixed a segfault when ctypes.wintypes were imported on
non-Windows machines.
........
r50516 | thomas.heller | 2006-07-10 13:11:10 +0200 (Mon, 10 Jul 2006) | 3 lines
Assigning None to pointer type structure fields possible overwrote
wrong fields.
........
r50517 | thomas.heller | 2006-07-10 13:17:37 +0200 (Mon, 10 Jul 2006) | 5 lines
Moved the ctypes news entries from the 'Library' section into the
'Extension Modules' section where they belong, probably.
This destroyes the original order of the news entries, don't know
if that is important or not.
........
r50526 | phillip.eby | 2006-07-10 21:03:29 +0200 (Mon, 10 Jul 2006) | 2 lines
Fix SF#1516184 and add a test to prevent regression.
........
r50528 | phillip.eby | 2006-07-10 21:18:35 +0200 (Mon, 10 Jul 2006) | 2 lines
Fix SF#1457312: bad socket error handling in distutils "upload" command.
........
r50537 | peter.astrand | 2006-07-10 22:39:49 +0200 (Mon, 10 Jul 2006) | 1 line
Make it possible to run test_subprocess.py with Python 2.2, which lacks test_support.reap_children().
........
r50541 | tim.peters | 2006-07-10 23:08:24 +0200 (Mon, 10 Jul 2006) | 5 lines
After approval from Anthony, merge the tim-current_frames
branch into the trunk. This adds a new sys._current_frames()
function, which returns a dict mapping thread id to topmost
thread stack frame.
........
r50542 | tim.peters | 2006-07-10 23:11:49 +0200 (Mon, 10 Jul 2006) | 2 lines
Whitespace normalization.
........
r50553 | martin.v.loewis | 2006-07-11 00:11:28 +0200 (Tue, 11 Jul 2006) | 4 lines
Patch #1519566: Remove unused _tofill member.
Make begin_fill idempotent.
Update demo2 to demonstrate filling of concave shapes.
........
r50567 | anthony.baxter | 2006-07-11 04:04:09 +0200 (Tue, 11 Jul 2006) | 4 lines
#1494314: Fix a regression with high-numbered sockets in 2.4.3. This
means that select() on sockets > FD_SETSIZE (typically 1024) work again.
The patch makes sockets use poll() internally where available.
........
r50568 | tim.peters | 2006-07-11 04:17:48 +0200 (Tue, 11 Jul 2006) | 2 lines
Whitespace normalization.
........
r50575 | thomas.heller | 2006-07-11 18:42:05 +0200 (Tue, 11 Jul 2006) | 1 line
Add missing Py_DECREF.
........
r50576 | thomas.heller | 2006-07-11 18:44:25 +0200 (Tue, 11 Jul 2006) | 1 line
Add missing Py_DECREFs.
........
r50579 | andrew.kuchling | 2006-07-11 19:20:16 +0200 (Tue, 11 Jul 2006) | 1 line
Bump version number; add sys._current_frames
........
r50582 | thomas.heller | 2006-07-11 20:28:35 +0200 (Tue, 11 Jul 2006) | 3 lines
When a foreign function is retrived by calling __getitem__ on a ctypes
library instance, do not set it as attribute.
........
r50583 | thomas.heller | 2006-07-11 20:40:50 +0200 (Tue, 11 Jul 2006) | 2 lines
Change the ctypes version number to 1.0.0.
........
r50597 | neal.norwitz | 2006-07-12 07:26:17 +0200 (Wed, 12 Jul 2006) | 3 lines
Bug #1520864: unpacking singleton tuples in for loop (for x, in) work again.
........
r50598 | neal.norwitz | 2006-07-12 07:26:35 +0200 (Wed, 12 Jul 2006) | 1 line
Fix function name in error msg
........
r50599 | neal.norwitz | 2006-07-12 07:27:46 +0200 (Wed, 12 Jul 2006) | 4 lines
Fix uninitialized memory read reported by Valgrind when running doctest.
This could happen if size == 0.
........
r50600 | neal.norwitz | 2006-07-12 09:28:29 +0200 (Wed, 12 Jul 2006) | 1 line
Actually change the MAGIC #. Create a new section for 2.5c1 and mention the impact of changing the MAGIC #.
........
r50601 | thomas.heller | 2006-07-12 10:43:47 +0200 (Wed, 12 Jul 2006) | 3 lines
Fix #1467450: ctypes now uses RTLD_GLOBAL by default on OSX 10.3 to
load shared libraries.
........
r50604 | thomas.heller | 2006-07-12 16:25:18 +0200 (Wed, 12 Jul 2006) | 3 lines
Fix the wrong description of LibraryLoader.LoadLibrary, and document
the DEFAULT_MODE constant.
........
r50607 | georg.brandl | 2006-07-12 17:31:17 +0200 (Wed, 12 Jul 2006) | 3 lines
Accept long options "--help" and "--version".
........
r50617 | thomas.heller | 2006-07-13 11:53:47 +0200 (Thu, 13 Jul 2006) | 3 lines
A misspelled preprocessor symbol caused ctypes to be always compiled
without thread support. Replaced WITH_THREADS with WITH_THREAD.
........
r50619 | thomas.heller | 2006-07-13 19:01:14 +0200 (Thu, 13 Jul 2006) | 3 lines
Fix #1521375. When running with root priviledges, 'gcc -o /dev/null'
did overwrite /dev/null. Use a temporary file instead of /dev/null.
........
r50620 | thomas.heller | 2006-07-13 19:05:13 +0200 (Thu, 13 Jul 2006) | 2 lines
Fix misleading words.
........
r50622 | andrew.kuchling | 2006-07-13 19:37:26 +0200 (Thu, 13 Jul 2006) | 1 line
Typo fix
........
r50629 | georg.brandl | 2006-07-14 09:12:54 +0200 (Fri, 14 Jul 2006) | 3 lines
Patch #1521874: grammar errors in doanddont.tex.
........
r50630 | neal.norwitz | 2006-07-14 09:20:04 +0200 (Fri, 14 Jul 2006) | 1 line
Try to improve grammar further.
........
r50631 | martin.v.loewis | 2006-07-14 11:58:55 +0200 (Fri, 14 Jul 2006) | 1 line
Extend build_ssl to Win64, using VSExtComp.
........
r50632 | martin.v.loewis | 2006-07-14 14:10:09 +0200 (Fri, 14 Jul 2006) | 1 line
Add debug output to analyse buildbot failure.
........
r50633 | martin.v.loewis | 2006-07-14 14:31:05 +0200 (Fri, 14 Jul 2006) | 1 line
Fix Debug build of _ssl.
........
r50636 | andrew.kuchling | 2006-07-14 15:32:38 +0200 (Fri, 14 Jul 2006) | 1 line
Mention new options
........
r50638 | peter.astrand | 2006-07-14 16:04:45 +0200 (Fri, 14 Jul 2006) | 1 line
Bug #1223937: CalledProcessError.errno -> CalledProcessError.returncode.
........
r50640 | thomas.heller | 2006-07-14 17:01:05 +0200 (Fri, 14 Jul 2006) | 4 lines
Make the prototypes of our private PyUnicode_FromWideChar and
PyUnicode_AsWideChar replacement functions compatible to the official
functions by using Py_ssize_t instead of int.
........
r50643 | thomas.heller | 2006-07-14 19:51:14 +0200 (Fri, 14 Jul 2006) | 3 lines
Patch #1521817: The index range checking on ctypes arrays containing
exactly one element is enabled again.
........
r50647 | thomas.heller | 2006-07-14 20:22:50 +0200 (Fri, 14 Jul 2006) | 2 lines
Updates for the ctypes documentation.
........
r50655 | fredrik.lundh | 2006-07-14 23:45:48 +0200 (Fri, 14 Jul 2006) | 3 lines
typo
........
r50664 | george.yoshida | 2006-07-15 18:03:49 +0200 (Sat, 15 Jul 2006) | 2 lines
Bug #15187702 : ext/win-cookbook.html has a broken link to distutils
........
r50667 | bob.ippolito | 2006-07-15 18:53:15 +0200 (Sat, 15 Jul 2006) | 1 line
Patch #1220874: Update the binhex module for Mach-O.
........
r50671 | fred.drake | 2006-07-16 03:21:20 +0200 (Sun, 16 Jul 2006) | 1 line
clean up some link markup
........
r50673 | neal.norwitz | 2006-07-16 03:50:38 +0200 (Sun, 16 Jul 2006) | 4 lines
Bug #1512814, Fix incorrect lineno's when code within a function
had more than 255 blank lines. Byte codes need to go first, line #s second.
........
r50674 | neal.norwitz | 2006-07-16 04:00:32 +0200 (Sun, 16 Jul 2006) | 5 lines
a & b were dereffed above, so they are known to be valid pointers.
z is known to be NULL, nothing to DECREF.
Reported by Klockwork, #107.
........
r50675 | neal.norwitz | 2006-07-16 04:02:57 +0200 (Sun, 16 Jul 2006) | 5 lines
self is dereffed (and passed as first arg), so it's known to be good.
func is returned from PyArg_ParseTuple and also dereffed.
Reported by Klocwork, #30 (self one at least).
........
r50676 | neal.norwitz | 2006-07-16 04:05:35 +0200 (Sun, 16 Jul 2006) | 4 lines
proto was dereffed above and is known to be good. No need for X.
Reported by Klocwork, #39.
........
r50677 | neal.norwitz | 2006-07-16 04:15:27 +0200 (Sun, 16 Jul 2006) | 5 lines
Fix memory leaks in some conditions.
Reported by Klocwork #152.
........
r50678 | neal.norwitz | 2006-07-16 04:17:36 +0200 (Sun, 16 Jul 2006) | 4 lines
Fix memory leak under some conditions.
Reported by Klocwork, #98.
........
r50679 | neal.norwitz | 2006-07-16 04:22:30 +0200 (Sun, 16 Jul 2006) | 8 lines
Use sizeof(buffer) instead of duplicating the constants to ensure they won't
be wrong.
The real change is to pass (bufsz - 1) to PyOS_ascii_formatd and 1
to strncat. strncat copies n+1 bytes from src (not dest).
Reported by Klocwork #58.
........
r50680 | neal.norwitz | 2006-07-16 04:32:03 +0200 (Sun, 16 Jul 2006) | 5 lines
Handle a NULL name properly.
Reported by Klocwork #67
........
r50681 | neal.norwitz | 2006-07-16 04:35:47 +0200 (Sun, 16 Jul 2006) | 6 lines
PyFunction_SetDefaults() is documented as taking None or a tuple.
A NULL would crash the PyTuple_Check(). Now make NULL return a SystemError.
Reported by Klocwork #73.
........
r50683 | neal.norwitz | 2006-07-17 02:55:45 +0200 (Mon, 17 Jul 2006) | 5 lines
Stop INCREFing name, then checking if it's NULL. name (f_name) should never
be NULL so assert it. Fix one place where we could have passed NULL.
Reported by Klocwork #66.
........
r50684 | neal.norwitz | 2006-07-17 02:57:15 +0200 (Mon, 17 Jul 2006) | 5 lines
otherset is known to be non-NULL based on checks before and DECREF after.
DECREF otherset rather than XDECREF in error conditions too.
Reported by Klockwork #154.
........
r50685 | neal.norwitz | 2006-07-17 02:59:04 +0200 (Mon, 17 Jul 2006) | 7 lines
Reported by Klocwork #151.
v2 can be NULL if exception2 is NULL. I don't think that condition can happen,
but I'm not sure it can't either. Now the code will protect against either
being NULL.
........
r50686 | neal.norwitz | 2006-07-17 03:00:16 +0200 (Mon, 17 Jul 2006) | 1 line
Add NEWS entry for a bunch of fixes due to warnings produced by Klocworks static analysis tool.
........
r50687 | fred.drake | 2006-07-17 07:47:52 +0200 (Mon, 17 Jul 2006) | 3 lines
document xmlcore (still minimal; needs mention in each of the xml.* modules)
SF bug #1504456 (partial)
........
r50688 | georg.brandl | 2006-07-17 15:23:46 +0200 (Mon, 17 Jul 2006) | 3 lines
Remove usage of sets module (patch #1500609).
........
r50689 | georg.brandl | 2006-07-17 15:26:33 +0200 (Mon, 17 Jul 2006) | 3 lines
Add missing NEWS item (#1522771)
........
r50690 | andrew.kuchling | 2006-07-17 18:47:54 +0200 (Mon, 17 Jul 2006) | 1 line
Attribute more features
........
r50692 | kurt.kaiser | 2006-07-17 23:59:27 +0200 (Mon, 17 Jul 2006) | 8 lines
Patch 1479219 - Tal Einat
1. 'as' highlighted as builtin in comment string on import line
2. Comments such as "#False identity" which start with a keyword immediately
after the '#' character aren't colored as comments.
3. u or U beginning unicode string not correctly highlighted
Closes bug 1325071
........
r50693 | barry.warsaw | 2006-07-18 01:07:51 +0200 (Tue, 18 Jul 2006) | 16 lines
decode_rfc2231(): Be more robust against buggy RFC 2231 encodings.
Specifically, instead of raising a ValueError when there is a single tick in
the parameter, simply return that the entire string unquoted, with None for
both the charset and the language. Also, if there are more than 2 ticks in
the parameter, interpret the first three parts as the standard RFC 2231 parts,
then the rest of the parts as the encoded string.
Test cases added.
Original fewer-than-3-parts fix by Tokio Kikuchi.
Resolves SF bug # 1218081. I will back port the fix and tests to Python 2.4
(email 3.0) and Python 2.3 (email 2.5).
Also, bump the version number to email 4.0.1, removing the 'alpha' moniker.
........
r50695 | kurt.kaiser | 2006-07-18 06:03:16 +0200 (Tue, 18 Jul 2006) | 2 lines
Rebinding Tab key was inserting 'tab' instead of 'Tab'. Bug 1179168.
........
r50696 | brett.cannon | 2006-07-18 06:41:36 +0200 (Tue, 18 Jul 2006) | 6 lines
Fix bug #1520914. Starting in 2.4, time.strftime() began to check the bounds
of values in the time tuple passed in. Unfortunately people came to rely on
undocumented behaviour of setting unneeded values to 0, regardless of if it was
within the valid range. Now those values force the value internally to the
minimum value when 0 is passed in.
........
r50697 | facundo.batista | 2006-07-18 14:16:13 +0200 (Tue, 18 Jul 2006) | 1 line
Comments and docs cleanups, and some little fixes, provided by Santiágo Peresón
........
r50704 | martin.v.loewis | 2006-07-18 19:46:31 +0200 (Tue, 18 Jul 2006) | 2 lines
Patch #1524429: Use repr instead of backticks again.
........
r50706 | tim.peters | 2006-07-18 23:55:15 +0200 (Tue, 18 Jul 2006) | 2 lines
Whitespace normalization.
........
r50708 | tim.peters | 2006-07-19 02:03:19 +0200 (Wed, 19 Jul 2006) | 18 lines
SF bug 1524317: configure --without-threads fails to build
Moved the code for _PyThread_CurrentFrames() up, so it's no longer
in a huge "#ifdef WITH_THREAD" block (I didn't realize it /was/ in
one).
Changed test_sys's test_current_frames() so it passes with or without
thread supported compiled in.
Note that test_sys fails when Python is compiled without threads,
but for an unrelated reason (the old test_exit() fails with an
indirect ImportError on the `thread` module). There are also
other unrelated compilation failures without threads, in extension
modules (like ctypes); at least the core compiles again.
Do we really support --without-threads? If so, there are several
problems remaining.
........
r50713 | thomas.heller | 2006-07-19 11:09:32 +0200 (Wed, 19 Jul 2006) | 4 lines
Make sure the _ctypes extension can be compiled when WITH_THREAD is
not defined on Windows, even if that configuration is probably not
supported at all.
........
r50715 | martin.v.loewis | 2006-07-19 19:18:32 +0200 (Wed, 19 Jul 2006) | 4 lines
Revert r50706 (Whitespace normalization) and
r50697: Comments and docs cleanups, and some little fixes
per recommendation from Raymond Hettinger.
........
r50719 | phillip.eby | 2006-07-20 17:54:16 +0200 (Thu, 20 Jul 2006) | 4 lines
Fix SF#1516184 (again) and add a test to prevent regression.
(There was a problem with empty filenames still causing recursion)
........
r50720 | georg.brandl | 2006-07-20 18:28:39 +0200 (Thu, 20 Jul 2006) | 3 lines
Guard for _active being None in __del__ method.
........
r50721 | vinay.sajip | 2006-07-20 18:28:39 +0200 (Thu, 20 Jul 2006) | 1 line
Updated documentation for TimedRotatingFileHandler relating to how rollover files are named. The previous documentation was wrongly the same as for RotatingFileHandler.
........
r50731 | fred.drake | 2006-07-20 22:11:57 +0200 (Thu, 20 Jul 2006) | 1 line
markup fix
........
r50739 | kurt.kaiser | 2006-07-21 00:22:52 +0200 (Fri, 21 Jul 2006) | 7 lines
Avoid occasional failure to detect closing paren properly.
Patch 1407280 Tal Einat
M ParenMatch.py
M NEWS.txt
M CREDITS.txt
........
r50740 | vinay.sajip | 2006-07-21 01:20:12 +0200 (Fri, 21 Jul 2006) | 1 line
Addressed SF#1524081 by using a dictionary to map level names to syslog priority names, rather than a string.lower().
........
r50741 | neal.norwitz | 2006-07-21 07:29:58 +0200 (Fri, 21 Jul 2006) | 1 line
Add some asserts that we got good params passed
........
r50742 | neal.norwitz | 2006-07-21 07:31:02 +0200 (Fri, 21 Jul 2006) | 5 lines
Move the initialization of some pointers earlier. The problem is
that if we call Py_DECREF(frame) like we do if allocating locals fails,
frame_dealloc() will try to use these bogus values and crash.
........
r50743 | neal.norwitz | 2006-07-21 07:32:28 +0200 (Fri, 21 Jul 2006) | 4 lines
Handle allocation failures gracefully. Found with failmalloc.
Many (all?) of these could be backported.
........
r50745 | neal.norwitz | 2006-07-21 09:59:02 +0200 (Fri, 21 Jul 2006) | 1 line
Speel initialise write. Tanks Anthony.
........
r50746 | neal.norwitz | 2006-07-21 09:59:47 +0200 (Fri, 21 Jul 2006) | 2 lines
Handle more memory allocation failures without crashing.
........
r50754 | barry.warsaw | 2006-07-21 16:51:07 +0200 (Fri, 21 Jul 2006) | 23 lines
More RFC 2231 improvements for the email 4.0 package. As Mark Sapiro rightly
points out there are really two types of continued headers defined in this
RFC (i.e. "encoded" parameters with the form "name*0*=" and unencoded
parameters with the form "name*0="), but we were were handling them both the
same way and that isn't correct.
This patch should be much more RFC compliant in that only encoded params are
%-decoded and the charset/language information is only extract if there are
any encoded params in the segments. If there are no encoded params then the
RFC says that there will be no charset/language parts.
Note however that this will change the return value for Message.get_param() in
some cases. For example, whereas before if you had all unencoded param
continuations you would have still gotten a 3-tuple back from this method
(with charset and language == None), you will now get just a string. I don't
believe this is a backward incompatible change though because the
documentation for this method already indicates that either return value is
possible and that you must do an isinstance(val, tuple) check to discriminate
between the two. (Yeah that API kind of sucks but we can't change /that/
without breaking code.)
Test cases, some documentation updates, and a NEWS item accompany this patch.
........
r50759 | georg.brandl | 2006-07-21 19:36:31 +0200 (Fri, 21 Jul 2006) | 3 lines
Fix check for empty list (vs. None).
........
r50771 | brett.cannon | 2006-07-22 00:44:07 +0200 (Sat, 22 Jul 2006) | 2 lines
Remove an XXX marker in a comment.
........
r50773 | neal.norwitz | 2006-07-22 18:20:49 +0200 (Sat, 22 Jul 2006) | 1 line
Fix more memory allocation issues found with failmalloc.
........
r50774 | neal.norwitz | 2006-07-22 19:00:57 +0200 (Sat, 22 Jul 2006) | 1 line
Don't fail if the directory already exists
........
r50775 | greg.ward | 2006-07-23 04:25:53 +0200 (Sun, 23 Jul 2006) | 6 lines
Be a lot smarter about whether this test passes: instead of assuming
that a 2.93 sec audio file will always take 3.1 sec (as it did on the
hardware I had when I first wrote the test), expect that it will take
2.93 sec +/- 10%, and only fail if it's outside of that range.
Compute the expected
........
r50776 | kurt.kaiser | 2006-07-23 06:19:49 +0200 (Sun, 23 Jul 2006) | 2 lines
Tooltips failed on new-syle class __init__ args. Bug 1027566 Loren Guthrie
........
r50777 | neal.norwitz | 2006-07-23 09:50:36 +0200 (Sun, 23 Jul 2006) | 1 line
Handle more mem alloc issues found with failmalloc
........
r50778 | neal.norwitz | 2006-07-23 09:51:58 +0200 (Sun, 23 Jul 2006) | 5 lines
If the for loop isn't entered, entryblock will be NULL. If passed
to stackdepth_walk it will be dereffed.
Not sure if I found with failmalloc or Klockwork #55.
........
r50779 | neal.norwitz | 2006-07-23 09:53:14 +0200 (Sun, 23 Jul 2006) | 4 lines
Move the initialization of size_a down below the check for a being NULL.
Reported by Klocwork #106
........
r50780 | neal.norwitz | 2006-07-23 09:55:55 +0200 (Sun, 23 Jul 2006) | 9 lines
Check the allocation of b_objects and return if there was a failure.
Also fix a few memory leaks in other failure scenarios.
It seems that if b_objects == Py_None, we will have an extra ref to
b_objects. Add XXX comment so hopefully someone documents why the
else isn't necessary or adds it in.
Reported by Klocwork #20
........
r50781 | neal.norwitz | 2006-07-23 09:57:11 +0200 (Sun, 23 Jul 2006) | 2 lines
Fix memory leaks spotted by Klocwork #37.
........
r50782 | neal.norwitz | 2006-07-23 09:59:00 +0200 (Sun, 23 Jul 2006) | 5 lines
nextlink can be NULL if teedataobject_new fails, so use XINCREF.
Ensure that dataobj is never NULL.
Reported by Klocwork #102
........
r50783 | neal.norwitz | 2006-07-23 10:01:43 +0200 (Sun, 23 Jul 2006) | 8 lines
Ensure we don't write beyond errText. I think I got this right, but
it definitely could use some review to ensure I'm not off by one
and there's no possible overflow/wrap-around of bytes_left.
Reported by Klocwork #1.
Fix a problem if there is a failure allocating self->db.
Found with failmalloc.
........
r50784 | ronald.oussoren | 2006-07-23 11:41:09 +0200 (Sun, 23 Jul 2006) | 3 lines
Without this patch CMD-W won't close EditorWindows on MacOS X. This solves
part of bug #1517990.
........
r50785 | ronald.oussoren | 2006-07-23 11:46:11 +0200 (Sun, 23 Jul 2006) | 5 lines
Fix for bug #1517996: Class and Path browsers show Tk menu
This patch replaces the menubar that is used by AquaTk for windows without a
menubar of their own by one that is more appropriate for IDLE.
........
r50786 | andrew.macintyre | 2006-07-23 14:57:02 +0200 (Sun, 23 Jul 2006) | 2 lines
Build updates for OS/2 EMX port
........
r50787 | andrew.macintyre | 2006-07-23 15:00:04 +0200 (Sun, 23 Jul 2006) | 3 lines
bugfix: PyThread_start_new_thread() returns the thread ID, not a flag;
will backport.
........
r50789 | andrew.macintyre | 2006-07-23 15:04:00 +0200 (Sun, 23 Jul 2006) | 2 lines
Get mailbox module working on OS/2 EMX port.
........
r50791 | greg.ward | 2006-07-23 18:05:51 +0200 (Sun, 23 Jul 2006) | 1 line
Resync optparse with Optik 1.5.3: minor tweaks for/to tests.
........
r50794 | martin.v.loewis | 2006-07-24 07:05:22 +0200 (Mon, 24 Jul 2006) | 2 lines
Update list of unsupported systems. Fixes #1510853.
........
r50795 | martin.v.loewis | 2006-07-24 12:26:33 +0200 (Mon, 24 Jul 2006) | 1 line
Patch #1448199: Release GIL around ConnectRegistry.
........
r50796 | martin.v.loewis | 2006-07-24 13:54:53 +0200 (Mon, 24 Jul 2006) | 3 lines
Patch #1232023: Don't include empty path component from registry,
so that the current directory does not get added to sys.path.
Also fixes #1526785.
........
r50797 | martin.v.loewis | 2006-07-24 14:54:17 +0200 (Mon, 24 Jul 2006) | 3 lines
Bug #1524310: Properly report errors from FindNextFile in os.listdir.
Will backport to 2.4.
........
r50800 | georg.brandl | 2006-07-24 15:28:57 +0200 (Mon, 24 Jul 2006) | 7 lines
Patch #1523356: fix determining include dirs in python-config.
Also don't install "python-config" when doing altinstall, but
always install "python-config2.x" and make a link to it like
with the main executable.
........
r50802 | georg.brandl | 2006-07-24 15:46:47 +0200 (Mon, 24 Jul 2006) | 3 lines
Patch #1527744: right order of includes in order to have HAVE_CONIO_H defined properly.
........
r50803 | georg.brandl | 2006-07-24 16:09:56 +0200 (Mon, 24 Jul 2006) | 3 lines
Patch #1515343: Fix printing of deprecated string exceptions with a
value in the traceback module.
........
r50804 | kurt.kaiser | 2006-07-24 19:13:23 +0200 (Mon, 24 Jul 2006) | 7 lines
EditorWindow failed when used stand-alone if sys.ps1 not set.
Bug 1010370 Dave Florek
M EditorWindow.py
M PyShell.py
M NEWS.txt
........
r50805 | kurt.kaiser | 2006-07-24 20:05:51 +0200 (Mon, 24 Jul 2006) | 6 lines
- EditorWindow.test() was failing. Bug 1417598
M EditorWindow.py
M ScriptBinding.py
M NEWS.txt
........
r50808 | georg.brandl | 2006-07-24 22:11:35 +0200 (Mon, 24 Jul 2006) | 3 lines
Repair accidental NameError.
........
r50809 | tim.peters | 2006-07-24 23:02:15 +0200 (Mon, 24 Jul 2006) | 2 lines
Whitespace normalization.
........
r50810 | greg.ward | 2006-07-25 04:11:12 +0200 (Tue, 25 Jul 2006) | 3 lines
Don't use standard assert: want tests to fail even when run with -O.
Delete cruft.
........
r50811 | tim.peters | 2006-07-25 06:07:22 +0200 (Tue, 25 Jul 2006) | 10 lines
current_frames_with_threads(): There's actually no way
to guess /which/ line the spawned thread is in at the time
sys._current_frames() is called: we know it finished
enter_g.set(), but can't know whether the instruction
counter has advanced to the following leave_g.wait().
The latter is overwhelming most likely, but not guaranteed,
and I see that the "x86 Ubuntu dapper (icc) trunk" buildbot
found it on the other line once. Changed the test so it
passes in either case.
........
r50815 | martin.v.loewis | 2006-07-25 11:53:12 +0200 (Tue, 25 Jul 2006) | 2 lines
Bug #1525817: Don't truncate short lines in IDLE's tool tips.
........
r50816 | martin.v.loewis | 2006-07-25 12:05:47 +0200 (Tue, 25 Jul 2006) | 3 lines
Bug #978833: Really close underlying socket in _socketobject.close.
Will backport to 2.4.
........
r50817 | martin.v.loewis | 2006-07-25 12:11:14 +0200 (Tue, 25 Jul 2006) | 1 line
Revert incomplete checkin.
........
r50819 | georg.brandl | 2006-07-25 12:22:34 +0200 (Tue, 25 Jul 2006) | 4 lines
Patch #1525766: correctly pass onerror arg to recursive calls
of pkg.walk_packages. Also improve the docstrings.
........
r50825 | brett.cannon | 2006-07-25 19:32:20 +0200 (Tue, 25 Jul 2006) | 2 lines
Add comment for changes to test_ossaudiodev.
........
r50826 | brett.cannon | 2006-07-25 19:34:36 +0200 (Tue, 25 Jul 2006) | 3 lines
Fix a bug in the messages for an assert failure where not enough arguments to a string
were being converted in the format.
........
r50828 | armin.rigo | 2006-07-25 20:09:57 +0200 (Tue, 25 Jul 2006) | 2 lines
Document why is and is not a good way to fix the gc_inspection crasher.
........
r50829 | armin.rigo | 2006-07-25 20:11:07 +0200 (Tue, 25 Jul 2006) | 5 lines
Added another crasher, which hit me today (I was not intentionally
writing such code, of course, but it took some gdb time to figure out
what my bug was).
........
r50830 | armin.rigo | 2006-07-25 20:38:39 +0200 (Tue, 25 Jul 2006) | 3 lines
Document the crashers that will not go away soon as "won't fix",
and explain why.
........
r50831 | ronald.oussoren | 2006-07-25 21:13:35 +0200 (Tue, 25 Jul 2006) | 3 lines
Install the compatibility symlink to libpython.a on OSX using 'ln -sf' instead
of 'ln -s', this avoid problems when reinstalling python.
........
r50832 | ronald.oussoren | 2006-07-25 21:20:54 +0200 (Tue, 25 Jul 2006) | 7 lines
Fix for bug #1525447 (renaming to MacOSmodule.c would also work, but not
without causing problems for anyone that is on a case-insensitive filesystem).
Setup.py tries to compile the MacOS extension from MacOSmodule.c, while the
actual file is named macosmodule.c. This is no problem on the (default)
case-insensitive filesystem, but doesn't work on case-sensitive filesystems.
........
r50833 | ronald.oussoren | 2006-07-25 22:28:55 +0200 (Tue, 25 Jul 2006) | 7 lines
Fix bug #1517990: IDLE keybindings on OSX
This adds a new key definition for OSX, which is slightly different from the
classic mac definition.
Also add NEWS item for a couple of bugfixes I added recently.
........
r50834 | tim.peters | 2006-07-26 00:30:24 +0200 (Wed, 26 Jul 2006) | 2 lines
Whitespace normalization.
........
r50839 | neal.norwitz | 2006-07-26 06:00:18 +0200 (Wed, 26 Jul 2006) | 1 line
Hmm, only python2.x is installed, not plain python. Did that change recently?
........
r50840 | barry.warsaw | 2006-07-26 07:54:46 +0200 (Wed, 26 Jul 2006) | 6 lines
Forward port some fixes that were in email 2.5 but for some reason didn't make
it into email 4.0. Specifically, in Message.get_content_charset(), handle RFC
2231 headers that contain an encoding not known to Python, or a character in
the data that isn't in the charset encoding. Also forward port the
appropriate unit tests.
........
r50841 | georg.brandl | 2006-07-26 09:23:32 +0200 (Wed, 26 Jul 2006) | 3 lines
NEWS entry for #1525766.
........
r50842 | georg.brandl | 2006-07-26 09:40:17 +0200 (Wed, 26 Jul 2006) | 3 lines
Bug #1459963: properly capitalize HTTP header names.
........
r50843 | georg.brandl | 2006-07-26 10:03:10 +0200 (Wed, 26 Jul 2006) | 6 lines
Part of bug #1523610: fix miscalculation of buffer length.
Also add a guard against NULL in converttuple and add a test case
(that previously would have crashed).
........
r50844 | martin.v.loewis | 2006-07-26 14:12:56 +0200 (Wed, 26 Jul 2006) | 3 lines
Bug #978833: Really close underlying socket in _socketobject.close.
Fix httplib.HTTPConnection.getresponse to not close the
socket if it is still needed for the response.
........
r50845 | andrew.kuchling | 2006-07-26 19:16:52 +0200 (Wed, 26 Jul 2006) | 1 line
[Bug #1471938] Fix build problem on Solaris 8 by conditionalizing the use of mvwgetnstr(); it was conditionalized a few lines below. Fix from Paul Eggert. I also tried out the STRICT_SYSV_CURSES case and am therefore removing the 'untested' comment.
........
r50846 | andrew.kuchling | 2006-07-26 19:18:01 +0200 (Wed, 26 Jul 2006) | 1 line
Correct error message
........
r50847 | andrew.kuchling | 2006-07-26 19:19:39 +0200 (Wed, 26 Jul 2006) | 1 line
Minor grammar fix
........
r50848 | andrew.kuchling | 2006-07-26 19:22:21 +0200 (Wed, 26 Jul 2006) | 1 line
Put news item in right section
........
r50850 | andrew.kuchling | 2006-07-26 20:03:12 +0200 (Wed, 26 Jul 2006) | 1 line
Use sys.exc_info()
........
r50851 | andrew.kuchling | 2006-07-26 20:15:45 +0200 (Wed, 26 Jul 2006) | 1 line
Use sys.exc_info()
........
r50852 | phillip.eby | 2006-07-26 21:48:27 +0200 (Wed, 26 Jul 2006) | 4 lines
Allow the 'onerror' argument to walk_packages() to catch any Exception, not
just ImportError. This allows documentation tools to better skip unimportable
packages.
........
r50854 | tim.peters | 2006-07-27 01:23:15 +0200 (Thu, 27 Jul 2006) | 2 lines
Whitespace normalization.
........
r50855 | tim.peters | 2006-07-27 03:14:53 +0200 (Thu, 27 Jul 2006) | 21 lines
Bug #1521947: possible bug in mystrtol.c with recent gcc.
In general, C doesn't define anything about what happens when
an operation on a signed integral type overflows, and PyOS_strtol()
did several formally undefined things of that nature on signed
longs. Some version of gcc apparently tries to exploit that now,
and PyOS_strtol() could fail to detect overflow then.
Tried to repair all that, although it seems at least as likely to me
that we'll get screwed by bad platform definitions for LONG_MIN
and/or LONG_MAX now. For that reason, I don't recommend backporting
this.
Note that I have no box on which this makes a lick of difference --
can't really test it, except to note that it didn't break anything
on my boxes.
Silent change: PyOS_strtol() used to return the hard-coded 0x7fffffff
in case of overflow. Now it returns LONG_MAX. They're the same only on
32-bit boxes (although C doesn't guarantee that either ...).
........
r50856 | neal.norwitz | 2006-07-27 05:51:58 +0200 (Thu, 27 Jul 2006) | 6 lines
Don't kill a normal instance of python running on windows when checking
to kill a cygwin instance. build\\python.exe was matching a normal windows
instance. Prefix that with a \\ to ensure build is a directory and not
PCbuild. As discussed on python-dev.
........
r50857 | neal.norwitz | 2006-07-27 05:55:39 +0200 (Thu, 27 Jul 2006) | 5 lines
Closure can't be NULL at this point since we know it's a tuple.
Reported by Klocwork # 74.
........
r50858 | neal.norwitz | 2006-07-27 06:04:50 +0200 (Thu, 27 Jul 2006) | 1 line
No functional change. Add comment and assert to describe why there cannot be overflow which was reported by Klocwork. Discussed on python-dev
........
r50859 | martin.v.loewis | 2006-07-27 08:38:16 +0200 (Thu, 27 Jul 2006) | 3 lines
Bump distutils version to 2.5, as several new features
have been introduced since 2.4.
........
r50860 | andrew.kuchling | 2006-07-27 14:18:20 +0200 (Thu, 27 Jul 2006) | 1 line
Reformat docstring; fix typo
........
r50861 | georg.brandl | 2006-07-27 17:05:36 +0200 (Thu, 27 Jul 2006) | 6 lines
Add test_main() methods. These three tests were never run
by regrtest.py.
We really need a simpler testing framework.
........
r50862 | tim.peters | 2006-07-27 17:09:20 +0200 (Thu, 27 Jul 2006) | 2 lines
News for patch #1529686.
........
r50863 | tim.peters | 2006-07-27 17:11:00 +0200 (Thu, 27 Jul 2006) | 2 lines
Whitespace normalization.
........
r50864 | georg.brandl | 2006-07-27 17:38:33 +0200 (Thu, 27 Jul 2006) | 3 lines
Amend news entry.
........
r50865 | georg.brandl | 2006-07-27 18:08:15 +0200 (Thu, 27 Jul 2006) | 3 lines
Make uuid test suite pass on this box by requesting output with LC_ALL=C.
........
r50866 | andrew.kuchling | 2006-07-27 20:37:33 +0200 (Thu, 27 Jul 2006) | 1 line
Add example
........
r50867 | thomas.heller | 2006-07-27 20:39:55 +0200 (Thu, 27 Jul 2006) | 9 lines
Remove code that is no longer used (ctypes.com).
Fix the DllGetClassObject and DllCanUnloadNow so that they forward the
call to the comtypes.server.inprocserver module.
The latter was never documented, never used by published code, and
didn't work anyway, so I think it does not deserve a NEWS entry (but I
might be wrong).
........
r50868 | andrew.kuchling | 2006-07-27 20:41:21 +0200 (Thu, 27 Jul 2006) | 1 line
Typo fix ('publically' is rare, poss. non-standard)
........
r50869 | andrew.kuchling | 2006-07-27 20:42:41 +0200 (Thu, 27 Jul 2006) | 1 line
Add missing word
........
r50870 | andrew.kuchling | 2006-07-27 20:44:10 +0200 (Thu, 27 Jul 2006) | 1 line
Repair typos
........
r50872 | andrew.kuchling | 2006-07-27 20:53:33 +0200 (Thu, 27 Jul 2006) | 1 line
Update URL; add example
........
r50873 | andrew.kuchling | 2006-07-27 21:07:29 +0200 (Thu, 27 Jul 2006) | 1 line
Add punctuation mark; add some examples
........
r50874 | andrew.kuchling | 2006-07-27 21:11:07 +0200 (Thu, 27 Jul 2006) | 1 line
Mention base64 module; rewrite last sentence to be more positive
........
r50875 | andrew.kuchling | 2006-07-27 21:12:49 +0200 (Thu, 27 Jul 2006) | 1 line
If binhex is higher-level than binascii, it should come first in the chapter
........
r50876 | tim.peters | 2006-07-27 22:47:24 +0200 (Thu, 27 Jul 2006) | 28 lines
check_node(): stop spraying mystery output to stderr.
When a node number disagrees, keep track of all sources & the
node numbers they reported, and stick all that in the error message.
Changed all callers to supply a non-empty "source" argument; made
the "source" argument non-optional.
On my box, test_uuid still fails, but with the less confusing output:
AssertionError: different sources disagree on node:
from source 'getnode1', node was 00038a000015
from source 'getnode2', node was 00038a000015
from source 'ipconfig', node was 001111b2b7bf
Only the last one appears to be correct; e.g.,
C:\Code\python\PCbuild>getmac
Physical Address Transport Name
=================== ==========================================================
00-11-11-B2-B7-BF \Device\Tcpip_{190FB163-5AFD-4483-86A1-2FE16AC61FF1}
62-A1-AC-6C-FD-BE \Device\Tcpip_{8F77DF5A-EA3D-4F1D-975E-D472CEE6438A}
E2-1F-01-C6-5D-88 \Device\Tcpip_{CD18F76B-2EF3-409F-9B8A-6481EE70A1E4}
I can't find anything on my box with MAC 00-03-8a-00-00-15, and am
not clear on where that comes from.
........
r50878 | andrew.kuchling | 2006-07-28 00:40:05 +0200 (Fri, 28 Jul 2006) | 1 line
Reword paragraph
........
r50879 | andrew.kuchling | 2006-07-28 00:49:38 +0200 (Fri, 28 Jul 2006) | 1 line
Add example
........
r50880 | andrew.kuchling | 2006-07-28 00:49:54 +0200 (Fri, 28 Jul 2006) | 1 line
Add example
........
r50881 | barry.warsaw | 2006-07-28 01:43:15 +0200 (Fri, 28 Jul 2006) | 27 lines
Patch #1520294: Support for getset and member descriptors in types.py,
inspect.py, and pydoc.py. Specifically, this allows for querying the type of
an object against these built-in C types and more importantly, for getting
their docstrings printed in the interactive interpreter's help() function.
This patch includes a new built-in module called _types which provides
definitions of getset and member descriptors for use by the types.py module.
These types are exposed as types.GetSetDescriptorType and
types.MemberDescriptorType. Query functions are provided as
inspect.isgetsetdescriptor() and inspect.ismemberdescriptor(). The
implementations of these are robust enough to work with Python implementations
other than CPython, which may not have these fundamental types.
The patch also includes documentation and test suite updates.
I commit these changes now under these guiding principles:
1. Silence is assent. The release manager has not said "no", and of the few
people that cared enough to respond to the thread, the worst vote was "0".
2. It's easier to ask for forgiveness than permission.
3. It's so dang easy to revert stuff in svn, that you could view this as a
forcing function. :)
Windows build patches will follow.
........
r50882 | tim.peters | 2006-07-28 01:44:37 +0200 (Fri, 28 Jul 2006) | 4 lines
Bug #1529297: The rewrite of doctest for Python 2.4 unintentionally
lost that tests are sorted by name before being run. ``DocTestFinder``
has been changed to sort the list of tests it returns.
........
r50883 | tim.peters | 2006-07-28 01:45:48 +0200 (Fri, 28 Jul 2006) | 2 lines
Whitespace normalization.
........
r50884 | tim.peters | 2006-07-28 01:46:36 +0200 (Fri, 28 Jul 2006) | 2 lines
Add missing svn:eol-style property to text files.
........
r50885 | barry.warsaw | 2006-07-28 01:50:40 +0200 (Fri, 28 Jul 2006) | 4 lines
Enable the building of the _types module on Windows.
Note that this has only been tested for VS 2003 since that's all I have.
........
r50887 | tim.peters | 2006-07-28 02:23:15 +0200 (Fri, 28 Jul 2006) | 7 lines
defdict_reduce(): Plug leaks.
We didn't notice these before because test_defaultdict didn't
actually do anything before Georg fixed that earlier today.
Neal's next refleak run then showed test_defaultdict leaking
9 references on each run. That's repaired by this checkin.
........
r50888 | tim.peters | 2006-07-28 02:30:00 +0200 (Fri, 28 Jul 2006) | 2 lines
News about the repaired memory leak in defaultdict.
........
r50889 | gregory.p.smith | 2006-07-28 03:35:25 +0200 (Fri, 28 Jul 2006) | 7 lines
- pybsddb Bug #1527939: bsddb module DBEnv dbremove and dbrename
methods now allow their database parameter to be None as the
sleepycat API allows.
Also adds an appropriate test case for DBEnv.dbrename and dbremove.
........
r50895 | neal.norwitz | 2006-07-28 06:22:34 +0200 (Fri, 28 Jul 2006) | 1 line
Ensure the actual number matches the expected count
........
r50896 | tim.peters | 2006-07-28 06:51:59 +0200 (Fri, 28 Jul 2006) | 6 lines
Live with that "the hardware address" is an ill-defined
concept, and that different ways of trying to find "the
hardware address" may return different results. Certainly
true on both of my Windows boxes, and in different ways
(see whining on python-dev).
........
r50897 | neal.norwitz | 2006-07-28 09:21:27 +0200 (Fri, 28 Jul 2006) | 3 lines
Try to find the MAC addr on various flavours of Unix. This seems hopeless.
The reduces the test_uuid failures, but there's still another method failing.
........
r50898 | martin.v.loewis | 2006-07-28 09:45:49 +0200 (Fri, 28 Jul 2006) | 2 lines
Add UUID for upcoming 2.5b3.
........
r50899 | matt.fleming | 2006-07-28 13:27:27 +0200 (Fri, 28 Jul 2006) | 3 lines
Allow socketmodule to compile on NetBSD -current, whose bluetooth API
differs from both Linux and FreeBSD. Accepted by Neal Norwitz.
........
r50900 | andrew.kuchling | 2006-07-28 14:07:12 +0200 (Fri, 28 Jul 2006) | 1 line
[Patch #1529811] Correction to description of r|* mode
........
r50901 | andrew.kuchling | 2006-07-28 14:18:22 +0200 (Fri, 28 Jul 2006) | 1 line
Typo fix
........
r50902 | andrew.kuchling | 2006-07-28 14:32:43 +0200 (Fri, 28 Jul 2006) | 1 line
Add example
........
r50903 | andrew.kuchling | 2006-07-28 14:33:19 +0200 (Fri, 28 Jul 2006) | 1 line
Add example
........
r50904 | andrew.kuchling | 2006-07-28 14:45:55 +0200 (Fri, 28 Jul 2006) | 1 line
Don't overwrite built-in name; add some blank lines for readability
........
r50905 | andrew.kuchling | 2006-07-28 14:48:07 +0200 (Fri, 28 Jul 2006) | 1 line
Add example. Should I propagate this example to all the other DBM-ish modules, too?
........
r50912 | georg.brandl | 2006-07-28 20:31:39 +0200 (Fri, 28 Jul 2006) | 3 lines
Patch #1529686: also run test_email_codecs with regrtest.py.
........
r50913 | georg.brandl | 2006-07-28 20:36:01 +0200 (Fri, 28 Jul 2006) | 3 lines
Fix spelling.
........
r50915 | thomas.heller | 2006-07-28 21:42:40 +0200 (Fri, 28 Jul 2006) | 3 lines
Remove a useless XXX comment.
Cosmetic changes to the code so that the #ifdef _UNICODE block
doesn't mess emacs code formatting.
........
r50916 | phillip.eby | 2006-07-28 23:12:07 +0200 (Fri, 28 Jul 2006) | 5 lines
Bug #1529871: The speed enhancement patch #921466 broke Python's compliance
with PEP 302. This was fixed by adding an ``imp.NullImporter`` type that is
used in ``sys.path_importer_cache`` to cache non-directory paths and avoid
excessive filesystem operations during imports.
........
r50917 | phillip.eby | 2006-07-28 23:31:54 +0200 (Fri, 28 Jul 2006) | 2 lines
Fix svn merge spew.
........
r50918 | thomas.heller | 2006-07-28 23:43:20 +0200 (Fri, 28 Jul 2006) | 4 lines
Patch #1529514: More openbsd platforms for ctypes.
Regenerated Modules/_ctypes/libffi/configure with autoconf 2.59.
Approved by Neal.
........
r50922 | georg.brandl | 2006-07-29 10:51:21 +0200 (Sat, 29 Jul 2006) | 2 lines
Bug #835255: The "closure" argument to new.function() is now documented.
........
r50924 | georg.brandl | 2006-07-29 11:33:26 +0200 (Sat, 29 Jul 2006) | 3 lines
Bug #1441397: The compiler module now recognizes module and function
docstrings correctly as it did in Python 2.4.
........
r50925 | georg.brandl | 2006-07-29 12:25:46 +0200 (Sat, 29 Jul 2006) | 4 lines
Revert rev 42617, it was introduced to work around bug #1441397.
test_compiler now passes again.
........
r50926 | fred.drake | 2006-07-29 15:22:49 +0200 (Sat, 29 Jul 2006) | 1 line
update target version number
........
r50927 | andrew.kuchling | 2006-07-29 15:56:48 +0200 (Sat, 29 Jul 2006) | 1 line
Add example
........
r50928 | andrew.kuchling | 2006-07-29 16:04:47 +0200 (Sat, 29 Jul 2006) | 1 line
Update URL
........
r50930 | andrew.kuchling | 2006-07-29 16:08:15 +0200 (Sat, 29 Jul 2006) | 1 line
Reword paragraph to match the order of the subsequent sections
........
r50931 | andrew.kuchling | 2006-07-29 16:21:15 +0200 (Sat, 29 Jul 2006) | 1 line
[Bug #1529157] Mention raw_input() and input(); while I'm at it, reword the description a bit
........
r50932 | andrew.kuchling | 2006-07-29 16:42:48 +0200 (Sat, 29 Jul 2006) | 1 line
[Bug #1519571] Document some missing functions: setup(), title(), done()
........
r50933 | andrew.kuchling | 2006-07-29 16:43:55 +0200 (Sat, 29 Jul 2006) | 1 line
Fix docstring punctuation
........
r50934 | andrew.kuchling | 2006-07-29 17:10:32 +0200 (Sat, 29 Jul 2006) | 1 line
[Bug #1414697] Change docstring of set/frozenset types to specify that the contents are unique. Raymond, please feel free to edit or revert.
........
r50935 | andrew.kuchling | 2006-07-29 17:35:21 +0200 (Sat, 29 Jul 2006) | 1 line
[Bug #1530382] Document SSL.server(), .issuer() methods
........
r50936 | andrew.kuchling | 2006-07-29 17:42:46 +0200 (Sat, 29 Jul 2006) | 1 line
Typo fix
........
r50937 | andrew.kuchling | 2006-07-29 17:43:13 +0200 (Sat, 29 Jul 2006) | 1 line
Tweak wording
........
r50938 | matt.fleming | 2006-07-29 17:55:30 +0200 (Sat, 29 Jul 2006) | 2 lines
Fix typo
........
r50939 | andrew.kuchling | 2006-07-29 17:57:08 +0200 (Sat, 29 Jul 2006) | 6 lines
[Bug #1528258] Mention that the 'data' argument can be None.
The constructor docs referred the reader to the add_data() method's docs,
but they weren't very helpful. I've simply copied an earlier explanation
of 'data' that's more useful.
........
r50940 | andrew.kuchling | 2006-07-29 18:08:40 +0200 (Sat, 29 Jul 2006) | 1 line
Set bug/patch count. Take a bow, everyone!
........
r50941 | fred.drake | 2006-07-29 18:56:15 +0200 (Sat, 29 Jul 2006) | 18 lines
expunge the xmlcore changes:
41667, 41668 - initial switch to xmlcore
47044 - mention of xmlcore in What's New
50687 - mention of xmlcore in the library reference
re-apply xmlcore changes to xml:
41674 - line ending changes (re-applied manually), directory props
41677 - add cElementTree wrapper
41678 - PSF licensing for etree
41812 - whitespace normalization
42724 - fix svn:eol-style settings
43681, 43682 - remove Python version-compatibility cruft from minidom
46773 - fix encoding of \r\n\t in attr values in saxutils
47269 - added XMLParser alias for cElementTree compatibility
additional tests were added in Lib/test/test_sax.py that failed with
the xmlcore changes; these relate to SF bugs #1511497, #1513611
........
r50942 | andrew.kuchling | 2006-07-29 20:14:07 +0200 (Sat, 29 Jul 2006) | 17 lines
Reorganize the docs for 'file' and 'open()' after some discussion with Fred.
We want to encourage users to write open() when opening a file, but
open() was described with a single paragraph and
'file' had lots of explanation of the mode and bufsize arguments.
I've shrunk the description of 'file' to cross-reference to the 'File
objects' section, and to open() for an explanation of the arguments.
open() now has all the paragraphs about the mode string. The bufsize
argument was moved up so that it isn't buried at the end; now there's
1 paragraph on mode, 1 on bufsize, and then 3 more on mode. Various
other edits and rearrangements were made in the process.
It's probably best to read the final text and not to try to make sense
of the diffs.
........
r50943 | fred.drake | 2006-07-29 20:19:19 +0200 (Sat, 29 Jul 2006) | 1 line
restore test un-intentionally removed in the xmlcore purge (revision 50941)
........
r50944 | fred.drake | 2006-07-29 20:33:29 +0200 (Sat, 29 Jul 2006) | 3 lines
make the reference to older versions of the documentation a link
to the right page on python.org
........
r50945 | fred.drake | 2006-07-29 21:09:01 +0200 (Sat, 29 Jul 2006) | 1 line
document the footnote usage pattern
........
r50947 | fred.drake | 2006-07-29 21:14:10 +0200 (Sat, 29 Jul 2006) | 1 line
emphasize and oddball nuance of LaTeX comment syntax
........
r50948 | andrew.kuchling | 2006-07-29 21:24:04 +0200 (Sat, 29 Jul 2006) | 1 line
[Patch #1490989 from Skip Montanaro] Mention debugging builds in the API documentation. I've changed Skip's patch to point to Misc/SpecialBuilds and fiddled with the markup a bit.
........
r50949 | neal.norwitz | 2006-07-29 21:29:35 +0200 (Sat, 29 Jul 2006) | 6 lines
Disable these tests until they are reliable across platforms.
These problems may mask more important, real problems.
One or both methods are known to fail on: Solaris, OpenBSD, Debian, Ubuntu.
They pass on Windows and some Linux boxes.
........
r50950 | andrew.kuchling | 2006-07-29 21:50:37 +0200 (Sat, 29 Jul 2006) | 1 line
[Patch #1068277] Clarify that os.path.exists() can return False depending on permissions. Fred approved committing this patch in December 2004!
........
r50952 | fred.drake | 2006-07-29 22:04:42 +0200 (Sat, 29 Jul 2006) | 6 lines
SF bug #1193966: Weakref types documentation misplaced
The information about supporting weakrefs with types defined in C extensions
is moved to the Extending & Embedding manual. Py_TPFLAGS_HAVE_WEAKREFS is
no longer mentioned since it is part of Py_TPFLAGS_DEFAULT.
........
r50953 | skip.montanaro | 2006-07-29 22:06:05 +0200 (Sat, 29 Jul 2006) | 4 lines
Add a comment to the csv reader documentation that explains why the
treatment of newlines changed in 2.5. Pulled almost verbatim from a comment
by Andrew McNamara in <http://python.org/sf/1465014>.
........
r50954 | neal.norwitz | 2006-07-29 22:20:52 +0200 (Sat, 29 Jul 2006) | 3 lines
If the executable doesn't exist, there's no reason to try to start it.
This prevents garbage about command not found being printed on Solaris.
........
r50955 | fred.drake | 2006-07-29 22:21:25 +0200 (Sat, 29 Jul 2006) | 1 line
fix minor markup error that introduced extra punctuation
........
r50957 | neal.norwitz | 2006-07-29 22:37:08 +0200 (Sat, 29 Jul 2006) | 3 lines
Disable test_getnode too, since this is also unreliable.
........
r50958 | andrew.kuchling | 2006-07-29 23:27:12 +0200 (Sat, 29 Jul 2006) | 1 line
Follow TeX's conventions for hyphens
........
r50959 | andrew.kuchling | 2006-07-29 23:30:21 +0200 (Sat, 29 Jul 2006) | 1 line
Fix case for 'Unix'
........
r50960 | fred.drake | 2006-07-30 01:34:57 +0200 (Sun, 30 Jul 2006) | 1 line
markup cleanups
........
r50961 | andrew.kuchling | 2006-07-30 02:27:34 +0200 (Sun, 30 Jul 2006) | 1 line
Minor typo fixes
........
r50962 | andrew.kuchling | 2006-07-30 02:37:56 +0200 (Sun, 30 Jul 2006) | 1 line
[Bug #793553] Correct description of keyword arguments for SSL authentication
........
r50963 | tim.peters | 2006-07-30 02:58:15 +0200 (Sun, 30 Jul 2006) | 2 lines
Whitespace normalization.
........
r50964 | fred.drake | 2006-07-30 05:03:43 +0200 (Sun, 30 Jul 2006) | 1 line
lots of markup nits, most commonly Unix/unix --> \UNIX
........
r50965 | fred.drake | 2006-07-30 07:41:28 +0200 (Sun, 30 Jul 2006) | 1 line
update information on wxPython, from Robin Dunn
........
r50966 | fred.drake | 2006-07-30 07:49:49 +0200 (Sun, 30 Jul 2006) | 4 lines
remove possibly-outdated comment on what GUI toolkit is most commonly used;
it is hard to know whether this is right, and it does not add valuable reference information
at any rate
........
r50967 | fred.drake | 2006-07-30 07:55:39 +0200 (Sun, 30 Jul 2006) | 3 lines
- remove yet another reference to how commonly Tkinter is (thought to be) used
- fix an internal section reference
........
r50968 | neal.norwitz | 2006-07-30 08:53:31 +0200 (Sun, 30 Jul 2006) | 4 lines
Patch #1531113: Fix augmented assignment with yield expressions.
Also fix a SystemError when trying to assign to yield expressions.
........
r50969 | neal.norwitz | 2006-07-30 08:55:48 +0200 (Sun, 30 Jul 2006) | 5 lines
Add PyErr_WarnEx() so C code can pass the stacklevel to warnings.warn().
This provides the proper warning for struct.pack().
PyErr_Warn() is now deprecated in favor of PyErr_WarnEx().
As mentioned by Tim Peters on python-dev.
........
r50970 | neal.norwitz | 2006-07-30 08:57:04 +0200 (Sun, 30 Jul 2006) | 3 lines
Bug #1515471: string.replace() accepts character buffers again.
Pass the char* and size around rather than PyObject's.
........
r50971 | neal.norwitz | 2006-07-30 08:59:13 +0200 (Sun, 30 Jul 2006) | 1 line
Whitespace normalization
........
r50973 | georg.brandl | 2006-07-30 12:53:32 +0200 (Sun, 30 Jul 2006) | 3 lines
Clarify that __op__ methods must return NotImplemented if they don't support the operation.
........
r50974 | georg.brandl | 2006-07-30 13:07:23 +0200 (Sun, 30 Jul 2006) | 3 lines
Bug #1002398: The documentation for os.path.sameopenfile now correctly
refers to file descriptors, not file objects.
........
r50977 | martin.v.loewis | 2006-07-30 15:00:31 +0200 (Sun, 30 Jul 2006) | 3 lines
Don't copy directory stat times in shutil.copytree on Windows
Fixes #1525866.
........
r50978 | martin.v.loewis | 2006-07-30 15:14:05 +0200 (Sun, 30 Jul 2006) | 3 lines
Base __version__ on sys.version_info, as distutils is
no longer maintained separatedly.
........
r50979 | martin.v.loewis | 2006-07-30 15:27:31 +0200 (Sun, 30 Jul 2006) | 3 lines
Mention Cygwin in distutils error message about a missing VS 2003.
Fixes #1257728.
........
r50982 | martin.v.loewis | 2006-07-30 16:09:47 +0200 (Sun, 30 Jul 2006) | 5 lines
Drop usage of test -e in configure as it is not portable.
Fixes #1439538
Will backport to 2.4
Also regenerate pyconfig.h.in.
........
r50984 | georg.brandl | 2006-07-30 18:20:10 +0200 (Sun, 30 Jul 2006) | 3 lines
Fix makefile changes for python-config.
........
r50985 | george.yoshida | 2006-07-30 18:37:37 +0200 (Sun, 30 Jul 2006) | 2 lines
Rename struct.pack_to to struct.pack_into as changed in revision 46642.
........
r50986 | george.yoshida | 2006-07-30 18:41:30 +0200 (Sun, 30 Jul 2006) | 2 lines
Typo fix
........
r50987 | neal.norwitz | 2006-07-30 21:18:13 +0200 (Sun, 30 Jul 2006) | 1 line
Add some asserts and update comments
........
r50988 | neal.norwitz | 2006-07-30 21:18:38 +0200 (Sun, 30 Jul 2006) | 1 line
Verify that the signal handlers were really called
........
r50989 | neal.norwitz | 2006-07-30 21:20:42 +0200 (Sun, 30 Jul 2006) | 3 lines
Try to prevent hangs on Tru64/Alpha buildbot. I'm not certain this will help
and may need to be reverted if it causes problems.
........
r50990 | georg.brandl | 2006-07-30 22:18:51 +0200 (Sun, 30 Jul 2006) | 2 lines
Bug #1531349: right <-> left glitch in __rop__ description.
........
r50992 | tim.peters | 2006-07-31 03:46:03 +0200 (Mon, 31 Jul 2006) | 2 lines
Whitespace normalization.
........
r50993 | andrew.mcnamara | 2006-07-31 04:27:48 +0200 (Mon, 31 Jul 2006) | 2 lines
Redo the comment about the 2.5 change in quoted-newline handling.
........
r50994 | tim.peters | 2006-07-31 04:40:23 +0200 (Mon, 31 Jul 2006) | 10 lines
ZipFile.close(): Killed one of the struct.pack deprecation
warnings on Win32.
Also added an XXX about the line:
pos3 = self.fp.tell()
`pos3` is never referenced, and I have no idea what the code
intended to do instead.
........
r50996 | tim.peters | 2006-07-31 04:53:03 +0200 (Mon, 31 Jul 2006) | 8 lines
ZipFile.close(): Kill the other struct.pack deprecation
warning on Windows.
Afraid I can't detect a pattern to when the pack formats decide
to use a signed or unsigned format code -- appears nearly
arbitrary to my eyes. So I left all the pack formats alone and
changed the special-case data values instead.
........
r50997 | skip.montanaro | 2006-07-31 05:09:45 +0200 (Mon, 31 Jul 2006) | 1 line
minor tweaks
........
r50998 | skip.montanaro | 2006-07-31 05:11:11 +0200 (Mon, 31 Jul 2006) | 1 line
minor tweaks
........
r50999 | andrew.kuchling | 2006-07-31 14:20:24 +0200 (Mon, 31 Jul 2006) | 1 line
Add refcounts for PyErr_WarnEx
........
r51000 | andrew.kuchling | 2006-07-31 14:39:05 +0200 (Mon, 31 Jul 2006) | 9 lines
Document PyErr_WarnEx. (Bad Neal! No biscuit!)
Is the explanation of the 'stacklevel' parameter clear? Please feel free
to edit it.
I don't have LaTeX installed on this machine, so haven't verified that the
markup is correct. Will check tonight, or maybe the automatic doc build will
tell me.
........
r51001 | andrew.kuchling | 2006-07-31 14:52:26 +0200 (Mon, 31 Jul 2006) | 1 line
Add PyErr_WarnEx()
........
r51002 | andrew.kuchling | 2006-07-31 15:18:27 +0200 (Mon, 31 Jul 2006) | 1 line
Mention csv newline changes
........
r51003 | andrew.kuchling | 2006-07-31 17:22:58 +0200 (Mon, 31 Jul 2006) | 1 line
Typo fix
........
r51004 | andrew.kuchling | 2006-07-31 17:23:43 +0200 (Mon, 31 Jul 2006) | 1 line
Remove reference to notation
........
r51005 | georg.brandl | 2006-07-31 18:00:34 +0200 (Mon, 31 Jul 2006) | 3 lines
Fix function name.
........
r51006 | andrew.kuchling | 2006-07-31 18:10:24 +0200 (Mon, 31 Jul 2006) | 1 line
[Bug #1514540] Instead of putting the standard types in a section, put them in a chapter of their own. This means string methods will now show up in the ToC. (Should the types come before or after the functions+exceptions+constants chapter? I've put them after, for now.)
........
r51007 | andrew.kuchling | 2006-07-31 18:22:05 +0200 (Mon, 31 Jul 2006) | 1 line
[Bug #848556] Remove \d* from second alternative to avoid exponential case when repeating match
........
r51008 | andrew.kuchling | 2006-07-31 18:27:57 +0200 (Mon, 31 Jul 2006) | 1 line
Update list of files; fix a typo
........
r51013 | andrew.kuchling | 2006-08-01 18:24:30 +0200 (Tue, 01 Aug 2006) | 1 line
typo fix
........
r51018 | thomas.heller | 2006-08-01 18:54:43 +0200 (Tue, 01 Aug 2006) | 2 lines
Fix a potential segfault and various potentail refcount leaks
in the cast() function.
........
r51020 | thomas.heller | 2006-08-01 19:46:10 +0200 (Tue, 01 Aug 2006) | 1 line
Minimal useful docstring for CopyComPointer.
........
r51021 | andrew.kuchling | 2006-08-01 20:16:15 +0200 (Tue, 01 Aug 2006) | 8 lines
[Patch #1520905] Attempt to suppress core file created by test_subprocess.py.
Patch by Douglas Greiman.
The test_run_abort() testcase produces a core file on Unix systems,
even though the test is successful. This can be confusing or alarming
to someone who runs 'make test' and then finds that the Python
interpreter apparently crashed.
........
r51023 | georg.brandl | 2006-08-01 20:49:24 +0200 (Tue, 01 Aug 2006) | 3 lines
os.urandom no longer masks unrelated exceptions like SystemExit or
KeyboardInterrupt.
........
r51025 | thomas.heller | 2006-08-01 21:14:15 +0200 (Tue, 01 Aug 2006) | 2 lines
Speed up PyType_stgdict and PyObject_stgdict.
........
r51027 | ronald.oussoren | 2006-08-01 22:30:31 +0200 (Tue, 01 Aug 2006) | 3 lines
Make sure the postinstall action that optionally updates the user's profile
on MacOS X actually works correctly in all cases.
........
r51028 | ronald.oussoren | 2006-08-01 23:00:57 +0200 (Tue, 01 Aug 2006) | 4 lines
This fixes bug #1527397: PythonLauncher runs scripts with the wrong working
directory. It also fixes a bug where PythonLauncher failed to launch scripts
when the scriptname (or the path to the script) contains quotes.
........
r51031 | tim.peters | 2006-08-02 05:27:46 +0200 (Wed, 02 Aug 2006) | 2 lines
Whitespace normalization.
........
r51032 | tim.peters | 2006-08-02 06:12:36 +0200 (Wed, 02 Aug 2006) | 19 lines
Try to squash struct.pack warnings on the "amd64 gentoo trunk"
buildbot (& possibly other 64-bit boxes) during test_gzip.
The native zlib crc32 function returns an unsigned 32-bit integer,
which the Python wrapper implicitly casts to C long. Therefore the
same crc can "look negative" on a 32-bit box but "look positive" on
a 64-bit box. This patch papers over that platform difference when
writing the crc to file.
It may be better to change the Python wrapper, either to make
the result "look positive" on all platforms (which means it may
have to return a Python long at times on a 32-bit box), or to
keep the sign the same across boxes. But that would be a visible
change in what users see, while the current hack changes no
visible behavior (well, apart from stopping the struct deprecation
warning).
Note that the module-level write32() function is no longer used.
........
r51033 | neal.norwitz | 2006-08-02 06:27:11 +0200 (Wed, 02 Aug 2006) | 4 lines
Prevent memory leak on error.
Reported by Klocwork #36
........
r51034 | tim.peters | 2006-08-02 07:20:08 +0200 (Wed, 02 Aug 2006) | 9 lines
_Stream.close(): Try to kill struct.pack() warnings when
writing the crc to file on the "PPC64 Debian trunk" buildbot
when running test_tarfile.
This is again a case where the native zlib crc is an unsigned
32-bit int, but the Python wrapper implicitly casts it to
signed C long, so that "the sign bit looks different" on
different platforms.
........
r51035 | ronald.oussoren | 2006-08-02 08:10:10 +0200 (Wed, 02 Aug 2006) | 2 lines
Updated documentation for the script that builds the OSX installer.
........
r51036 | neal.norwitz | 2006-08-02 08:14:22 +0200 (Wed, 02 Aug 2006) | 2 lines
_PyWeakref_GetWeakrefCount() now returns a Py_ssize_t instead of long.
........
r51037 | neal.norwitz | 2006-08-02 08:15:10 +0200 (Wed, 02 Aug 2006) | 1 line
v is already checked for NULL, so just DECREF it
........
r51038 | neal.norwitz | 2006-08-02 08:19:19 +0200 (Wed, 02 Aug 2006) | 1 line
Let us know when there was a problem and the child had to kill the parent
........
r51039 | neal.norwitz | 2006-08-02 08:46:21 +0200 (Wed, 02 Aug 2006) | 5 lines
Patch #1519025 and bug #926423: If a KeyboardInterrupt occurs during
a socket operation on a socket with a timeout, the exception will be
caught correctly. Previously, the exception was not caught.
........
r51040 | neal.norwitz | 2006-08-02 09:09:32 +0200 (Wed, 02 Aug 2006) | 1 line
Add some explanation about Klocwork and Coverity static analysis
........
r51041 | anthony.baxter | 2006-08-02 09:43:09 +0200 (Wed, 02 Aug 2006) | 1 line
pre-release machinations
........
r51043 | thomas.heller | 2006-08-02 13:35:31 +0200 (Wed, 02 Aug 2006) | 4 lines
A few nore words about what ctypes does.
Document that using the wrong calling convention can also raise
'ValueError: Procedure called with the wrong number of arguments'.
........
r51045 | thomas.heller | 2006-08-02 14:00:13 +0200 (Wed, 02 Aug 2006) | 1 line
Fix a mistake.
........
r51046 | martin.v.loewis | 2006-08-02 15:53:55 +0200 (Wed, 02 Aug 2006) | 3 lines
Correction of patch #1455898: In the mbcs decoder, set final=False
for stream decoder, but final=True for the decode function.
........
r51049 | tim.peters | 2006-08-02 20:19:35 +0200 (Wed, 02 Aug 2006) | 2 lines
Add missing svn:eol-style property to text files.
........
r51079 | neal.norwitz | 2006-08-04 06:50:21 +0200 (Fri, 04 Aug 2006) | 3 lines
Bug #1531405, format_exception no longer raises an exception if
str(exception) raised an exception.
........
r51080 | neal.norwitz | 2006-08-04 06:58:47 +0200 (Fri, 04 Aug 2006) | 11 lines
Bug #1191458: tracing over for loops now produces a line event
on each iteration. I'm not positive this is the best way to handle
this. I'm also not sure that there aren't other cases where
the lnotab is generated incorrectly. It would be great if people
that use pdb or tracing could test heavily.
Also:
* Remove dead/duplicated code that wasn't used/necessary
because we already handled the docstring prior to entering the loop.
* add some debugging code into the compiler (#if 0'd out).
........
r51081 | neal.norwitz | 2006-08-04 07:09:28 +0200 (Fri, 04 Aug 2006) | 4 lines
Bug #1333982: string/number constants were inappropriately stored
in the byte code and co_consts even if they were not used, ie
immediately popped off the stack.
........
r51082 | neal.norwitz | 2006-08-04 07:12:19 +0200 (Fri, 04 Aug 2006) | 1 line
There were really two issues
........
r51084 | fred.drake | 2006-08-04 07:17:21 +0200 (Fri, 04 Aug 2006) | 1 line
SF patch #1534048 (bug #1531003): fix typo in error message
........
r51085 | gregory.p.smith | 2006-08-04 07:17:47 +0200 (Fri, 04 Aug 2006) | 3 lines
fix typos
........
r51087 | georg.brandl | 2006-08-04 08:03:53 +0200 (Fri, 04 Aug 2006) | 3 lines
Fix bug caused by first decrefing, then increfing.
........
r51109 | neil.schemenauer | 2006-08-04 18:20:30 +0200 (Fri, 04 Aug 2006) | 5 lines
Fix the 'compiler' package to generate correct code for MAKE_CLOSURE.
In the 2.5 development cycle, MAKE_CLOSURE as changed to take free
variables as a tuple rather than as individual items on the stack.
Closes patch #1534084.
........
r51110 | georg.brandl | 2006-08-04 20:03:37 +0200 (Fri, 04 Aug 2006) | 3 lines
Change fix for segfaulting property(), add a NEWS entry and a test.
........
r51111 | georg.brandl | 2006-08-04 20:07:34 +0200 (Fri, 04 Aug 2006) | 3 lines
Better fix for bug #1531405, not executing str(value) twice.
........
r51112 | thomas.heller | 2006-08-04 20:17:40 +0200 (Fri, 04 Aug 2006) | 1 line
On Windows, make PyErr_Warn an exported function again.
........
r51113 | thomas.heller | 2006-08-04 20:57:34 +0200 (Fri, 04 Aug 2006) | 4 lines
Fix #1530448 - fix ctypes build failure on solaris 10.
The '-mimpure-text' linker flag is required when linking _ctypes.so.
........
r51114 | thomas.heller | 2006-08-04 21:49:31 +0200 (Fri, 04 Aug 2006) | 3 lines
Fix #1534738: win32 debug version of _msi must be _msi_d.pyd, not _msi.pyd.
Fix the name of the pdb file as well.
........
r51115 | andrew.kuchling | 2006-08-04 22:37:43 +0200 (Fri, 04 Aug 2006) | 1 line
Typo fixes
........
r51116 | andrew.kuchling | 2006-08-04 23:10:03 +0200 (Fri, 04 Aug 2006) | 1 line
Fix mangled sentence
........
r51118 | tim.peters | 2006-08-05 00:00:35 +0200 (Sat, 05 Aug 2006) | 2 lines
Whitespace normalization.
........
r51119 | bob.ippolito | 2006-08-05 01:59:21 +0200 (Sat, 05 Aug 2006) | 5 lines
Fix #1530559, struct.pack raises TypeError where it used to convert.
Passing float arguments to struct.pack when integers are expected
now triggers a DeprecationWarning.
........
r51123 | georg.brandl | 2006-08-05 08:10:54 +0200 (Sat, 05 Aug 2006) | 3 lines
Patch #1534922: correct and enhance unittest docs.
........
r51126 | georg.brandl | 2006-08-06 09:06:33 +0200 (Sun, 06 Aug 2006) | 2 lines
Bug #1535182: really test the xreadlines() method of bz2 objects.
........
r51128 | georg.brandl | 2006-08-06 09:26:21 +0200 (Sun, 06 Aug 2006) | 4 lines
Bug #1535081: A leading underscore has been added to the names of
the md5 and sha modules, so add it in Modules/Setup.dist too.
........
r51129 | georg.brandl | 2006-08-06 10:23:54 +0200 (Sun, 06 Aug 2006) | 3 lines
Bug #1535165: fixed a segfault in input() and raw_input() when
sys.stdin is closed.
........
r51131 | georg.brandl | 2006-08-06 11:17:16 +0200 (Sun, 06 Aug 2006) | 2 lines
Don't produce output in test_builtin.
........
r51133 | andrew.macintyre | 2006-08-06 14:37:03 +0200 (Sun, 06 Aug 2006) | 4 lines
test_threading now skips testing alternate thread stack sizes on
platforms that don't support changing thread stack size.
........
r51134 | andrew.kuchling | 2006-08-07 00:07:04 +0200 (Mon, 07 Aug 2006) | 2 lines
[Patch #1464056] Ensure that we use the panelw library when linking with ncursesw.
Once I see how the buildbots react, I'll backport this to 2.4.
........
r51137 | georg.brandl | 2006-08-08 13:52:34 +0200 (Tue, 08 Aug 2006) | 3 lines
webbrowser: Silence stderr output if no gconftool or gnome browser found
........
r51138 | georg.brandl | 2006-08-08 13:56:21 +0200 (Tue, 08 Aug 2006) | 7 lines
Remove "non-mapping" and "non-sequence" from TypeErrors raised by
PyMapping_Size and PySequence_Size.
Because len() tries first sequence, then mapping size, it will always
raise a "non-mapping object has no len" error which is confusing.
........
r51139 | thomas.heller | 2006-08-08 19:37:00 +0200 (Tue, 08 Aug 2006) | 3 lines
memcmp() can return values other than -1, 0, and +1 but tp_compare
must not.
........
r51140 | thomas.heller | 2006-08-08 19:39:20 +0200 (Tue, 08 Aug 2006) | 1 line
Remove accidently committed, duplicated test.
........
r51147 | andrew.kuchling | 2006-08-08 20:50:14 +0200 (Tue, 08 Aug 2006) | 1 line
Reword paragraph to clarify
........
r51148 | andrew.kuchling | 2006-08-08 20:56:08 +0200 (Tue, 08 Aug 2006) | 1 line
Move obmalloc item into C API section
........
r51149 | andrew.kuchling | 2006-08-08 21:00:14 +0200 (Tue, 08 Aug 2006) | 1 line
'Other changes' section now has only one item; move the item elsewhere and remove the section
........
r51150 | andrew.kuchling | 2006-08-08 21:00:34 +0200 (Tue, 08 Aug 2006) | 1 line
Bump version number
........
r51151 | georg.brandl | 2006-08-08 22:11:22 +0200 (Tue, 08 Aug 2006) | 2 lines
Bug #1536828: typo: TypeType should have been StringType.
........
r51153 | georg.brandl | 2006-08-08 22:13:13 +0200 (Tue, 08 Aug 2006) | 2 lines
Bug #1536660: separate two words.
........
r51155 | georg.brandl | 2006-08-08 22:48:10 +0200 (Tue, 08 Aug 2006) | 3 lines
``str`` is now the same object as ``types.StringType``.
........
r51156 | tim.peters | 2006-08-09 02:52:26 +0200 (Wed, 09 Aug 2006) | 2 lines
Whitespace normalization.
........
r51158 | georg.brandl | 2006-08-09 09:03:22 +0200 (Wed, 09 Aug 2006) | 4 lines
Introduce an upper bound on tuple nesting depth in
C argument format strings; fixes rest of #1523610.
........
r51160 | martin.v.loewis | 2006-08-09 09:57:39 +0200 (Wed, 09 Aug 2006) | 4 lines
__hash__ may now return long int; the final hash
value is obtained by invoking hash on the long int.
Fixes #1536021.
........
r51168 | andrew.kuchling | 2006-08-09 15:03:41 +0200 (Wed, 09 Aug 2006) | 1 line
[Bug #1536021] Mention __hash__ change
........
r51169 | andrew.kuchling | 2006-08-09 15:57:05 +0200 (Wed, 09 Aug 2006) | 1 line
[Patch #1534027] Add notes on locale module changes
........
r51170 | andrew.kuchling | 2006-08-09 16:05:35 +0200 (Wed, 09 Aug 2006) | 1 line
Add missing 'self' parameters
........
r51171 | andrew.kuchling | 2006-08-09 16:06:19 +0200 (Wed, 09 Aug 2006) | 1 line
Reindent code
........
r51172 | armin.rigo | 2006-08-09 16:55:26 +0200 (Wed, 09 Aug 2006) | 2 lines
Fix and test for an infinite C recursion.
........
r51173 | ronald.oussoren | 2006-08-09 16:56:33 +0200 (Wed, 09 Aug 2006) | 2 lines
It's unlikely that future versions will require _POSIX_C_SOURCE
........
r51178 | armin.rigo | 2006-08-09 17:37:26 +0200 (Wed, 09 Aug 2006) | 2 lines
Concatenation on a long string breaks (SF #1526585).
........
r51180 | kurt.kaiser | 2006-08-09 18:46:15 +0200 (Wed, 09 Aug 2006) | 8 lines
1. When used w/o subprocess, all exceptions were preceeded by an error
message claiming they were IDLE internal errors (since 1.2a1).
2. Add Ronald Oussoren to CREDITS
M NEWS.txt
M PyShell.py
M CREDITS.txt
........
r51181 | kurt.kaiser | 2006-08-09 19:47:15 +0200 (Wed, 09 Aug 2006) | 4 lines
As a slight enhancement to the previous checkin, improve the
internal error reporting by moving message to IDLE console.
........
r51182 | andrew.kuchling | 2006-08-09 20:23:14 +0200 (Wed, 09 Aug 2006) | 1 line
Typo fix
........
r51183 | kurt.kaiser | 2006-08-09 22:34:46 +0200 (Wed, 09 Aug 2006) | 2 lines
ToggleTab dialog was setting indent to 8 even if cancelled (since 1.2a1).
........
r51184 | martin.v.loewis | 2006-08-10 01:42:18 +0200 (Thu, 10 Aug 2006) | 2 lines
Add some commentary on -mimpure-text.
........
r51185 | tim.peters | 2006-08-10 02:58:49 +0200 (Thu, 10 Aug 2006) | 2 lines
Add missing svn:eol-style property to text files.
........
r51186 | kurt.kaiser | 2006-08-10 03:41:17 +0200 (Thu, 10 Aug 2006) | 2 lines
Changing tokenize (39046) to detect dedent broke tabnanny check (since 1.2a1)
........
r51187 | tim.peters | 2006-08-10 05:01:26 +0200 (Thu, 10 Aug 2006) | 13 lines
test_copytree_simple(): This was leaving behind two new temp
directories each time it ran, at least on Windows.
Several changes: explicitly closed all files; wrapped long
lines; stopped suppressing errors when removing a file or
directory fails (removing /shouldn't/ fail!); and changed
what appeared to be incorrect usage of os.removedirs() (that
doesn't remove empty directories at and /under/ the given
path, instead it must be given an empty leaf directory and
then deletes empty directories moving /up/ the path -- could
be that the conceptually simpler shutil.rmtree() was really
actually intended here).
........
2006-08-11 22:57:12 +08:00
|
|
|
type_error(const char *msg, PyObject *obj)
|
1995-07-18 22:12:02 +08:00
|
|
|
{
|
2020-02-07 08:53:23 +08:00
|
|
|
PyErr_Format(PyExc_TypeError, msg, Py_TYPE(obj)->tp_name);
|
2010-05-09 23:52:27 +08:00
|
|
|
return NULL;
|
1995-07-18 22:12:02 +08:00
|
|
|
}
|
|
|
|
|
1996-11-11 23:08:19 +08:00
|
|
|
static PyObject *
|
2000-07-09 12:06:11 +08:00
|
|
|
null_error(void)
|
1995-07-18 22:12:02 +08:00
|
|
|
{
|
2020-06-23 21:55:06 +08:00
|
|
|
PyThreadState *tstate = _PyThreadState_GET();
|
|
|
|
if (!_PyErr_Occurred(tstate)) {
|
|
|
|
_PyErr_SetString(tstate, PyExc_SystemError,
|
|
|
|
"null argument to internal routine");
|
|
|
|
}
|
2010-05-09 23:52:27 +08:00
|
|
|
return NULL;
|
1995-07-18 22:12:02 +08:00
|
|
|
}
|
|
|
|
|
1998-05-22 08:47:05 +08:00
|
|
|
/* Operations on any object */
|
|
|
|
|
1995-07-18 22:12:02 +08:00
|
|
|
PyObject *
|
2000-07-09 12:06:11 +08:00
|
|
|
PyObject_Type(PyObject *o)
|
1995-07-18 22:12:02 +08:00
|
|
|
{
|
2010-05-09 23:52:27 +08:00
|
|
|
PyObject *v;
|
1995-07-18 22:12:02 +08:00
|
|
|
|
2016-08-19 22:59:55 +08:00
|
|
|
if (o == NULL) {
|
2010-05-09 23:52:27 +08:00
|
|
|
return null_error();
|
2016-08-19 22:59:55 +08:00
|
|
|
}
|
|
|
|
|
2020-02-07 08:53:23 +08:00
|
|
|
v = (PyObject *)Py_TYPE(o);
|
2010-05-09 23:52:27 +08:00
|
|
|
Py_INCREF(v);
|
|
|
|
return v;
|
1995-07-18 22:12:02 +08:00
|
|
|
}
|
|
|
|
|
2006-02-16 01:27:45 +08:00
|
|
|
Py_ssize_t
|
2000-07-12 20:56:19 +08:00
|
|
|
PyObject_Size(PyObject *o)
|
1995-07-18 22:12:02 +08:00
|
|
|
{
|
2010-05-09 23:52:27 +08:00
|
|
|
if (o == NULL) {
|
|
|
|
null_error();
|
|
|
|
return -1;
|
|
|
|
}
|
1995-07-18 22:12:02 +08:00
|
|
|
|
2021-01-29 23:53:03 +08:00
|
|
|
PySequenceMethods *m = Py_TYPE(o)->tp_as_sequence;
|
2017-04-16 14:21:44 +08:00
|
|
|
if (m && m->sq_length) {
|
|
|
|
Py_ssize_t len = m->sq_length(o);
|
2021-01-28 00:39:16 +08:00
|
|
|
assert(_Py_CheckSlotResult(o, "__len__", len >= 0));
|
2017-04-16 14:21:44 +08:00
|
|
|
return len;
|
|
|
|
}
|
1995-07-18 22:12:02 +08:00
|
|
|
|
2010-05-09 23:52:27 +08:00
|
|
|
return PyMapping_Size(o);
|
1995-07-18 22:12:02 +08:00
|
|
|
}
|
|
|
|
|
2000-07-17 17:22:55 +08:00
|
|
|
#undef PyObject_Length
|
2006-02-16 01:27:45 +08:00
|
|
|
Py_ssize_t
|
2000-07-17 17:22:55 +08:00
|
|
|
PyObject_Length(PyObject *o)
|
|
|
|
{
|
2010-05-09 23:52:27 +08:00
|
|
|
return PyObject_Size(o);
|
2000-07-17 17:22:55 +08:00
|
|
|
}
|
|
|
|
#define PyObject_Length PyObject_Size
|
|
|
|
|
2012-10-06 20:03:24 +08:00
|
|
|
int
|
|
|
|
_PyObject_HasLen(PyObject *o) {
|
|
|
|
return (Py_TYPE(o)->tp_as_sequence && Py_TYPE(o)->tp_as_sequence->sq_length) ||
|
|
|
|
(Py_TYPE(o)->tp_as_mapping && Py_TYPE(o)->tp_as_mapping->mp_length);
|
|
|
|
}
|
Merged revisions 59376-59406 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r59377 | georg.brandl | 2007-12-06 01:24:23 +0100 (Thu, 06 Dec 2007) | 2 lines
Add another GHOP student to ACKS.
........
r59378 | raymond.hettinger | 2007-12-06 01:56:53 +0100 (Thu, 06 Dec 2007) | 5 lines
Fix Issue 1045.
Factor-out common calling code by simplifying the length_hint API.
Speed-up the function by caching the PyObject_String for the attribute lookup.
........
r59380 | georg.brandl | 2007-12-06 02:52:24 +0100 (Thu, 06 Dec 2007) | 2 lines
Diverse markup fixes.
........
r59383 | georg.brandl | 2007-12-06 10:45:39 +0100 (Thu, 06 Dec 2007) | 2 lines
Better re.split examples.
........
r59386 | christian.heimes | 2007-12-06 14:15:13 +0100 (Thu, 06 Dec 2007) | 2 lines
Fixed get_config_h_filename for Windows. Without the patch it can't find the pyconfig.h file inside a build tree.
Added several small unit tests for sysconfig.
........
r59387 | christian.heimes | 2007-12-06 14:30:11 +0100 (Thu, 06 Dec 2007) | 1 line
Silence more warnings, _CRT_NONSTDC_NO_DEPRECATE is already defined in pyconfig.h but several projects don't include it.
........
r59389 | christian.heimes | 2007-12-06 14:55:01 +0100 (Thu, 06 Dec 2007) | 1 line
Disabled one test that is failing on Unix
........
r59399 | christian.heimes | 2007-12-06 22:13:06 +0100 (Thu, 06 Dec 2007) | 8 lines
Several Windows related cleanups:
* Removed a #define from pyconfig.h. The macro was already defined a few lines higher.
* Fixed path to tix in the build_tkinter.py script
* Changed make_buildinfo.c to use versions of unlink and strcat which are considered safe by Windows (as suggested by MvL).
* Removed two defines from pyproject.vsprops that are no longer required. Both are defined in pyconfig.h and make_buildinfo.c doesn't use the unsafe versions any more (as suggested by MvL).
* Added some more information about PGO and the property files to PCbuild9/readme.txt.
Are you fine with the changes, Martin?
........
r59400 | raymond.hettinger | 2007-12-07 02:53:01 +0100 (Fri, 07 Dec 2007) | 4 lines
Don't have the docs berate themselves. Keep a professional tone.
If a todo is needed, put it in the tracker.
........
r59402 | georg.brandl | 2007-12-07 10:07:10 +0100 (Fri, 07 Dec 2007) | 3 lines
Increase unit test coverage of SimpleXMLRPCServer.
Written for GHOP by Turkay Eren.
........
r59406 | georg.brandl | 2007-12-07 16:16:57 +0100 (Fri, 07 Dec 2007) | 2 lines
Update to windows doc from Robert.
........
2007-12-08 23:33:56 +08:00
|
|
|
|
|
|
|
/* The length hint function returns a non-negative value from o.__len__()
|
2012-10-07 16:29:32 +08:00
|
|
|
or o.__length_hint__(). If those methods aren't found the defaultvalue is
|
|
|
|
returned. If one of the calls fails with an exception other than TypeError
|
|
|
|
this function returns -1.
|
Merged revisions 59376-59406 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r59377 | georg.brandl | 2007-12-06 01:24:23 +0100 (Thu, 06 Dec 2007) | 2 lines
Add another GHOP student to ACKS.
........
r59378 | raymond.hettinger | 2007-12-06 01:56:53 +0100 (Thu, 06 Dec 2007) | 5 lines
Fix Issue 1045.
Factor-out common calling code by simplifying the length_hint API.
Speed-up the function by caching the PyObject_String for the attribute lookup.
........
r59380 | georg.brandl | 2007-12-06 02:52:24 +0100 (Thu, 06 Dec 2007) | 2 lines
Diverse markup fixes.
........
r59383 | georg.brandl | 2007-12-06 10:45:39 +0100 (Thu, 06 Dec 2007) | 2 lines
Better re.split examples.
........
r59386 | christian.heimes | 2007-12-06 14:15:13 +0100 (Thu, 06 Dec 2007) | 2 lines
Fixed get_config_h_filename for Windows. Without the patch it can't find the pyconfig.h file inside a build tree.
Added several small unit tests for sysconfig.
........
r59387 | christian.heimes | 2007-12-06 14:30:11 +0100 (Thu, 06 Dec 2007) | 1 line
Silence more warnings, _CRT_NONSTDC_NO_DEPRECATE is already defined in pyconfig.h but several projects don't include it.
........
r59389 | christian.heimes | 2007-12-06 14:55:01 +0100 (Thu, 06 Dec 2007) | 1 line
Disabled one test that is failing on Unix
........
r59399 | christian.heimes | 2007-12-06 22:13:06 +0100 (Thu, 06 Dec 2007) | 8 lines
Several Windows related cleanups:
* Removed a #define from pyconfig.h. The macro was already defined a few lines higher.
* Fixed path to tix in the build_tkinter.py script
* Changed make_buildinfo.c to use versions of unlink and strcat which are considered safe by Windows (as suggested by MvL).
* Removed two defines from pyproject.vsprops that are no longer required. Both are defined in pyconfig.h and make_buildinfo.c doesn't use the unsafe versions any more (as suggested by MvL).
* Added some more information about PGO and the property files to PCbuild9/readme.txt.
Are you fine with the changes, Martin?
........
r59400 | raymond.hettinger | 2007-12-07 02:53:01 +0100 (Fri, 07 Dec 2007) | 4 lines
Don't have the docs berate themselves. Keep a professional tone.
If a todo is needed, put it in the tracker.
........
r59402 | georg.brandl | 2007-12-07 10:07:10 +0100 (Fri, 07 Dec 2007) | 3 lines
Increase unit test coverage of SimpleXMLRPCServer.
Written for GHOP by Turkay Eren.
........
r59406 | georg.brandl | 2007-12-07 16:16:57 +0100 (Fri, 07 Dec 2007) | 2 lines
Update to windows doc from Robert.
........
2007-12-08 23:33:56 +08:00
|
|
|
*/
|
|
|
|
|
2006-02-16 01:27:45 +08:00
|
|
|
Py_ssize_t
|
2012-10-06 20:03:24 +08:00
|
|
|
PyObject_LengthHint(PyObject *o, Py_ssize_t defaultvalue)
|
2005-09-25 05:23:05 +08:00
|
|
|
{
|
2012-10-06 23:16:39 +08:00
|
|
|
PyObject *hint, *result;
|
2012-10-06 23:13:29 +08:00
|
|
|
Py_ssize_t res;
|
2012-01-23 00:24:29 +08:00
|
|
|
_Py_IDENTIFIER(__length_hint__);
|
2013-10-25 04:19:51 +08:00
|
|
|
if (_PyObject_HasLen(o)) {
|
|
|
|
res = PyObject_Length(o);
|
2017-04-16 14:21:44 +08:00
|
|
|
if (res < 0) {
|
2020-06-23 21:55:06 +08:00
|
|
|
PyThreadState *tstate = _PyThreadState_GET();
|
|
|
|
assert(_PyErr_Occurred(tstate));
|
|
|
|
if (!_PyErr_ExceptionMatches(tstate, PyExc_TypeError)) {
|
2013-10-25 04:19:51 +08:00
|
|
|
return -1;
|
|
|
|
}
|
2020-06-23 21:55:06 +08:00
|
|
|
_PyErr_Clear(tstate);
|
2013-10-25 04:19:51 +08:00
|
|
|
}
|
|
|
|
else {
|
|
|
|
return res;
|
2012-10-06 20:03:24 +08:00
|
|
|
}
|
|
|
|
}
|
2012-10-06 23:13:29 +08:00
|
|
|
hint = _PyObject_LookupSpecial(o, &PyId___length_hint__);
|
2012-10-06 20:03:24 +08:00
|
|
|
if (hint == NULL) {
|
|
|
|
if (PyErr_Occurred()) {
|
2010-05-09 23:52:27 +08:00
|
|
|
return -1;
|
2012-10-06 20:03:24 +08:00
|
|
|
}
|
|
|
|
return defaultvalue;
|
|
|
|
}
|
2016-12-07 01:46:19 +08:00
|
|
|
result = _PyObject_CallNoArg(hint);
|
2012-10-06 20:03:24 +08:00
|
|
|
Py_DECREF(hint);
|
|
|
|
if (result == NULL) {
|
2020-06-23 21:55:06 +08:00
|
|
|
PyThreadState *tstate = _PyThreadState_GET();
|
|
|
|
if (_PyErr_ExceptionMatches(tstate, PyExc_TypeError)) {
|
|
|
|
_PyErr_Clear(tstate);
|
2010-05-09 23:52:27 +08:00
|
|
|
return defaultvalue;
|
2012-10-06 20:03:24 +08:00
|
|
|
}
|
|
|
|
return -1;
|
2010-05-09 23:52:27 +08:00
|
|
|
}
|
2012-10-06 20:03:24 +08:00
|
|
|
else if (result == Py_NotImplemented) {
|
|
|
|
Py_DECREF(result);
|
2010-05-09 23:52:27 +08:00
|
|
|
return defaultvalue;
|
|
|
|
}
|
2012-10-06 20:03:24 +08:00
|
|
|
if (!PyLong_Check(result)) {
|
2012-10-07 16:29:32 +08:00
|
|
|
PyErr_Format(PyExc_TypeError, "__length_hint__ must be an integer, not %.100s",
|
2012-10-06 20:03:24 +08:00
|
|
|
Py_TYPE(result)->tp_name);
|
|
|
|
Py_DECREF(result);
|
|
|
|
return -1;
|
|
|
|
}
|
2012-10-07 16:29:32 +08:00
|
|
|
res = PyLong_AsSsize_t(result);
|
2012-10-06 20:03:24 +08:00
|
|
|
Py_DECREF(result);
|
2012-10-07 16:29:32 +08:00
|
|
|
if (res < 0 && PyErr_Occurred()) {
|
2012-10-06 20:03:24 +08:00
|
|
|
return -1;
|
|
|
|
}
|
2012-10-07 16:29:32 +08:00
|
|
|
if (res < 0) {
|
2012-10-06 20:03:24 +08:00
|
|
|
PyErr_Format(PyExc_ValueError, "__length_hint__() should return >= 0");
|
|
|
|
return -1;
|
|
|
|
}
|
2012-10-07 16:29:32 +08:00
|
|
|
return res;
|
2005-09-25 05:23:05 +08:00
|
|
|
}
|
|
|
|
|
1995-07-18 22:12:02 +08:00
|
|
|
PyObject *
|
2000-07-09 12:06:11 +08:00
|
|
|
PyObject_GetItem(PyObject *o, PyObject *key)
|
1995-07-18 22:12:02 +08:00
|
|
|
{
|
2016-08-19 22:59:55 +08:00
|
|
|
if (o == NULL || key == NULL) {
|
2010-05-09 23:52:27 +08:00
|
|
|
return null_error();
|
2016-08-19 22:59:55 +08:00
|
|
|
}
|
2010-05-09 23:52:27 +08:00
|
|
|
|
2021-01-29 23:53:03 +08:00
|
|
|
PyMappingMethods *m = Py_TYPE(o)->tp_as_mapping;
|
2015-11-05 20:56:58 +08:00
|
|
|
if (m && m->mp_subscript) {
|
|
|
|
PyObject *item = m->mp_subscript(o, key);
|
2021-01-28 00:39:16 +08:00
|
|
|
assert(_Py_CheckSlotResult(o, "__getitem__", item != NULL));
|
2015-11-05 20:56:58 +08:00
|
|
|
return item;
|
|
|
|
}
|
2010-05-09 23:52:27 +08:00
|
|
|
|
2021-01-29 23:53:03 +08:00
|
|
|
PySequenceMethods *ms = Py_TYPE(o)->tp_as_sequence;
|
2019-02-18 07:13:46 +08:00
|
|
|
if (ms && ms->sq_item) {
|
2020-04-08 08:01:56 +08:00
|
|
|
if (_PyIndex_Check(key)) {
|
2010-05-09 23:52:27 +08:00
|
|
|
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);
|
|
|
|
}
|
2019-02-18 07:13:46 +08:00
|
|
|
else {
|
2010-05-09 23:52:27 +08:00
|
|
|
return type_error("sequence index must "
|
|
|
|
"be integer, not '%.200s'", key);
|
2019-02-18 07:13:46 +08:00
|
|
|
}
|
2010-05-09 23:52:27 +08:00
|
|
|
}
|
1998-05-22 08:47:05 +08:00
|
|
|
|
2017-12-15 06:32:56 +08:00
|
|
|
if (PyType_Check(o)) {
|
2019-07-04 18:31:34 +08:00
|
|
|
PyObject *meth, *result;
|
2017-12-15 06:32:56 +08:00
|
|
|
_Py_IDENTIFIER(__class_getitem__);
|
2020-04-08 08:01:56 +08:00
|
|
|
|
2020-04-08 00:50:06 +08:00
|
|
|
// Special case type[int], but disallow other types so str[int] fails
|
|
|
|
if ((PyTypeObject*)o == &PyType_Type) {
|
|
|
|
return Py_GenericAlias(o, key);
|
|
|
|
}
|
|
|
|
|
2018-01-25 16:49:40 +08:00
|
|
|
if (_PyObject_LookupAttrId(o, &PyId___class_getitem__, &meth) < 0) {
|
|
|
|
return NULL;
|
|
|
|
}
|
2017-12-15 06:32:56 +08:00
|
|
|
if (meth) {
|
2020-02-12 00:46:57 +08:00
|
|
|
result = PyObject_CallOneArg(meth, key);
|
2017-12-15 06:32:56 +08:00
|
|
|
Py_DECREF(meth);
|
|
|
|
return result;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2010-05-09 23:52:27 +08:00
|
|
|
return type_error("'%.200s' object is not subscriptable", o);
|
1995-07-18 22:12:02 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
int
|
2000-07-09 12:06:11 +08:00
|
|
|
PyObject_SetItem(PyObject *o, PyObject *key, PyObject *value)
|
1995-07-18 22:12:02 +08:00
|
|
|
{
|
2010-05-09 23:52:27 +08:00
|
|
|
if (o == NULL || key == NULL || value == NULL) {
|
|
|
|
null_error();
|
|
|
|
return -1;
|
|
|
|
}
|
2021-01-29 23:53:03 +08:00
|
|
|
|
|
|
|
PyMappingMethods *m = Py_TYPE(o)->tp_as_mapping;
|
|
|
|
if (m && m->mp_ass_subscript) {
|
|
|
|
int res = m->mp_ass_subscript(o, key, value);
|
|
|
|
assert(_Py_CheckSlotResult(o, "__setitem__", res >= 0));
|
|
|
|
return res;
|
|
|
|
}
|
2010-05-09 23:52:27 +08:00
|
|
|
|
2020-02-07 08:53:23 +08:00
|
|
|
if (Py_TYPE(o)->tp_as_sequence) {
|
2020-04-08 08:01:56 +08:00
|
|
|
if (_PyIndex_Check(key)) {
|
2010-05-09 23:52:27 +08:00
|
|
|
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);
|
|
|
|
}
|
2020-02-07 08:53:23 +08:00
|
|
|
else if (Py_TYPE(o)->tp_as_sequence->sq_ass_item) {
|
2010-05-09 23:52:27 +08:00
|
|
|
type_error("sequence index must be "
|
|
|
|
"integer, not '%.200s'", key);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
type_error("'%.200s' object does not support item assignment", o);
|
|
|
|
return -1;
|
1995-07-18 22:12:02 +08:00
|
|
|
}
|
|
|
|
|
1996-08-22 01:41:54 +08:00
|
|
|
int
|
2000-07-09 12:06:11 +08:00
|
|
|
PyObject_DelItem(PyObject *o, PyObject *key)
|
1996-08-22 01:41:54 +08:00
|
|
|
{
|
2010-05-09 23:52:27 +08:00
|
|
|
if (o == NULL || key == NULL) {
|
|
|
|
null_error();
|
|
|
|
return -1;
|
|
|
|
}
|
2021-01-29 23:53:03 +08:00
|
|
|
|
|
|
|
PyMappingMethods *m = Py_TYPE(o)->tp_as_mapping;
|
|
|
|
if (m && m->mp_ass_subscript) {
|
|
|
|
int res = m->mp_ass_subscript(o, key, (PyObject*)NULL);
|
|
|
|
assert(_Py_CheckSlotResult(o, "__delitem__", res >= 0));
|
|
|
|
return res;
|
|
|
|
}
|
2010-05-09 23:52:27 +08:00
|
|
|
|
2020-02-07 08:53:23 +08:00
|
|
|
if (Py_TYPE(o)->tp_as_sequence) {
|
2020-04-08 08:01:56 +08:00
|
|
|
if (_PyIndex_Check(key)) {
|
2010-05-09 23:52:27 +08:00
|
|
|
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);
|
|
|
|
}
|
2020-02-07 08:53:23 +08:00
|
|
|
else if (Py_TYPE(o)->tp_as_sequence->sq_ass_item) {
|
2010-05-09 23:52:27 +08:00
|
|
|
type_error("sequence index must be "
|
|
|
|
"integer, not '%.200s'", key);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
type_error("'%.200s' object does not support item deletion", o);
|
|
|
|
return -1;
|
1996-08-22 01:41:54 +08:00
|
|
|
}
|
|
|
|
|
2002-01-05 18:50:30 +08:00
|
|
|
int
|
2013-10-20 02:03:34 +08:00
|
|
|
PyObject_DelItemString(PyObject *o, const char *key)
|
2002-01-05 18:50:30 +08:00
|
|
|
{
|
2010-05-09 23:52:27 +08:00
|
|
|
PyObject *okey;
|
|
|
|
int ret;
|
2002-01-05 18:50:30 +08:00
|
|
|
|
2010-05-09 23:52:27 +08:00
|
|
|
if (o == NULL || key == NULL) {
|
|
|
|
null_error();
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
okey = PyUnicode_FromString(key);
|
|
|
|
if (okey == NULL)
|
|
|
|
return -1;
|
|
|
|
ret = PyObject_DelItem(o, okey);
|
|
|
|
Py_DECREF(okey);
|
|
|
|
return ret;
|
2002-01-05 18:50:30 +08:00
|
|
|
}
|
|
|
|
|
2020-04-08 07:13:53 +08:00
|
|
|
|
|
|
|
/* Return 1 if the getbuffer function is available, otherwise return 0. */
|
|
|
|
int
|
|
|
|
PyObject_CheckBuffer(PyObject *obj)
|
|
|
|
{
|
|
|
|
PyBufferProcs *tp_as_buffer = Py_TYPE(obj)->tp_as_buffer;
|
|
|
|
return (tp_as_buffer != NULL && tp_as_buffer->bf_getbuffer != NULL);
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2007-08-18 19:21:56 +08:00
|
|
|
/* Buffer C-API for Python 3.0 */
|
|
|
|
|
|
|
|
int
|
2007-09-23 10:00:13 +08:00
|
|
|
PyObject_GetBuffer(PyObject *obj, Py_buffer *view, int flags)
|
2007-08-18 19:21:56 +08:00
|
|
|
{
|
2020-02-07 08:53:23 +08:00
|
|
|
PyBufferProcs *pb = Py_TYPE(obj)->tp_as_buffer;
|
2015-02-03 07:21:08 +08:00
|
|
|
|
|
|
|
if (pb == NULL || pb->bf_getbuffer == NULL) {
|
2010-05-09 23:52:27 +08:00
|
|
|
PyErr_Format(PyExc_TypeError,
|
2014-10-05 23:47:01 +08:00
|
|
|
"a bytes-like object is required, not '%.100s'",
|
2010-05-09 23:52:27 +08:00
|
|
|
Py_TYPE(obj)->tp_name);
|
|
|
|
return -1;
|
|
|
|
}
|
2021-01-29 23:53:03 +08:00
|
|
|
int res = (*pb->bf_getbuffer)(obj, view, flags);
|
|
|
|
assert(_Py_CheckSlotResult(obj, "getbuffer", res >= 0));
|
|
|
|
return res;
|
2007-08-18 19:21:56 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
static int
|
2012-02-25 19:24:21 +08:00
|
|
|
_IsFortranContiguous(const Py_buffer *view)
|
2007-08-18 19:21:56 +08:00
|
|
|
{
|
2010-05-09 23:52:27 +08:00
|
|
|
Py_ssize_t sd, dim;
|
|
|
|
int i;
|
2007-11-07 05:34:58 +08:00
|
|
|
|
2015-02-01 21:53:54 +08:00
|
|
|
/* 1) len = product(shape) * itemsize
|
|
|
|
2) itemsize > 0
|
|
|
|
3) len = 0 <==> exists i: shape[i] = 0 */
|
|
|
|
if (view->len == 0) return 1;
|
|
|
|
if (view->strides == NULL) { /* C-contiguous by definition */
|
|
|
|
/* Trivially F-contiguous */
|
|
|
|
if (view->ndim <= 1) return 1;
|
|
|
|
|
|
|
|
/* ndim > 1 implies shape != NULL */
|
|
|
|
assert(view->shape != NULL);
|
|
|
|
|
|
|
|
/* Effectively 1-d */
|
|
|
|
sd = 0;
|
|
|
|
for (i=0; i<view->ndim; i++) {
|
|
|
|
if (view->shape[i] > 1) sd += 1;
|
|
|
|
}
|
|
|
|
return sd <= 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* strides != NULL implies both of these */
|
|
|
|
assert(view->ndim > 0);
|
|
|
|
assert(view->shape != NULL);
|
2007-10-13 07:27:53 +08:00
|
|
|
|
2010-05-09 23:52:27 +08:00
|
|
|
sd = view->itemsize;
|
|
|
|
for (i=0; i<view->ndim; i++) {
|
|
|
|
dim = view->shape[i];
|
2015-02-01 21:53:54 +08:00
|
|
|
if (dim > 1 && view->strides[i] != sd) {
|
|
|
|
return 0;
|
|
|
|
}
|
2010-05-09 23:52:27 +08:00
|
|
|
sd *= dim;
|
|
|
|
}
|
|
|
|
return 1;
|
2007-08-18 19:21:56 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
static int
|
2012-02-25 19:24:21 +08:00
|
|
|
_IsCContiguous(const Py_buffer *view)
|
2007-08-18 19:21:56 +08:00
|
|
|
{
|
2010-05-09 23:52:27 +08:00
|
|
|
Py_ssize_t sd, dim;
|
|
|
|
int i;
|
2007-11-07 05:34:58 +08:00
|
|
|
|
2015-02-01 21:53:54 +08:00
|
|
|
/* 1) len = product(shape) * itemsize
|
|
|
|
2) itemsize > 0
|
|
|
|
3) len = 0 <==> exists i: shape[i] = 0 */
|
|
|
|
if (view->len == 0) return 1;
|
|
|
|
if (view->strides == NULL) return 1; /* C-contiguous by definition */
|
|
|
|
|
|
|
|
/* strides != NULL implies both of these */
|
|
|
|
assert(view->ndim > 0);
|
|
|
|
assert(view->shape != NULL);
|
2007-08-18 19:21:56 +08:00
|
|
|
|
2010-05-09 23:52:27 +08:00
|
|
|
sd = view->itemsize;
|
|
|
|
for (i=view->ndim-1; i>=0; i--) {
|
|
|
|
dim = view->shape[i];
|
2015-02-01 21:53:54 +08:00
|
|
|
if (dim > 1 && view->strides[i] != sd) {
|
|
|
|
return 0;
|
|
|
|
}
|
2010-05-09 23:52:27 +08:00
|
|
|
sd *= dim;
|
|
|
|
}
|
|
|
|
return 1;
|
2007-08-18 19:21:56 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
int
|
2012-02-25 19:24:21 +08:00
|
|
|
PyBuffer_IsContiguous(const Py_buffer *view, char order)
|
2007-08-18 19:21:56 +08:00
|
|
|
{
|
|
|
|
|
2010-05-09 23:52:27 +08:00
|
|
|
if (view->suboffsets != NULL) return 0;
|
2007-08-18 19:21:56 +08:00
|
|
|
|
2012-02-25 19:24:21 +08:00
|
|
|
if (order == 'C')
|
2010-05-09 23:52:27 +08:00
|
|
|
return _IsCContiguous(view);
|
2012-02-25 19:24:21 +08:00
|
|
|
else if (order == 'F')
|
2010-05-09 23:52:27 +08:00
|
|
|
return _IsFortranContiguous(view);
|
2012-02-25 19:24:21 +08:00
|
|
|
else if (order == 'A')
|
2010-05-09 23:52:27 +08:00
|
|
|
return (_IsCContiguous(view) || _IsFortranContiguous(view));
|
|
|
|
return 0;
|
2007-08-18 19:21:56 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2007-11-07 05:34:58 +08:00
|
|
|
void*
|
2007-09-23 10:00:13 +08:00
|
|
|
PyBuffer_GetPointer(Py_buffer *view, Py_ssize_t *indices)
|
2007-08-18 19:21:56 +08:00
|
|
|
{
|
2010-05-09 23:52:27 +08:00
|
|
|
char* pointer;
|
|
|
|
int i;
|
|
|
|
pointer = (char *)view->buf;
|
|
|
|
for (i = 0; i < view->ndim; i++) {
|
|
|
|
pointer += view->strides[i]*indices[i];
|
|
|
|
if ((view->suboffsets != NULL) && (view->suboffsets[i] >= 0)) {
|
|
|
|
pointer = *((char**)pointer) + view->suboffsets[i];
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return (void*)pointer;
|
2007-08-18 19:21:56 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2007-11-07 05:34:58 +08:00
|
|
|
void
|
2010-09-01 20:58:21 +08:00
|
|
|
_Py_add_one_to_index_F(int nd, Py_ssize_t *index, const Py_ssize_t *shape)
|
2007-08-18 19:21:56 +08:00
|
|
|
{
|
2010-05-09 23:52:27 +08:00
|
|
|
int k;
|
2007-11-07 05:34:58 +08:00
|
|
|
|
2010-05-09 23:52:27 +08:00
|
|
|
for (k=0; k<nd; k++) {
|
|
|
|
if (index[k] < shape[k]-1) {
|
|
|
|
index[k]++;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
index[k] = 0;
|
|
|
|
}
|
|
|
|
}
|
2007-08-18 19:21:56 +08:00
|
|
|
}
|
|
|
|
|
2007-11-07 05:34:58 +08:00
|
|
|
void
|
2010-09-01 20:58:21 +08:00
|
|
|
_Py_add_one_to_index_C(int nd, Py_ssize_t *index, const Py_ssize_t *shape)
|
2007-08-18 19:21:56 +08:00
|
|
|
{
|
2010-05-09 23:52:27 +08:00
|
|
|
int k;
|
2007-08-18 19:21:56 +08:00
|
|
|
|
2010-05-09 23:52:27 +08:00
|
|
|
for (k=nd-1; k>=0; k--) {
|
|
|
|
if (index[k] < shape[k]-1) {
|
|
|
|
index[k]++;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
index[k] = 0;
|
|
|
|
}
|
|
|
|
}
|
2007-08-18 19:21:56 +08:00
|
|
|
}
|
|
|
|
|
2019-08-20 22:46:36 +08:00
|
|
|
Py_ssize_t
|
|
|
|
PyBuffer_SizeFromFormat(const char *format)
|
|
|
|
{
|
|
|
|
PyObject *structmodule = NULL;
|
|
|
|
PyObject *calcsize = NULL;
|
|
|
|
PyObject *res = NULL;
|
|
|
|
PyObject *fmt = NULL;
|
|
|
|
Py_ssize_t itemsize = -1;
|
|
|
|
|
|
|
|
structmodule = PyImport_ImportModule("struct");
|
|
|
|
if (structmodule == NULL) {
|
|
|
|
return itemsize;
|
|
|
|
}
|
|
|
|
|
|
|
|
calcsize = PyObject_GetAttrString(structmodule, "calcsize");
|
|
|
|
if (calcsize == NULL) {
|
|
|
|
goto done;
|
|
|
|
}
|
|
|
|
|
|
|
|
fmt = PyUnicode_FromString(format);
|
|
|
|
if (fmt == NULL) {
|
|
|
|
goto done;
|
|
|
|
}
|
|
|
|
|
|
|
|
res = PyObject_CallFunctionObjArgs(calcsize, fmt, NULL);
|
|
|
|
if (res == NULL) {
|
|
|
|
goto done;
|
|
|
|
}
|
|
|
|
|
|
|
|
itemsize = PyLong_AsSsize_t(res);
|
|
|
|
if (itemsize < 0) {
|
|
|
|
goto done;
|
|
|
|
}
|
|
|
|
|
|
|
|
done:
|
|
|
|
Py_DECREF(structmodule);
|
|
|
|
Py_XDECREF(calcsize);
|
|
|
|
Py_XDECREF(fmt);
|
|
|
|
Py_XDECREF(res);
|
|
|
|
return itemsize;
|
|
|
|
}
|
|
|
|
|
2007-08-18 19:21:56 +08:00
|
|
|
int
|
2007-09-23 10:00:13 +08:00
|
|
|
PyBuffer_FromContiguous(Py_buffer *view, void *buf, Py_ssize_t len, char fort)
|
2007-08-18 19:21:56 +08:00
|
|
|
{
|
2010-05-09 23:52:27 +08:00
|
|
|
int k;
|
2010-09-01 20:58:21 +08:00
|
|
|
void (*addone)(int, Py_ssize_t *, const Py_ssize_t *);
|
2010-05-09 23:52:27 +08:00
|
|
|
Py_ssize_t *indices, elements;
|
|
|
|
char *src, *ptr;
|
|
|
|
|
|
|
|
if (len > view->len) {
|
|
|
|
len = view->len;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (PyBuffer_IsContiguous(view, fort)) {
|
|
|
|
/* simplest copy is all that is needed */
|
|
|
|
memcpy(view->buf, buf, len);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Otherwise a more elaborate scheme is needed */
|
|
|
|
|
2015-02-01 23:19:23 +08:00
|
|
|
/* view->ndim <= 64 */
|
2010-05-09 23:52:27 +08:00
|
|
|
indices = (Py_ssize_t *)PyMem_Malloc(sizeof(Py_ssize_t)*(view->ndim));
|
|
|
|
if (indices == NULL) {
|
|
|
|
PyErr_NoMemory();
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
for (k=0; k<view->ndim;k++) {
|
|
|
|
indices[k] = 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (fort == 'F') {
|
2010-09-01 20:58:21 +08:00
|
|
|
addone = _Py_add_one_to_index_F;
|
2010-05-09 23:52:27 +08:00
|
|
|
}
|
|
|
|
else {
|
2010-09-01 20:58:21 +08:00
|
|
|
addone = _Py_add_one_to_index_C;
|
2010-05-09 23:52:27 +08:00
|
|
|
}
|
|
|
|
src = buf;
|
|
|
|
/* XXX : This is not going to be the fastest code in the world
|
|
|
|
several optimizations are possible.
|
|
|
|
*/
|
|
|
|
elements = len / view->itemsize;
|
|
|
|
while (elements--) {
|
|
|
|
ptr = PyBuffer_GetPointer(view, indices);
|
|
|
|
memcpy(ptr, src, view->itemsize);
|
|
|
|
src += view->itemsize;
|
2015-02-01 23:19:23 +08:00
|
|
|
addone(view->ndim, indices, view->shape);
|
2010-05-09 23:52:27 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
PyMem_Free(indices);
|
|
|
|
return 0;
|
2007-08-18 19:21:56 +08:00
|
|
|
}
|
|
|
|
|
2007-11-07 05:34:58 +08:00
|
|
|
int PyObject_CopyData(PyObject *dest, PyObject *src)
|
2007-08-18 19:21:56 +08:00
|
|
|
{
|
2010-05-09 23:52:27 +08:00
|
|
|
Py_buffer view_dest, view_src;
|
|
|
|
int k;
|
|
|
|
Py_ssize_t *indices, elements;
|
|
|
|
char *dptr, *sptr;
|
|
|
|
|
|
|
|
if (!PyObject_CheckBuffer(dest) ||
|
|
|
|
!PyObject_CheckBuffer(src)) {
|
|
|
|
PyErr_SetString(PyExc_TypeError,
|
2014-10-05 23:47:01 +08:00
|
|
|
"both destination and source must be "\
|
|
|
|
"bytes-like objects");
|
2010-05-09 23:52:27 +08:00
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (PyObject_GetBuffer(dest, &view_dest, PyBUF_FULL) != 0) return -1;
|
|
|
|
if (PyObject_GetBuffer(src, &view_src, PyBUF_FULL_RO) != 0) {
|
|
|
|
PyBuffer_Release(&view_dest);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (view_dest.len < view_src.len) {
|
|
|
|
PyErr_SetString(PyExc_BufferError,
|
|
|
|
"destination is too small to receive data from source");
|
|
|
|
PyBuffer_Release(&view_dest);
|
|
|
|
PyBuffer_Release(&view_src);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
if ((PyBuffer_IsContiguous(&view_dest, 'C') &&
|
|
|
|
PyBuffer_IsContiguous(&view_src, 'C')) ||
|
|
|
|
(PyBuffer_IsContiguous(&view_dest, 'F') &&
|
|
|
|
PyBuffer_IsContiguous(&view_src, 'F'))) {
|
|
|
|
/* simplest copy is all that is needed */
|
|
|
|
memcpy(view_dest.buf, view_src.buf, view_src.len);
|
|
|
|
PyBuffer_Release(&view_dest);
|
|
|
|
PyBuffer_Release(&view_src);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Otherwise a more elaborate copy scheme is needed */
|
|
|
|
|
|
|
|
/* XXX(nnorwitz): need to check for overflow! */
|
|
|
|
indices = (Py_ssize_t *)PyMem_Malloc(sizeof(Py_ssize_t)*view_src.ndim);
|
|
|
|
if (indices == NULL) {
|
|
|
|
PyErr_NoMemory();
|
|
|
|
PyBuffer_Release(&view_dest);
|
|
|
|
PyBuffer_Release(&view_src);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
for (k=0; k<view_src.ndim;k++) {
|
|
|
|
indices[k] = 0;
|
|
|
|
}
|
|
|
|
elements = 1;
|
|
|
|
for (k=0; k<view_src.ndim; k++) {
|
|
|
|
/* XXX(nnorwitz): can this overflow? */
|
|
|
|
elements *= view_src.shape[k];
|
|
|
|
}
|
|
|
|
while (elements--) {
|
2010-09-01 20:58:21 +08:00
|
|
|
_Py_add_one_to_index_C(view_src.ndim, indices, view_src.shape);
|
2010-05-09 23:52:27 +08:00
|
|
|
dptr = PyBuffer_GetPointer(&view_dest, indices);
|
|
|
|
sptr = PyBuffer_GetPointer(&view_src, indices);
|
|
|
|
memcpy(dptr, sptr, view_src.itemsize);
|
|
|
|
}
|
|
|
|
PyMem_Free(indices);
|
|
|
|
PyBuffer_Release(&view_dest);
|
|
|
|
PyBuffer_Release(&view_src);
|
|
|
|
return 0;
|
2007-08-18 19:21:56 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
PyBuffer_FillContiguousStrides(int nd, Py_ssize_t *shape,
|
2010-05-09 23:52:27 +08:00
|
|
|
Py_ssize_t *strides, int itemsize,
|
|
|
|
char fort)
|
|
|
|
{
|
|
|
|
int k;
|
|
|
|
Py_ssize_t sd;
|
|
|
|
|
|
|
|
sd = itemsize;
|
|
|
|
if (fort == 'F') {
|
|
|
|
for (k=0; k<nd; k++) {
|
|
|
|
strides[k] = sd;
|
|
|
|
sd *= shape[k];
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
for (k=nd-1; k>=0; k--) {
|
|
|
|
strides[k] = sd;
|
|
|
|
sd *= shape[k];
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return;
|
2007-08-18 19:21:56 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
int
|
2008-08-13 23:53:07 +08:00
|
|
|
PyBuffer_FillInfo(Py_buffer *view, PyObject *obj, void *buf, Py_ssize_t len,
|
2012-03-06 22:27:31 +08:00
|
|
|
int readonly, int flags)
|
2010-05-09 23:52:27 +08:00
|
|
|
{
|
2015-02-03 23:57:21 +08:00
|
|
|
if (view == NULL) {
|
|
|
|
PyErr_SetString(PyExc_BufferError,
|
2020-06-23 21:55:06 +08:00
|
|
|
"PyBuffer_FillInfo: view==NULL argument is obsolete");
|
2015-02-03 23:57:21 +08:00
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
2010-05-09 23:52:27 +08:00
|
|
|
if (((flags & PyBUF_WRITABLE) == PyBUF_WRITABLE) &&
|
|
|
|
(readonly == 1)) {
|
|
|
|
PyErr_SetString(PyExc_BufferError,
|
|
|
|
"Object is not writable.");
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
view->obj = obj;
|
|
|
|
if (obj)
|
|
|
|
Py_INCREF(obj);
|
|
|
|
view->buf = buf;
|
|
|
|
view->len = len;
|
|
|
|
view->readonly = readonly;
|
|
|
|
view->itemsize = 1;
|
|
|
|
view->format = NULL;
|
|
|
|
if ((flags & PyBUF_FORMAT) == PyBUF_FORMAT)
|
|
|
|
view->format = "B";
|
|
|
|
view->ndim = 1;
|
|
|
|
view->shape = NULL;
|
|
|
|
if ((flags & PyBUF_ND) == PyBUF_ND)
|
|
|
|
view->shape = &(view->len);
|
|
|
|
view->strides = NULL;
|
|
|
|
if ((flags & PyBUF_STRIDES) == PyBUF_STRIDES)
|
|
|
|
view->strides = &(view->itemsize);
|
|
|
|
view->suboffsets = NULL;
|
|
|
|
view->internal = NULL;
|
|
|
|
return 0;
|
2007-08-18 19:21:56 +08:00
|
|
|
}
|
|
|
|
|
2008-08-13 23:53:07 +08:00
|
|
|
void
|
|
|
|
PyBuffer_Release(Py_buffer *view)
|
|
|
|
{
|
2010-05-09 23:52:27 +08:00
|
|
|
PyObject *obj = view->obj;
|
2015-02-03 07:21:08 +08:00
|
|
|
PyBufferProcs *pb;
|
|
|
|
if (obj == NULL)
|
|
|
|
return;
|
|
|
|
pb = Py_TYPE(obj)->tp_as_buffer;
|
2021-01-29 23:53:03 +08:00
|
|
|
if (pb && pb->bf_releasebuffer) {
|
2015-02-03 07:21:08 +08:00
|
|
|
pb->bf_releasebuffer(obj, view);
|
2021-01-29 23:53:03 +08:00
|
|
|
}
|
2010-05-09 23:52:27 +08:00
|
|
|
view->obj = NULL;
|
2015-02-03 07:21:08 +08:00
|
|
|
Py_DECREF(obj);
|
2008-08-13 23:53:07 +08:00
|
|
|
}
|
|
|
|
|
2008-02-18 03:48:00 +08:00
|
|
|
PyObject *
|
|
|
|
PyObject_Format(PyObject *obj, PyObject *format_spec)
|
|
|
|
{
|
|
|
|
PyObject *meth;
|
|
|
|
PyObject *empty = NULL;
|
|
|
|
PyObject *result = NULL;
|
2012-01-23 00:24:29 +08:00
|
|
|
_Py_IDENTIFIER(__format__);
|
2008-02-18 03:48:00 +08:00
|
|
|
|
2016-09-07 03:07:53 +08:00
|
|
|
if (format_spec != NULL && !PyUnicode_Check(format_spec)) {
|
|
|
|
PyErr_Format(PyExc_SystemError,
|
|
|
|
"Format specifier must be a string, not %.200s",
|
|
|
|
Py_TYPE(format_spec)->tp_name);
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Fast path for common types. */
|
|
|
|
if (format_spec == NULL || PyUnicode_GET_LENGTH(format_spec) == 0) {
|
|
|
|
if (PyUnicode_CheckExact(obj)) {
|
|
|
|
Py_INCREF(obj);
|
|
|
|
return obj;
|
|
|
|
}
|
|
|
|
if (PyLong_CheckExact(obj)) {
|
|
|
|
return PyObject_Str(obj);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2008-02-18 03:48:00 +08:00
|
|
|
/* If no format_spec is provided, use an empty string */
|
|
|
|
if (format_spec == NULL) {
|
2011-11-22 09:27:30 +08:00
|
|
|
empty = PyUnicode_New(0, 0);
|
2010-06-05 08:45:37 +08:00
|
|
|
format_spec = empty;
|
2008-02-18 03:48:00 +08:00
|
|
|
}
|
|
|
|
|
2016-09-07 03:07:53 +08:00
|
|
|
/* Find the (unbound!) __format__ method */
|
2012-01-23 00:24:29 +08:00
|
|
|
meth = _PyObject_LookupSpecial(obj, &PyId___format__);
|
2008-02-18 03:48:00 +08:00
|
|
|
if (meth == NULL) {
|
2020-06-23 21:55:06 +08:00
|
|
|
PyThreadState *tstate = _PyThreadState_GET();
|
|
|
|
if (!_PyErr_Occurred(tstate)) {
|
|
|
|
_PyErr_Format(tstate, PyExc_TypeError,
|
|
|
|
"Type %.100s doesn't define __format__",
|
|
|
|
Py_TYPE(obj)->tp_name);
|
|
|
|
}
|
2010-05-09 23:52:27 +08:00
|
|
|
goto done;
|
2008-02-18 03:48:00 +08:00
|
|
|
}
|
|
|
|
|
2010-06-05 08:45:37 +08:00
|
|
|
/* And call it. */
|
2020-02-12 00:46:57 +08:00
|
|
|
result = PyObject_CallOneArg(meth, format_spec);
|
2010-06-05 10:11:45 +08:00
|
|
|
Py_DECREF(meth);
|
2008-02-18 03:48:00 +08:00
|
|
|
|
|
|
|
if (result && !PyUnicode_Check(result)) {
|
2015-01-24 12:05:18 +08:00
|
|
|
PyErr_Format(PyExc_TypeError,
|
2020-06-23 21:55:06 +08:00
|
|
|
"__format__ must return a str, not %.200s",
|
|
|
|
Py_TYPE(result)->tp_name);
|
2010-06-05 08:45:37 +08:00
|
|
|
Py_DECREF(result);
|
|
|
|
result = NULL;
|
|
|
|
goto done;
|
2008-02-18 03:48:00 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
done:
|
|
|
|
Py_XDECREF(empty);
|
|
|
|
return result;
|
|
|
|
}
|
1998-05-22 08:47:05 +08:00
|
|
|
/* Operations on numbers */
|
|
|
|
|
|
|
|
int
|
2000-07-09 12:06:11 +08:00
|
|
|
PyNumber_Check(PyObject *o)
|
1995-07-18 22:12:02 +08:00
|
|
|
{
|
2020-10-09 19:14:37 +08:00
|
|
|
if (o == NULL)
|
|
|
|
return 0;
|
|
|
|
PyNumberMethods *nb = Py_TYPE(o)->tp_as_number;
|
|
|
|
return nb && (nb->nb_index || nb->nb_int || nb->nb_float || PyComplex_Check(o));
|
1995-07-18 22:12:02 +08:00
|
|
|
}
|
|
|
|
|
1998-05-22 08:47:05 +08:00
|
|
|
/* Binary operators */
|
1995-07-18 22:12:02 +08:00
|
|
|
|
2001-01-04 09:39:06 +08:00
|
|
|
#define NB_SLOT(x) offsetof(PyNumberMethods, x)
|
|
|
|
#define NB_BINOP(nb_methods, slot) \
|
2010-05-09 23:52:27 +08:00
|
|
|
(*(binaryfunc*)(& ((char*)nb_methods)[slot]))
|
2001-01-04 09:39:06 +08:00
|
|
|
#define NB_TERNOP(nb_methods, slot) \
|
2010-05-09 23:52:27 +08:00
|
|
|
(*(ternaryfunc*)(& ((char*)nb_methods)[slot]))
|
1995-07-18 22:12:02 +08:00
|
|
|
|
2001-01-04 09:39:06 +08:00
|
|
|
/*
|
|
|
|
Calling scheme used for binary operations:
|
1995-07-18 22:12:02 +08:00
|
|
|
|
2006-08-22 01:06:07 +08:00
|
|
|
Order operations are tried until either a valid result or error:
|
2010-05-09 23:52:27 +08:00
|
|
|
w.op(v,w)[*], v.op(v,w), w.op(v,w)
|
1995-07-18 22:12:02 +08:00
|
|
|
|
2020-02-07 08:53:23 +08:00
|
|
|
[*] only when Py_TYPE(v) != Py_TYPE(w) && Py_TYPE(w) is a subclass of
|
|
|
|
Py_TYPE(v)
|
2001-01-04 09:39:06 +08:00
|
|
|
*/
|
|
|
|
|
|
|
|
static PyObject *
|
2021-01-29 23:53:03 +08:00
|
|
|
binary_op1(PyObject *v, PyObject *w, const int op_slot
|
|
|
|
#ifndef NDEBUG
|
|
|
|
, const char *op_name
|
|
|
|
#endif
|
|
|
|
)
|
|
|
|
{
|
|
|
|
binaryfunc slotv;
|
|
|
|
if (Py_TYPE(v)->tp_as_number != NULL) {
|
2020-02-07 08:53:23 +08:00
|
|
|
slotv = NB_BINOP(Py_TYPE(v)->tp_as_number, op_slot);
|
2021-01-29 23:53:03 +08:00
|
|
|
}
|
|
|
|
else {
|
|
|
|
slotv = NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
binaryfunc slotw;
|
|
|
|
if (!Py_IS_TYPE(w, Py_TYPE(v)) && Py_TYPE(w)->tp_as_number != NULL) {
|
2020-02-07 08:53:23 +08:00
|
|
|
slotw = NB_BINOP(Py_TYPE(w)->tp_as_number, op_slot);
|
2021-01-29 23:53:03 +08:00
|
|
|
if (slotw == slotv) {
|
2010-05-09 23:52:27 +08:00
|
|
|
slotw = NULL;
|
2021-01-29 23:53:03 +08:00
|
|
|
}
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
slotw = NULL;
|
2010-05-09 23:52:27 +08:00
|
|
|
}
|
2021-01-29 23:53:03 +08:00
|
|
|
|
2010-05-09 23:52:27 +08:00
|
|
|
if (slotv) {
|
2021-01-29 23:53:03 +08:00
|
|
|
PyObject *x;
|
2020-02-07 08:53:23 +08:00
|
|
|
if (slotw && PyType_IsSubtype(Py_TYPE(w), Py_TYPE(v))) {
|
2010-05-09 23:52:27 +08:00
|
|
|
x = slotw(v, w);
|
|
|
|
if (x != Py_NotImplemented)
|
|
|
|
return x;
|
|
|
|
Py_DECREF(x); /* can't do it */
|
|
|
|
slotw = NULL;
|
|
|
|
}
|
|
|
|
x = slotv(v, w);
|
2021-01-29 23:53:03 +08:00
|
|
|
assert(_Py_CheckSlotResult(v, op_name, x != NULL));
|
|
|
|
if (x != Py_NotImplemented) {
|
2010-05-09 23:52:27 +08:00
|
|
|
return x;
|
2021-01-29 23:53:03 +08:00
|
|
|
}
|
2010-05-09 23:52:27 +08:00
|
|
|
Py_DECREF(x); /* can't do it */
|
|
|
|
}
|
|
|
|
if (slotw) {
|
2021-01-29 23:53:03 +08:00
|
|
|
PyObject *x = slotw(v, w);
|
|
|
|
assert(_Py_CheckSlotResult(w, op_name, x != NULL));
|
|
|
|
if (x != Py_NotImplemented) {
|
2010-05-09 23:52:27 +08:00
|
|
|
return x;
|
2021-01-29 23:53:03 +08:00
|
|
|
}
|
2010-05-09 23:52:27 +08:00
|
|
|
Py_DECREF(x); /* can't do it */
|
|
|
|
}
|
2011-08-11 09:28:54 +08:00
|
|
|
Py_RETURN_NOTIMPLEMENTED;
|
1995-07-18 22:12:02 +08:00
|
|
|
}
|
2002-04-17 00:32:50 +08:00
|
|
|
|
2021-01-29 23:53:03 +08:00
|
|
|
#ifdef NDEBUG
|
|
|
|
# define BINARY_OP1(v, w, op_slot, op_name) binary_op1(v, w, op_slot)
|
|
|
|
#else
|
|
|
|
# define BINARY_OP1(v, w, op_slot, op_name) binary_op1(v, w, op_slot, op_name)
|
|
|
|
#endif
|
|
|
|
|
2002-12-31 04:18:15 +08:00
|
|
|
static PyObject *
|
|
|
|
binop_type_error(PyObject *v, PyObject *w, const char *op_name)
|
|
|
|
{
|
2010-05-09 23:52:27 +08:00
|
|
|
PyErr_Format(PyExc_TypeError,
|
|
|
|
"unsupported operand type(s) for %.100s: "
|
|
|
|
"'%.100s' and '%.100s'",
|
|
|
|
op_name,
|
2020-02-07 08:53:23 +08:00
|
|
|
Py_TYPE(v)->tp_name,
|
|
|
|
Py_TYPE(w)->tp_name);
|
2010-05-09 23:52:27 +08:00
|
|
|
return NULL;
|
2002-12-31 04:18:15 +08:00
|
|
|
}
|
|
|
|
|
2001-01-04 09:39:06 +08:00
|
|
|
static PyObject *
|
|
|
|
binary_op(PyObject *v, PyObject *w, const int op_slot, const char *op_name)
|
1995-07-18 22:12:02 +08:00
|
|
|
{
|
2021-01-29 23:53:03 +08:00
|
|
|
PyObject *result = BINARY_OP1(v, w, op_slot, op_name);
|
2010-05-09 23:52:27 +08:00
|
|
|
if (result == Py_NotImplemented) {
|
|
|
|
Py_DECREF(result);
|
2017-08-18 18:37:36 +08:00
|
|
|
|
|
|
|
if (op_slot == NB_SLOT(nb_rshift) &&
|
2020-05-12 22:12:41 +08:00
|
|
|
PyCFunction_CheckExact(v) &&
|
2017-08-18 18:37:36 +08:00
|
|
|
strcmp(((PyCFunctionObject *)v)->m_ml->ml_name, "print") == 0)
|
|
|
|
{
|
|
|
|
PyErr_Format(PyExc_TypeError,
|
|
|
|
"unsupported operand type(s) for %.100s: "
|
|
|
|
"'%.100s' and '%.100s'. Did you mean \"print(<message>, "
|
2017-08-18 20:18:14 +08:00
|
|
|
"file=<output_stream>)\"?",
|
2017-08-18 18:37:36 +08:00
|
|
|
op_name,
|
2020-02-07 08:53:23 +08:00
|
|
|
Py_TYPE(v)->tp_name,
|
|
|
|
Py_TYPE(w)->tp_name);
|
2017-08-18 18:37:36 +08:00
|
|
|
return NULL;
|
|
|
|
}
|
2010-05-09 23:52:27 +08:00
|
|
|
return binop_type_error(v, w, op_name);
|
|
|
|
}
|
|
|
|
return result;
|
1995-07-18 22:12:02 +08:00
|
|
|
}
|
|
|
|
|
1998-05-22 08:47:05 +08:00
|
|
|
|
2001-01-04 09:39:06 +08:00
|
|
|
/*
|
|
|
|
Calling scheme used for ternary operations:
|
1995-07-18 22:12:02 +08:00
|
|
|
|
2006-08-22 01:06:07 +08:00
|
|
|
Order operations are tried until either a valid result or error:
|
2010-05-09 23:52:27 +08:00
|
|
|
v.op(v,w,z), w.op(v,w,z), z.op(v,w,z)
|
2001-01-04 09:39:06 +08:00
|
|
|
*/
|
1998-05-22 08:47:05 +08:00
|
|
|
|
2001-01-04 09:39:06 +08:00
|
|
|
static PyObject *
|
|
|
|
ternary_op(PyObject *v,
|
2010-05-09 23:52:27 +08:00
|
|
|
PyObject *w,
|
|
|
|
PyObject *z,
|
2021-02-27 03:58:39 +08:00
|
|
|
const int op_slot,
|
|
|
|
const char *op_name
|
2021-01-29 23:53:03 +08:00
|
|
|
)
|
|
|
|
{
|
|
|
|
PyNumberMethods *mv = Py_TYPE(v)->tp_as_number;
|
|
|
|
PyNumberMethods *mw = Py_TYPE(w)->tp_as_number;
|
|
|
|
|
|
|
|
ternaryfunc slotv;
|
|
|
|
if (mv != NULL) {
|
2010-05-09 23:52:27 +08:00
|
|
|
slotv = NB_TERNOP(mv, op_slot);
|
2021-01-29 23:53:03 +08:00
|
|
|
}
|
|
|
|
else {
|
|
|
|
slotv = NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
ternaryfunc slotw;
|
2020-03-07 06:53:17 +08:00
|
|
|
if (!Py_IS_TYPE(w, Py_TYPE(v)) && mw != NULL) {
|
2010-05-09 23:52:27 +08:00
|
|
|
slotw = NB_TERNOP(mw, op_slot);
|
2021-01-29 23:53:03 +08:00
|
|
|
if (slotw == slotv) {
|
2010-05-09 23:52:27 +08:00
|
|
|
slotw = NULL;
|
2021-01-29 23:53:03 +08:00
|
|
|
}
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
slotw = NULL;
|
2010-05-09 23:52:27 +08:00
|
|
|
}
|
2021-01-29 23:53:03 +08:00
|
|
|
|
2010-05-09 23:52:27 +08:00
|
|
|
if (slotv) {
|
2021-01-29 23:53:03 +08:00
|
|
|
PyObject *x;
|
2020-02-07 08:53:23 +08:00
|
|
|
if (slotw && PyType_IsSubtype(Py_TYPE(w), Py_TYPE(v))) {
|
2010-05-09 23:52:27 +08:00
|
|
|
x = slotw(v, w, z);
|
2021-01-29 23:53:03 +08:00
|
|
|
if (x != Py_NotImplemented) {
|
2010-05-09 23:52:27 +08:00
|
|
|
return x;
|
2021-01-29 23:53:03 +08:00
|
|
|
}
|
2010-05-09 23:52:27 +08:00
|
|
|
Py_DECREF(x); /* can't do it */
|
|
|
|
slotw = NULL;
|
|
|
|
}
|
|
|
|
x = slotv(v, w, z);
|
2021-01-29 23:53:03 +08:00
|
|
|
assert(_Py_CheckSlotResult(v, op_name, x != NULL));
|
|
|
|
if (x != Py_NotImplemented) {
|
2010-05-09 23:52:27 +08:00
|
|
|
return x;
|
2021-01-29 23:53:03 +08:00
|
|
|
}
|
2010-05-09 23:52:27 +08:00
|
|
|
Py_DECREF(x); /* can't do it */
|
|
|
|
}
|
|
|
|
if (slotw) {
|
2021-01-29 23:53:03 +08:00
|
|
|
PyObject *x = slotw(v, w, z);
|
|
|
|
assert(_Py_CheckSlotResult(w, op_name, x != NULL));
|
|
|
|
if (x != Py_NotImplemented) {
|
2010-05-09 23:52:27 +08:00
|
|
|
return x;
|
2021-01-29 23:53:03 +08:00
|
|
|
}
|
2010-05-09 23:52:27 +08:00
|
|
|
Py_DECREF(x); /* can't do it */
|
|
|
|
}
|
2021-01-29 23:53:03 +08:00
|
|
|
|
|
|
|
PyNumberMethods *mz = Py_TYPE(z)->tp_as_number;
|
2010-05-09 23:52:27 +08:00
|
|
|
if (mz != NULL) {
|
2021-01-29 23:53:03 +08:00
|
|
|
ternaryfunc slotz = NB_TERNOP(mz, op_slot);
|
|
|
|
if (slotz == slotv || slotz == slotw) {
|
2010-05-09 23:52:27 +08:00
|
|
|
slotz = NULL;
|
2021-01-29 23:53:03 +08:00
|
|
|
}
|
2010-05-09 23:52:27 +08:00
|
|
|
if (slotz) {
|
2021-01-29 23:53:03 +08:00
|
|
|
PyObject *x = slotz(v, w, z);
|
|
|
|
assert(_Py_CheckSlotResult(z, op_name, x != NULL));
|
|
|
|
if (x != Py_NotImplemented) {
|
2010-05-09 23:52:27 +08:00
|
|
|
return x;
|
2021-01-29 23:53:03 +08:00
|
|
|
}
|
2010-05-09 23:52:27 +08:00
|
|
|
Py_DECREF(x); /* can't do it */
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2021-01-29 23:53:03 +08:00
|
|
|
if (z == Py_None) {
|
2010-05-09 23:52:27 +08:00
|
|
|
PyErr_Format(
|
|
|
|
PyExc_TypeError,
|
2021-02-27 03:58:39 +08:00
|
|
|
"unsupported operand type(s) for %.100s: "
|
2010-05-09 23:52:27 +08:00
|
|
|
"'%.100s' and '%.100s'",
|
2021-02-27 03:58:39 +08:00
|
|
|
op_name,
|
2020-02-07 08:53:23 +08:00
|
|
|
Py_TYPE(v)->tp_name,
|
|
|
|
Py_TYPE(w)->tp_name);
|
2021-01-29 23:53:03 +08:00
|
|
|
}
|
|
|
|
else {
|
2010-05-09 23:52:27 +08:00
|
|
|
PyErr_Format(
|
|
|
|
PyExc_TypeError,
|
2021-02-27 03:58:39 +08:00
|
|
|
"unsupported operand type(s) for %.100s: "
|
2010-05-09 23:52:27 +08:00
|
|
|
"'%.100s', '%.100s', '%.100s'",
|
2021-02-27 03:58:39 +08:00
|
|
|
op_name,
|
2020-02-07 08:53:23 +08:00
|
|
|
Py_TYPE(v)->tp_name,
|
|
|
|
Py_TYPE(w)->tp_name,
|
|
|
|
Py_TYPE(z)->tp_name);
|
2021-01-29 23:53:03 +08:00
|
|
|
}
|
2010-05-09 23:52:27 +08:00
|
|
|
return NULL;
|
1995-07-18 22:12:02 +08:00
|
|
|
}
|
|
|
|
|
2001-01-04 09:39:06 +08:00
|
|
|
#define BINARY_FUNC(func, op, op_name) \
|
|
|
|
PyObject * \
|
|
|
|
func(PyObject *v, PyObject *w) { \
|
2010-05-09 23:52:27 +08:00
|
|
|
return binary_op(v, w, NB_SLOT(op), op_name); \
|
2001-01-04 09:39:06 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
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()")
|
|
|
|
|
1995-07-18 22:12:02 +08:00
|
|
|
PyObject *
|
2001-01-04 09:39:06 +08:00
|
|
|
PyNumber_Add(PyObject *v, PyObject *w)
|
1995-07-18 22:12:02 +08:00
|
|
|
{
|
2021-01-29 23:53:03 +08:00
|
|
|
PyObject *result = BINARY_OP1(v, w, NB_SLOT(nb_add), "+");
|
|
|
|
if (result != Py_NotImplemented) {
|
|
|
|
return result;
|
2010-05-09 23:52:27 +08:00
|
|
|
}
|
2021-01-29 23:53:03 +08:00
|
|
|
Py_DECREF(result);
|
|
|
|
|
|
|
|
PySequenceMethods *m = Py_TYPE(v)->tp_as_sequence;
|
|
|
|
if (m && m->sq_concat) {
|
|
|
|
result = (*m->sq_concat)(v, w);
|
|
|
|
assert(_Py_CheckSlotResult(v, "+", result != NULL));
|
|
|
|
return result;
|
|
|
|
}
|
|
|
|
|
|
|
|
return binop_type_error(v, w, "+");
|
1995-07-18 22:12:02 +08:00
|
|
|
}
|
|
|
|
|
2002-12-31 04:18:15 +08:00
|
|
|
static PyObject *
|
2006-02-16 01:27:45 +08:00
|
|
|
sequence_repeat(ssizeargfunc repeatfunc, PyObject *seq, PyObject *n)
|
2002-12-31 04:18:15 +08:00
|
|
|
{
|
2010-05-09 23:52:27 +08:00
|
|
|
Py_ssize_t count;
|
2020-04-08 08:01:56 +08:00
|
|
|
if (_PyIndex_Check(n)) {
|
2010-05-09 23:52:27 +08:00
|
|
|
count = PyNumber_AsSsize_t(n, PyExc_OverflowError);
|
2021-01-29 23:53:03 +08:00
|
|
|
if (count == -1 && PyErr_Occurred()) {
|
2010-05-09 23:52:27 +08:00
|
|
|
return NULL;
|
2021-01-29 23:53:03 +08:00
|
|
|
}
|
2010-05-09 23:52:27 +08:00
|
|
|
}
|
|
|
|
else {
|
|
|
|
return type_error("can't multiply sequence by "
|
|
|
|
"non-int of type '%.200s'", n);
|
|
|
|
}
|
2021-01-29 23:53:03 +08:00
|
|
|
PyObject *res = (*repeatfunc)(seq, count);
|
|
|
|
assert(_Py_CheckSlotResult(seq, "*", res != NULL));
|
|
|
|
return res;
|
2002-12-31 04:18:15 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
PyObject *
|
|
|
|
PyNumber_Multiply(PyObject *v, PyObject *w)
|
|
|
|
{
|
2021-01-29 23:53:03 +08:00
|
|
|
PyObject *result = BINARY_OP1(v, w, NB_SLOT(nb_multiply), "*");
|
2010-05-09 23:52:27 +08:00
|
|
|
if (result == Py_NotImplemented) {
|
2020-02-07 08:53:23 +08:00
|
|
|
PySequenceMethods *mv = Py_TYPE(v)->tp_as_sequence;
|
|
|
|
PySequenceMethods *mw = Py_TYPE(w)->tp_as_sequence;
|
2010-05-09 23:52:27 +08:00
|
|
|
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;
|
2002-12-31 04:18:15 +08:00
|
|
|
}
|
|
|
|
|
2014-04-10 11:55:56 +08:00
|
|
|
PyObject *
|
|
|
|
PyNumber_MatrixMultiply(PyObject *v, PyObject *w)
|
|
|
|
{
|
|
|
|
return binary_op(v, w, NB_SLOT(nb_matrix_multiply), "@");
|
|
|
|
}
|
|
|
|
|
2001-08-08 13:00:18 +08:00
|
|
|
PyObject *
|
|
|
|
PyNumber_FloorDivide(PyObject *v, PyObject *w)
|
|
|
|
{
|
2010-05-09 23:52:27 +08:00
|
|
|
return binary_op(v, w, NB_SLOT(nb_floor_divide), "//");
|
2001-08-08 13:00:18 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
PyObject *
|
|
|
|
PyNumber_TrueDivide(PyObject *v, PyObject *w)
|
|
|
|
{
|
2010-05-09 23:52:27 +08:00
|
|
|
return binary_op(v, w, NB_SLOT(nb_true_divide), "/");
|
2001-08-08 13:00:18 +08:00
|
|
|
}
|
|
|
|
|
1995-07-18 22:12:02 +08:00
|
|
|
PyObject *
|
2000-07-09 12:06:11 +08:00
|
|
|
PyNumber_Remainder(PyObject *v, PyObject *w)
|
1995-07-18 22:12:02 +08:00
|
|
|
{
|
2010-05-09 23:52:27 +08:00
|
|
|
return binary_op(v, w, NB_SLOT(nb_remainder), "%");
|
1995-07-18 22:12:02 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
PyObject *
|
2000-07-09 12:06:11 +08:00
|
|
|
PyNumber_Power(PyObject *v, PyObject *w, PyObject *z)
|
1995-07-18 22:12:02 +08:00
|
|
|
{
|
2021-02-27 03:58:39 +08:00
|
|
|
return ternary_op(v, w, z, NB_SLOT(nb_power), "** or pow()");
|
1995-07-18 22:12:02 +08:00
|
|
|
}
|
|
|
|
|
2000-08-25 04:08:19 +08:00
|
|
|
/* Binary in-place operators */
|
|
|
|
|
|
|
|
/* The in-place operators are defined to fall back to the 'normal',
|
2001-01-04 09:39:06 +08:00
|
|
|
non in-place operations, if the in-place methods are not in place.
|
2000-08-25 04:08:19 +08:00
|
|
|
|
2001-01-04 09:39:06 +08:00
|
|
|
- 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.
|
2002-04-17 00:32:50 +08:00
|
|
|
|
2001-01-04 09:39:06 +08:00
|
|
|
- Otherwise, in-place modification is not supported. Handle it exactly as
|
|
|
|
a non in-place operation of the same kind.
|
2000-08-25 04:08:19 +08:00
|
|
|
|
|
|
|
*/
|
|
|
|
|
2001-01-04 09:39:06 +08:00
|
|
|
static PyObject *
|
2021-01-29 23:53:03 +08:00
|
|
|
binary_iop1(PyObject *v, PyObject *w, const int iop_slot, const int op_slot
|
|
|
|
#ifndef NDEBUG
|
|
|
|
, const char *op_name
|
|
|
|
#endif
|
|
|
|
)
|
2001-01-04 09:39:06 +08:00
|
|
|
{
|
2020-02-07 08:53:23 +08:00
|
|
|
PyNumberMethods *mv = Py_TYPE(v)->tp_as_number;
|
2010-05-09 23:52:27 +08:00
|
|
|
if (mv != NULL) {
|
|
|
|
binaryfunc slot = NB_BINOP(mv, iop_slot);
|
|
|
|
if (slot) {
|
|
|
|
PyObject *x = (slot)(v, w);
|
2021-01-29 23:53:03 +08:00
|
|
|
assert(_Py_CheckSlotResult(v, op_name, x != NULL));
|
2010-05-09 23:52:27 +08:00
|
|
|
if (x != Py_NotImplemented) {
|
|
|
|
return x;
|
|
|
|
}
|
|
|
|
Py_DECREF(x);
|
|
|
|
}
|
|
|
|
}
|
2021-01-29 23:53:03 +08:00
|
|
|
#ifdef NDEBUG
|
2010-05-09 23:52:27 +08:00
|
|
|
return binary_op1(v, w, op_slot);
|
2021-01-29 23:53:03 +08:00
|
|
|
#else
|
|
|
|
return binary_op1(v, w, op_slot, op_name);
|
|
|
|
#endif
|
2002-12-31 04:18:15 +08:00
|
|
|
}
|
|
|
|
|
2021-01-29 23:53:03 +08:00
|
|
|
#ifdef NDEBUG
|
|
|
|
# define BINARY_IOP1(v, w, iop_slot, op_slot, op_name) binary_iop1(v, w, iop_slot, op_slot)
|
|
|
|
#else
|
|
|
|
# define BINARY_IOP1(v, w, iop_slot, op_slot, op_name) binary_iop1(v, w, iop_slot, op_slot, op_name)
|
|
|
|
#endif
|
|
|
|
|
2002-12-31 04:18:15 +08:00
|
|
|
static PyObject *
|
|
|
|
binary_iop(PyObject *v, PyObject *w, const int iop_slot, const int op_slot,
|
2010-05-09 23:52:27 +08:00
|
|
|
const char *op_name)
|
2002-12-31 04:18:15 +08:00
|
|
|
{
|
2021-01-29 23:53:03 +08:00
|
|
|
PyObject *result = BINARY_IOP1(v, w, iop_slot, op_slot, op_name);
|
2010-05-09 23:52:27 +08:00
|
|
|
if (result == Py_NotImplemented) {
|
|
|
|
Py_DECREF(result);
|
|
|
|
return binop_type_error(v, w, op_name);
|
|
|
|
}
|
|
|
|
return result;
|
2000-08-25 04:08:19 +08:00
|
|
|
}
|
|
|
|
|
2021-02-27 03:58:39 +08:00
|
|
|
static PyObject *
|
|
|
|
ternary_iop(PyObject *v, PyObject *w, PyObject *z, const int iop_slot, const int op_slot,
|
|
|
|
const char *op_name)
|
|
|
|
{
|
|
|
|
PyNumberMethods *mv = Py_TYPE(v)->tp_as_number;
|
|
|
|
if (mv != NULL) {
|
|
|
|
ternaryfunc slot = NB_TERNOP(mv, iop_slot);
|
|
|
|
if (slot) {
|
|
|
|
PyObject *x = (slot)(v, w, z);
|
|
|
|
if (x != Py_NotImplemented) {
|
|
|
|
return x;
|
|
|
|
}
|
|
|
|
Py_DECREF(x);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return ternary_op(v, w, z, op_slot, op_name);
|
|
|
|
}
|
|
|
|
|
2001-01-04 09:39:06 +08:00
|
|
|
#define INPLACE_BINOP(func, iop, op, op_name) \
|
2010-05-09 23:52:27 +08:00
|
|
|
PyObject * \
|
|
|
|
func(PyObject *v, PyObject *w) { \
|
|
|
|
return binary_iop(v, w, NB_SLOT(iop), NB_SLOT(op), op_name); \
|
|
|
|
}
|
2000-08-25 04:08:19 +08:00
|
|
|
|
2001-01-04 09:39:06 +08:00
|
|
|
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, "-=")
|
2014-04-10 11:55:56 +08:00
|
|
|
INPLACE_BINOP(PyNumber_InMatrixMultiply, nb_inplace_matrix_multiply, nb_matrix_multiply, "@=")
|
2000-08-25 04:08:19 +08:00
|
|
|
|
2001-08-08 13:00:18 +08:00
|
|
|
PyObject *
|
|
|
|
PyNumber_InPlaceFloorDivide(PyObject *v, PyObject *w)
|
|
|
|
{
|
2010-05-09 23:52:27 +08:00
|
|
|
return binary_iop(v, w, NB_SLOT(nb_inplace_floor_divide),
|
|
|
|
NB_SLOT(nb_floor_divide), "//=");
|
2001-08-08 13:00:18 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
PyObject *
|
|
|
|
PyNumber_InPlaceTrueDivide(PyObject *v, PyObject *w)
|
|
|
|
{
|
2010-05-09 23:52:27 +08:00
|
|
|
return binary_iop(v, w, NB_SLOT(nb_inplace_true_divide),
|
|
|
|
NB_SLOT(nb_true_divide), "/=");
|
2001-08-08 13:00:18 +08:00
|
|
|
}
|
|
|
|
|
2000-08-25 04:08:19 +08:00
|
|
|
PyObject *
|
|
|
|
PyNumber_InPlaceAdd(PyObject *v, PyObject *w)
|
|
|
|
{
|
2021-01-29 23:53:03 +08:00
|
|
|
PyObject *result = BINARY_IOP1(v, w, NB_SLOT(nb_inplace_add),
|
|
|
|
NB_SLOT(nb_add), "+=");
|
2010-05-09 23:52:27 +08:00
|
|
|
if (result == Py_NotImplemented) {
|
2020-02-07 08:53:23 +08:00
|
|
|
PySequenceMethods *m = Py_TYPE(v)->tp_as_sequence;
|
2010-05-09 23:52:27 +08:00
|
|
|
Py_DECREF(result);
|
|
|
|
if (m != NULL) {
|
2021-01-29 23:53:03 +08:00
|
|
|
binaryfunc func = m->sq_inplace_concat;
|
|
|
|
if (func == NULL)
|
|
|
|
func = m->sq_concat;
|
|
|
|
if (func != NULL) {
|
|
|
|
result = func(v, w);
|
|
|
|
assert(_Py_CheckSlotResult(v, "+=", result != NULL));
|
|
|
|
return result;
|
|
|
|
}
|
2010-05-09 23:52:27 +08:00
|
|
|
}
|
|
|
|
result = binop_type_error(v, w, "+=");
|
|
|
|
}
|
|
|
|
return result;
|
2000-08-25 04:08:19 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
PyObject *
|
|
|
|
PyNumber_InPlaceMultiply(PyObject *v, PyObject *w)
|
|
|
|
{
|
2021-01-29 23:53:03 +08:00
|
|
|
PyObject *result = BINARY_IOP1(v, w, NB_SLOT(nb_inplace_multiply),
|
|
|
|
NB_SLOT(nb_multiply), "*=");
|
2010-05-09 23:52:27 +08:00
|
|
|
if (result == Py_NotImplemented) {
|
|
|
|
ssizeargfunc f = NULL;
|
2020-02-07 08:53:23 +08:00
|
|
|
PySequenceMethods *mv = Py_TYPE(v)->tp_as_sequence;
|
|
|
|
PySequenceMethods *mw = Py_TYPE(w)->tp_as_sequence;
|
2010-05-09 23:52:27 +08:00
|
|
|
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;
|
2000-08-25 04:08:19 +08:00
|
|
|
}
|
|
|
|
|
2014-04-10 11:55:56 +08:00
|
|
|
PyObject *
|
|
|
|
PyNumber_InPlaceMatrixMultiply(PyObject *v, PyObject *w)
|
|
|
|
{
|
|
|
|
return binary_iop(v, w, NB_SLOT(nb_inplace_matrix_multiply),
|
|
|
|
NB_SLOT(nb_matrix_multiply), "@=");
|
|
|
|
}
|
|
|
|
|
2000-08-25 04:08:19 +08:00
|
|
|
PyObject *
|
|
|
|
PyNumber_InPlaceRemainder(PyObject *v, PyObject *w)
|
|
|
|
{
|
2010-05-09 23:52:27 +08:00
|
|
|
return binary_iop(v, w, NB_SLOT(nb_inplace_remainder),
|
|
|
|
NB_SLOT(nb_remainder), "%=");
|
2000-08-25 04:08:19 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
PyObject *
|
|
|
|
PyNumber_InPlacePower(PyObject *v, PyObject *w, PyObject *z)
|
|
|
|
{
|
2021-02-27 03:58:39 +08:00
|
|
|
return ternary_iop(v, w, z, NB_SLOT(nb_inplace_power),
|
|
|
|
NB_SLOT(nb_power), "**=");
|
2000-08-25 04:08:19 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
|
1998-05-22 08:47:05 +08:00
|
|
|
/* Unary operators and functions */
|
1995-07-18 22:12:02 +08:00
|
|
|
|
|
|
|
PyObject *
|
2000-07-09 12:06:11 +08:00
|
|
|
PyNumber_Negative(PyObject *o)
|
1995-07-18 22:12:02 +08:00
|
|
|
{
|
2016-08-19 22:59:55 +08:00
|
|
|
if (o == NULL) {
|
2010-05-09 23:52:27 +08:00
|
|
|
return null_error();
|
2016-08-19 22:59:55 +08:00
|
|
|
}
|
|
|
|
|
2021-01-29 23:53:03 +08:00
|
|
|
PyNumberMethods *m = Py_TYPE(o)->tp_as_number;
|
|
|
|
if (m && m->nb_negative) {
|
|
|
|
PyObject *res = (*m->nb_negative)(o);
|
|
|
|
assert(_Py_CheckSlotResult(o, "__neg__", res != NULL));
|
|
|
|
return res;
|
|
|
|
}
|
1998-05-22 08:47:05 +08:00
|
|
|
|
2010-05-09 23:52:27 +08:00
|
|
|
return type_error("bad operand type for unary -: '%.200s'", o);
|
1995-07-18 22:12:02 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
PyObject *
|
2000-07-09 12:06:11 +08:00
|
|
|
PyNumber_Positive(PyObject *o)
|
1995-07-18 22:12:02 +08:00
|
|
|
{
|
2016-08-19 22:59:55 +08:00
|
|
|
if (o == NULL) {
|
2010-05-09 23:52:27 +08:00
|
|
|
return null_error();
|
2016-08-19 22:59:55 +08:00
|
|
|
}
|
|
|
|
|
2021-01-29 23:53:03 +08:00
|
|
|
PyNumberMethods *m = Py_TYPE(o)->tp_as_number;
|
|
|
|
if (m && m->nb_positive) {
|
|
|
|
PyObject *res = (*m->nb_positive)(o);
|
|
|
|
assert(_Py_CheckSlotResult(o, "__pos__", res != NULL));
|
|
|
|
return res;
|
|
|
|
}
|
1998-05-22 08:47:05 +08:00
|
|
|
|
2010-05-09 23:52:27 +08:00
|
|
|
return type_error("bad operand type for unary +: '%.200s'", o);
|
1995-07-18 22:12:02 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
PyObject *
|
2000-07-09 12:06:11 +08:00
|
|
|
PyNumber_Invert(PyObject *o)
|
1995-07-18 22:12:02 +08:00
|
|
|
{
|
2016-08-19 22:59:55 +08:00
|
|
|
if (o == NULL) {
|
2010-05-09 23:52:27 +08:00
|
|
|
return null_error();
|
2016-08-19 22:59:55 +08:00
|
|
|
}
|
|
|
|
|
2021-01-29 23:53:03 +08:00
|
|
|
PyNumberMethods *m = Py_TYPE(o)->tp_as_number;
|
|
|
|
if (m && m->nb_invert) {
|
|
|
|
PyObject *res = (*m->nb_invert)(o);
|
|
|
|
assert(_Py_CheckSlotResult(o, "__invert__", res != NULL));
|
|
|
|
return res;
|
|
|
|
}
|
1998-05-22 08:47:05 +08:00
|
|
|
|
2010-05-09 23:52:27 +08:00
|
|
|
return type_error("bad operand type for unary ~: '%.200s'", o);
|
1995-07-18 22:12:02 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
PyObject *
|
2000-07-09 12:06:11 +08:00
|
|
|
PyNumber_Absolute(PyObject *o)
|
1995-07-18 22:12:02 +08:00
|
|
|
{
|
2016-08-19 22:59:55 +08:00
|
|
|
if (o == NULL) {
|
2010-05-09 23:52:27 +08:00
|
|
|
return null_error();
|
2016-08-19 22:59:55 +08:00
|
|
|
}
|
|
|
|
|
2021-01-29 23:53:03 +08:00
|
|
|
PyNumberMethods *m = Py_TYPE(o)->tp_as_number;
|
|
|
|
if (m && m->nb_absolute) {
|
|
|
|
PyObject *res = m->nb_absolute(o);
|
|
|
|
assert(_Py_CheckSlotResult(o, "__abs__", res != NULL));
|
|
|
|
return res;
|
|
|
|
}
|
1995-07-18 22:12:02 +08:00
|
|
|
|
2010-05-09 23:52:27 +08:00
|
|
|
return type_error("bad operand type for abs(): '%.200s'", o);
|
1995-07-18 22:12:02 +08:00
|
|
|
}
|
|
|
|
|
2020-04-08 08:01:56 +08:00
|
|
|
|
2018-06-10 02:32:25 +08:00
|
|
|
int
|
|
|
|
PyIndex_Check(PyObject *obj)
|
|
|
|
{
|
2020-04-08 08:01:56 +08:00
|
|
|
return _PyIndex_Check(obj);
|
2018-06-10 02:32:25 +08:00
|
|
|
}
|
|
|
|
|
2020-04-08 08:01:56 +08:00
|
|
|
|
2013-12-12 03:07:54 +08:00
|
|
|
/* Return a Python int from the object item.
|
2020-05-28 15:33:45 +08:00
|
|
|
Can return an instance of int subclass.
|
2013-08-28 00:40:23 +08:00
|
|
|
Raise TypeError if the result is not an int
|
2007-11-07 05:34:58 +08:00
|
|
|
or if the object cannot be interpreted as an index.
|
Merge current trunk into p3yk. This includes the PyNumber_Index API change,
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)
........
2006-08-22 03:07:27 +08:00
|
|
|
*/
|
|
|
|
PyObject *
|
2020-05-28 15:33:45 +08:00
|
|
|
_PyNumber_Index(PyObject *item)
|
2006-03-08 02:50:55 +08:00
|
|
|
{
|
2016-08-19 22:59:55 +08:00
|
|
|
if (item == NULL) {
|
2010-05-09 23:52:27 +08:00
|
|
|
return null_error();
|
2016-08-19 22:59:55 +08:00
|
|
|
}
|
|
|
|
|
2010-05-09 23:52:27 +08:00
|
|
|
if (PyLong_Check(item)) {
|
|
|
|
Py_INCREF(item);
|
|
|
|
return item;
|
|
|
|
}
|
2020-04-08 08:01:56 +08:00
|
|
|
if (!_PyIndex_Check(item)) {
|
2010-05-09 23:52:27 +08:00
|
|
|
PyErr_Format(PyExc_TypeError,
|
|
|
|
"'%.200s' object cannot be interpreted "
|
2020-02-07 08:53:23 +08:00
|
|
|
"as an integer", Py_TYPE(item)->tp_name);
|
2013-12-12 03:07:54 +08:00
|
|
|
return NULL;
|
|
|
|
}
|
2021-01-29 23:53:03 +08:00
|
|
|
|
|
|
|
PyObject *result = Py_TYPE(item)->tp_as_number->nb_index(item);
|
|
|
|
assert(_Py_CheckSlotResult(item, "__index__", result != NULL));
|
|
|
|
if (!result || PyLong_CheckExact(result)) {
|
2013-12-12 03:07:54 +08:00
|
|
|
return result;
|
2021-01-29 23:53:03 +08:00
|
|
|
}
|
|
|
|
|
2013-12-12 03:07:54 +08:00
|
|
|
if (!PyLong_Check(result)) {
|
|
|
|
PyErr_Format(PyExc_TypeError,
|
|
|
|
"__index__ returned non-int (type %.200s)",
|
2020-02-07 08:53:23 +08:00
|
|
|
Py_TYPE(result)->tp_name);
|
2013-12-12 03:07:54 +08:00
|
|
|
Py_DECREF(result);
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
/* Issue #17576: warn if 'result' not of exact type int. */
|
|
|
|
if (PyErr_WarnFormat(PyExc_DeprecationWarning, 1,
|
|
|
|
"__index__ returned non-int (type %.200s). "
|
|
|
|
"The ability to return an instance of a strict subclass of int "
|
|
|
|
"is deprecated, and may be removed in a future version of Python.",
|
2020-02-07 08:53:23 +08:00
|
|
|
Py_TYPE(result)->tp_name)) {
|
2013-12-12 03:07:54 +08:00
|
|
|
Py_DECREF(result);
|
|
|
|
return NULL;
|
2010-05-09 23:52:27 +08:00
|
|
|
}
|
|
|
|
return result;
|
Merge current trunk into p3yk. This includes the PyNumber_Index API change,
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)
........
2006-08-22 03:07:27 +08:00
|
|
|
}
|
|
|
|
|
2020-05-28 15:33:45 +08:00
|
|
|
/* Return an exact Python int from the object item.
|
|
|
|
Raise TypeError if the result is not an int
|
|
|
|
or if the object cannot be interpreted as an index.
|
|
|
|
*/
|
|
|
|
PyObject *
|
|
|
|
PyNumber_Index(PyObject *item)
|
|
|
|
{
|
|
|
|
PyObject *result = _PyNumber_Index(item);
|
|
|
|
if (result != NULL && !PyLong_CheckExact(result)) {
|
|
|
|
Py_SETREF(result, _PyLong_Copy((PyLongObject *)result));
|
|
|
|
}
|
|
|
|
return result;
|
|
|
|
}
|
|
|
|
|
Merge current trunk into p3yk. This includes the PyNumber_Index API change,
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)
........
2006-08-22 03:07:27 +08:00
|
|
|
/* Return an error on Overflow only if err is not NULL*/
|
|
|
|
|
|
|
|
Py_ssize_t
|
|
|
|
PyNumber_AsSsize_t(PyObject *item, PyObject *err)
|
|
|
|
{
|
2010-05-09 23:52:27 +08:00
|
|
|
Py_ssize_t result;
|
|
|
|
PyObject *runerr;
|
2020-05-28 15:33:45 +08:00
|
|
|
PyObject *value = _PyNumber_Index(item);
|
2010-05-09 23:52:27 +08:00
|
|
|
if (value == NULL)
|
|
|
|
return -1;
|
|
|
|
|
|
|
|
/* We're done if PyLong_AsSsize_t() returns without error. */
|
|
|
|
result = PyLong_AsSsize_t(value);
|
2020-06-23 21:55:06 +08:00
|
|
|
if (result != -1)
|
|
|
|
goto finish;
|
|
|
|
|
|
|
|
PyThreadState *tstate = _PyThreadState_GET();
|
|
|
|
runerr = _PyErr_Occurred(tstate);
|
|
|
|
if (!runerr) {
|
2010-05-09 23:52:27 +08:00
|
|
|
goto finish;
|
2020-06-23 21:55:06 +08:00
|
|
|
}
|
2010-05-09 23:52:27 +08:00
|
|
|
|
|
|
|
/* Error handling code -- only manage OverflowError differently */
|
2020-06-23 21:55:06 +08:00
|
|
|
if (!PyErr_GivenExceptionMatches(runerr, PyExc_OverflowError)) {
|
2010-05-09 23:52:27 +08:00
|
|
|
goto finish;
|
2020-06-23 21:55:06 +08:00
|
|
|
}
|
|
|
|
_PyErr_Clear(tstate);
|
2010-05-09 23:52:27 +08:00
|
|
|
|
|
|
|
/* If no error-handling desired then the default clipping
|
2020-06-23 21:55:06 +08:00
|
|
|
is sufficient. */
|
2010-05-09 23:52:27 +08:00
|
|
|
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. */
|
2020-06-23 21:55:06 +08:00
|
|
|
_PyErr_Format(tstate, err,
|
|
|
|
"cannot fit '%.200s' into an index-sized integer",
|
|
|
|
Py_TYPE(item)->tp_name);
|
2010-05-09 23:52:27 +08:00
|
|
|
}
|
2007-11-07 05:34:58 +08:00
|
|
|
|
Merge current trunk into p3yk. This includes the PyNumber_Index API change,
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)
........
2006-08-22 03:07:27 +08:00
|
|
|
finish:
|
2010-05-09 23:52:27 +08:00
|
|
|
Py_DECREF(value);
|
|
|
|
return result;
|
2006-03-08 02:50:55 +08:00
|
|
|
}
|
|
|
|
|
Merge current trunk into p3yk. This includes the PyNumber_Index API change,
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)
........
2006-08-22 03:07:27 +08:00
|
|
|
|
1995-07-18 22:12:02 +08:00
|
|
|
PyObject *
|
2000-07-09 12:06:11 +08:00
|
|
|
PyNumber_Long(PyObject *o)
|
1995-07-18 22:12:02 +08:00
|
|
|
{
|
2016-08-22 01:03:08 +08:00
|
|
|
PyObject *result;
|
2010-05-09 23:52:27 +08:00
|
|
|
PyNumberMethods *m;
|
|
|
|
PyObject *trunc_func;
|
2015-02-03 07:21:08 +08:00
|
|
|
Py_buffer view;
|
2012-03-21 11:26:41 +08:00
|
|
|
_Py_IDENTIFIER(__trunc__);
|
2010-05-09 23:52:27 +08:00
|
|
|
|
2016-08-19 22:59:55 +08:00
|
|
|
if (o == NULL) {
|
2010-05-09 23:52:27 +08:00
|
|
|
return null_error();
|
2016-08-19 22:59:55 +08:00
|
|
|
}
|
|
|
|
|
2010-05-09 23:52:27 +08:00
|
|
|
if (PyLong_CheckExact(o)) {
|
|
|
|
Py_INCREF(o);
|
|
|
|
return o;
|
|
|
|
}
|
2020-02-07 08:53:23 +08:00
|
|
|
m = Py_TYPE(o)->tp_as_number;
|
2010-05-09 23:52:27 +08:00
|
|
|
if (m && m->nb_int) { /* This should include subclasses of int */
|
2020-05-26 23:43:38 +08:00
|
|
|
/* Convert using the nb_int slot, which should return something
|
|
|
|
of exact type int. */
|
|
|
|
result = m->nb_int(o);
|
2021-01-29 23:53:03 +08:00
|
|
|
assert(_Py_CheckSlotResult(o, "__int__", result != NULL));
|
|
|
|
if (!result || PyLong_CheckExact(result)) {
|
2020-05-26 23:43:38 +08:00
|
|
|
return result;
|
2021-01-29 23:53:03 +08:00
|
|
|
}
|
|
|
|
|
2020-05-26 23:43:38 +08:00
|
|
|
if (!PyLong_Check(result)) {
|
|
|
|
PyErr_Format(PyExc_TypeError,
|
2020-06-23 21:55:06 +08:00
|
|
|
"__int__ returned non-int (type %.200s)",
|
2020-07-10 18:40:38 +08:00
|
|
|
Py_TYPE(result)->tp_name);
|
2020-05-26 23:43:38 +08:00
|
|
|
Py_DECREF(result);
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
/* Issue #17576: warn if 'result' not of exact type int. */
|
|
|
|
if (PyErr_WarnFormat(PyExc_DeprecationWarning, 1,
|
|
|
|
"__int__ returned non-int (type %.200s). "
|
|
|
|
"The ability to return an instance of a strict subclass of int "
|
|
|
|
"is deprecated, and may be removed in a future version of Python.",
|
2020-07-10 18:40:38 +08:00
|
|
|
Py_TYPE(result)->tp_name)) {
|
2020-05-26 23:43:38 +08:00
|
|
|
Py_DECREF(result);
|
|
|
|
return NULL;
|
2016-08-22 01:03:08 +08:00
|
|
|
}
|
2020-05-26 23:43:38 +08:00
|
|
|
Py_SETREF(result, _PyLong_Copy((PyLongObject *)result));
|
2016-08-22 01:03:08 +08:00
|
|
|
return result;
|
2010-05-09 23:52:27 +08:00
|
|
|
}
|
2019-06-02 05:05:48 +08:00
|
|
|
if (m && m->nb_index) {
|
2020-05-28 15:33:45 +08:00
|
|
|
return PyNumber_Index(o);
|
2019-06-02 05:05:48 +08:00
|
|
|
}
|
2012-03-21 11:48:11 +08:00
|
|
|
trunc_func = _PyObject_LookupSpecial(o, &PyId___trunc__);
|
2010-05-09 23:52:27 +08:00
|
|
|
if (trunc_func) {
|
2017-02-16 08:26:01 +08:00
|
|
|
result = _PyObject_CallNoArg(trunc_func);
|
2010-05-09 23:52:27 +08:00
|
|
|
Py_DECREF(trunc_func);
|
2016-08-22 01:03:08 +08:00
|
|
|
if (result == NULL || PyLong_CheckExact(result)) {
|
|
|
|
return result;
|
|
|
|
}
|
|
|
|
if (PyLong_Check(result)) {
|
|
|
|
Py_SETREF(result, _PyLong_Copy((PyLongObject *)result));
|
|
|
|
return result;
|
|
|
|
}
|
2010-05-09 23:52:27 +08:00
|
|
|
/* __trunc__ is specified to return an Integral type,
|
2015-11-02 11:37:02 +08:00
|
|
|
but int() needs to return an int. */
|
2020-05-26 23:43:38 +08:00
|
|
|
if (!PyIndex_Check(result)) {
|
2013-12-12 03:07:54 +08:00
|
|
|
PyErr_Format(
|
|
|
|
PyExc_TypeError,
|
|
|
|
"__trunc__ returned non-Integral (type %.200s)",
|
2020-02-07 08:53:23 +08:00
|
|
|
Py_TYPE(result)->tp_name);
|
2016-08-22 01:03:08 +08:00
|
|
|
Py_DECREF(result);
|
2013-12-12 03:07:54 +08:00
|
|
|
return NULL;
|
|
|
|
}
|
2020-05-26 23:43:38 +08:00
|
|
|
Py_SETREF(result, PyNumber_Index(result));
|
2016-08-22 01:03:08 +08:00
|
|
|
return result;
|
2010-05-09 23:52:27 +08:00
|
|
|
}
|
2012-03-21 11:48:11 +08:00
|
|
|
if (PyErr_Occurred())
|
|
|
|
return NULL;
|
2010-05-09 23:52:27 +08:00
|
|
|
|
2015-02-03 07:21:08 +08:00
|
|
|
if (PyUnicode_Check(o))
|
2020-06-29 12:00:43 +08:00
|
|
|
/* The below check is done in PyLong_FromUnicodeObject(). */
|
2015-02-03 07:21:08 +08:00
|
|
|
return PyLong_FromUnicodeObject(o, 10);
|
|
|
|
|
2015-11-07 10:32:21 +08:00
|
|
|
if (PyBytes_Check(o))
|
2010-05-09 23:52:27 +08:00
|
|
|
/* need to do extra error checking that PyLong_FromString()
|
2013-08-04 01:55:06 +08:00
|
|
|
* doesn't do. In particular int('9\x005') must raise an
|
|
|
|
* exception, not truncate at the null.
|
2010-05-09 23:52:27 +08:00
|
|
|
*/
|
2015-11-07 10:32:21 +08:00
|
|
|
return _PyLong_FromBytes(PyBytes_AS_STRING(o),
|
|
|
|
PyBytes_GET_SIZE(o), 10);
|
|
|
|
|
|
|
|
if (PyByteArray_Check(o))
|
|
|
|
return _PyLong_FromBytes(PyByteArray_AS_STRING(o),
|
|
|
|
PyByteArray_GET_SIZE(o), 10);
|
|
|
|
|
|
|
|
if (PyObject_GetBuffer(o, &view, PyBUF_SIMPLE) == 0) {
|
2016-08-22 01:03:08 +08:00
|
|
|
PyObject *bytes;
|
2015-11-07 10:32:21 +08:00
|
|
|
|
|
|
|
/* Copy to NUL-terminated buffer. */
|
|
|
|
bytes = PyBytes_FromStringAndSize((const char *)view.buf, view.len);
|
|
|
|
if (bytes == NULL) {
|
|
|
|
PyBuffer_Release(&view);
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
result = _PyLong_FromBytes(PyBytes_AS_STRING(bytes),
|
|
|
|
PyBytes_GET_SIZE(bytes), 10);
|
|
|
|
Py_DECREF(bytes);
|
2015-02-03 07:21:08 +08:00
|
|
|
PyBuffer_Release(&view);
|
|
|
|
return result;
|
|
|
|
}
|
2010-05-09 23:52:27 +08:00
|
|
|
|
2015-02-03 07:21:08 +08:00
|
|
|
return type_error("int() argument must be a string, a bytes-like object "
|
2020-10-09 19:14:37 +08:00
|
|
|
"or a real number, not '%.200s'", o);
|
1995-07-18 22:12:02 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
PyObject *
|
2000-07-09 12:06:11 +08:00
|
|
|
PyNumber_Float(PyObject *o)
|
1995-07-18 22:12:02 +08:00
|
|
|
{
|
2016-08-19 22:59:55 +08:00
|
|
|
if (o == NULL) {
|
2010-05-09 23:52:27 +08:00
|
|
|
return null_error();
|
2016-08-19 22:59:55 +08:00
|
|
|
}
|
|
|
|
|
2016-06-04 02:42:55 +08:00
|
|
|
if (PyFloat_CheckExact(o)) {
|
2021-01-29 23:53:03 +08:00
|
|
|
return Py_NewRef(o);
|
2016-06-04 02:42:55 +08:00
|
|
|
}
|
2021-01-29 23:53:03 +08:00
|
|
|
|
|
|
|
PyNumberMethods *m = Py_TYPE(o)->tp_as_number;
|
2010-05-09 23:52:27 +08:00
|
|
|
if (m && m->nb_float) { /* This should include subclasses of float */
|
|
|
|
PyObject *res = m->nb_float(o);
|
2021-01-29 23:53:03 +08:00
|
|
|
assert(_Py_CheckSlotResult(o, "__float__", res != NULL));
|
2016-06-04 02:42:55 +08:00
|
|
|
if (!res || PyFloat_CheckExact(res)) {
|
|
|
|
return res;
|
|
|
|
}
|
2021-01-29 23:53:03 +08:00
|
|
|
|
2016-06-04 02:42:55 +08:00
|
|
|
if (!PyFloat_Check(res)) {
|
2010-05-09 23:52:27 +08:00
|
|
|
PyErr_Format(PyExc_TypeError,
|
2016-06-04 02:42:55 +08:00
|
|
|
"%.50s.__float__ returned non-float (type %.50s)",
|
2020-02-07 08:53:23 +08:00
|
|
|
Py_TYPE(o)->tp_name, Py_TYPE(res)->tp_name);
|
2016-06-04 02:42:55 +08:00
|
|
|
Py_DECREF(res);
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
/* Issue #26983: warn if 'res' not of exact type float. */
|
|
|
|
if (PyErr_WarnFormat(PyExc_DeprecationWarning, 1,
|
|
|
|
"%.50s.__float__ returned non-float (type %.50s). "
|
|
|
|
"The ability to return an instance of a strict subclass of float "
|
|
|
|
"is deprecated, and may be removed in a future version of Python.",
|
2020-02-07 08:53:23 +08:00
|
|
|
Py_TYPE(o)->tp_name, Py_TYPE(res)->tp_name)) {
|
2010-05-09 23:52:27 +08:00
|
|
|
Py_DECREF(res);
|
|
|
|
return NULL;
|
|
|
|
}
|
2021-01-29 23:53:03 +08:00
|
|
|
double val = PyFloat_AS_DOUBLE(res);
|
2016-06-04 02:42:55 +08:00
|
|
|
Py_DECREF(res);
|
|
|
|
return PyFloat_FromDouble(val);
|
2010-05-09 23:52:27 +08:00
|
|
|
}
|
2021-01-29 23:53:03 +08:00
|
|
|
|
2019-06-02 05:05:48 +08:00
|
|
|
if (m && m->nb_index) {
|
2020-05-28 15:33:45 +08:00
|
|
|
PyObject *res = _PyNumber_Index(o);
|
2019-06-02 05:05:48 +08:00
|
|
|
if (!res) {
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
double val = PyLong_AsDouble(res);
|
|
|
|
Py_DECREF(res);
|
|
|
|
if (val == -1.0 && PyErr_Occurred()) {
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
return PyFloat_FromDouble(val);
|
|
|
|
}
|
2021-01-29 23:53:03 +08:00
|
|
|
|
|
|
|
/* A float subclass with nb_float == NULL */
|
|
|
|
if (PyFloat_Check(o)) {
|
2016-06-04 02:42:55 +08:00
|
|
|
return PyFloat_FromDouble(PyFloat_AS_DOUBLE(o));
|
2010-05-09 23:52:27 +08:00
|
|
|
}
|
|
|
|
return PyFloat_FromString(o);
|
1995-07-18 22:12:02 +08:00
|
|
|
}
|
|
|
|
|
Merged revisions 55817-55961 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/p3yk
................
r55837 | guido.van.rossum | 2007-06-08 16:04:42 -0700 (Fri, 08 Jun 2007) | 2 lines
PEP 3119 -- the abc module.
................
r55838 | guido.van.rossum | 2007-06-08 17:38:55 -0700 (Fri, 08 Jun 2007) | 2 lines
Implement part of PEP 3119 -- One Trick Ponies.
................
r55847 | guido.van.rossum | 2007-06-09 08:28:06 -0700 (Sat, 09 Jun 2007) | 2 lines
Different way to do one trick ponies, allowing registration (per PEP strawman).
................
r55849 | guido.van.rossum | 2007-06-09 18:06:38 -0700 (Sat, 09 Jun 2007) | 3 lines
Make sure that the magic looking for __hash__ (etc.) doesn't apply to
real subclasses of Hashable.
................
r55852 | guido.van.rossum | 2007-06-10 08:29:51 -0700 (Sun, 10 Jun 2007) | 2 lines
Add some more examples, e.g. generators and dict views.
................
r55853 | guido.van.rossum | 2007-06-10 08:31:59 -0700 (Sun, 10 Jun 2007) | 2 lines
keys() and items() *are* containers -- just values() isn't.
................
r55864 | georg.brandl | 2007-06-10 15:29:40 -0700 (Sun, 10 Jun 2007) | 2 lines
PEP 3127: new octal literals, binary literals.
................
r55865 | georg.brandl | 2007-06-10 15:31:37 -0700 (Sun, 10 Jun 2007) | 2 lines
Some octal literal fixes in Tools.
................
r55866 | georg.brandl | 2007-06-10 15:37:43 -0700 (Sun, 10 Jun 2007) | 2 lines
Tokenizer changes for PEP 3127.
................
r55867 | georg.brandl | 2007-06-10 15:37:55 -0700 (Sun, 10 Jun 2007) | 2 lines
Some docs for PEP 3127.
................
r55868 | georg.brandl | 2007-06-10 15:44:39 -0700 (Sun, 10 Jun 2007) | 2 lines
Missed a place in intobject.c. Is that used anymore anyway?
................
r55871 | neal.norwitz | 2007-06-10 18:31:49 -0700 (Sun, 10 Jun 2007) | 182 lines
Merged revisions 55729-55868 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r55731 | neal.norwitz | 2007-06-01 00:29:12 -0700 (Fri, 01 Jun 2007) | 7 lines
SF 1668596/1720897: distutils now copies data files
even if package_dir is empty.
This needs to be backported. I'm too tired tonight. It would be great
if someone backports this if the buildbots are ok with it. Otherwise,
I will try to get to it tomorrow.
........
r55732 | georg.brandl | 2007-06-01 04:33:33 -0700 (Fri, 01 Jun 2007) | 2 lines
Bug #1722484: remove docstrings again when running with -OO.
........
r55735 | georg.brandl | 2007-06-01 12:20:27 -0700 (Fri, 01 Jun 2007) | 2 lines
Fix wrong issue number.
........
r55739 | brett.cannon | 2007-06-01 20:02:29 -0700 (Fri, 01 Jun 2007) | 3 lines
Have configure raise an error when building on AtheOS. Code specific to AtheOS
will be removed in Python 2.7.
........
r55746 | neal.norwitz | 2007-06-02 11:33:53 -0700 (Sat, 02 Jun 2007) | 1 line
Update expected birthday of 2.6
........
r55751 | neal.norwitz | 2007-06-03 13:32:50 -0700 (Sun, 03 Jun 2007) | 10 lines
Backout the original 'fix' to 1721309 which had no effect.
Different versions of Berkeley DB handle this differently.
The comments and bug report should have the details. Memory is allocated
in 4.4 (and presumably earlier), but not in 4.5. Thus
4.5 has the free error, but not earlier versions.
Mostly update comments, plus make the free conditional.
This fix was already applied to the 2.5 branch.
........
r55752 | brett.cannon | 2007-06-03 16:13:41 -0700 (Sun, 03 Jun 2007) | 6 lines
Make _strptime.TimeRE().pattern() use ``\s+`` for matching whitespace instead
of ``\s*``. This prevents patterns from "stealing" bits from other patterns in
order to make a match work.
Closes bug #1730389. Will be backported.
........
r55766 | hyeshik.chang | 2007-06-05 11:16:52 -0700 (Tue, 05 Jun 2007) | 4 lines
Fix build on FreeBSD. Bluetooth HCI API in FreeBSD is quite different
from Linux's. Just fix the build for now but the code doesn't
support the complete capability of HCI on FreeBSD yet.
........
r55770 | hyeshik.chang | 2007-06-05 11:58:51 -0700 (Tue, 05 Jun 2007) | 4 lines
Bug #1728403: Fix a bug that CJKCodecs StreamReader hangs when it
reads a file that ends with incomplete sequence and sizehint argument
for .read() is specified.
........
r55775 | hyeshik.chang | 2007-06-05 12:28:15 -0700 (Tue, 05 Jun 2007) | 2 lines
Fix for Windows: close a temporary file before trying to delete it.
........
r55783 | guido.van.rossum | 2007-06-05 14:24:47 -0700 (Tue, 05 Jun 2007) | 2 lines
Patch by Tim Delany (missing DECREF). SF #1731330.
........
r55785 | collin.winter | 2007-06-05 17:17:35 -0700 (Tue, 05 Jun 2007) | 3 lines
Patch #1731049: make threading.py use a proper "raise" when checking internal state, rather than assert statements (which get stripped out by -O).
........
r55786 | facundo.batista | 2007-06-06 08:13:37 -0700 (Wed, 06 Jun 2007) | 4 lines
FTP.ntransfercmd method now uses create_connection when passive,
using the timeout received in connection time.
........
r55792 | facundo.batista | 2007-06-06 10:15:23 -0700 (Wed, 06 Jun 2007) | 7 lines
Added an optional timeout parameter to function urllib2.urlopen,
with tests in test_urllib2net.py (must have network resource
enabled to execute them). Also modified test_urllib2.py because
testing mock classes must take it into acount. Docs are also
updated.
........
r55793 | thomas.heller | 2007-06-06 13:19:19 -0700 (Wed, 06 Jun 2007) | 1 line
Build _ctypes and _ctypes_test in the ReleaseAMD64 configuration.
........
r55802 | georg.brandl | 2007-06-07 06:23:24 -0700 (Thu, 07 Jun 2007) | 3 lines
Disallow function calls like foo(None=1).
Backport from py3k rev. 55708 by Guido.
........
r55804 | georg.brandl | 2007-06-07 06:30:24 -0700 (Thu, 07 Jun 2007) | 2 lines
Make reindent.py executable.
........
r55805 | georg.brandl | 2007-06-07 06:34:10 -0700 (Thu, 07 Jun 2007) | 2 lines
Patch #1667860: Fix UnboundLocalError in urllib2.
........
r55821 | kristjan.jonsson | 2007-06-07 16:53:49 -0700 (Thu, 07 Jun 2007) | 1 line
Fixing changes to getbuildinfo.c that broke linux builds
........
r55828 | thomas.heller | 2007-06-08 09:10:27 -0700 (Fri, 08 Jun 2007) | 1 line
Make this test work with older Python releases where struct has no 't' format character.
........
r55829 | martin.v.loewis | 2007-06-08 10:29:20 -0700 (Fri, 08 Jun 2007) | 3 lines
Bug #1733488: Fix compilation of bufferobject.c on AIX.
Will backport to 2.5.
........
r55831 | thomas.heller | 2007-06-08 11:20:09 -0700 (Fri, 08 Jun 2007) | 2 lines
[ 1715718 ] x64 clean compile patch for _ctypes, by Kristj?n Valur
with small modifications.
........
r55832 | thomas.heller | 2007-06-08 12:01:06 -0700 (Fri, 08 Jun 2007) | 1 line
Fix gcc warnings intruduced by passing Py_ssize_t to PyErr_Format calls.
........
r55833 | thomas.heller | 2007-06-08 12:08:31 -0700 (Fri, 08 Jun 2007) | 2 lines
Fix wrong documentation, and correct the punktuation.
Closes [1700455].
........
r55834 | thomas.heller | 2007-06-08 12:14:23 -0700 (Fri, 08 Jun 2007) | 1 line
Fix warnings by using proper function prototype.
........
r55839 | neal.norwitz | 2007-06-08 20:36:34 -0700 (Fri, 08 Jun 2007) | 7 lines
Prevent expandtabs() on string and unicode objects from causing a segfault when
a large width is passed on 32-bit platforms. Found by Google.
It would be good for people to review this especially carefully and verify
I don't have an off by one error and there is no other way to cause overflow.
........
r55841 | neal.norwitz | 2007-06-08 21:48:22 -0700 (Fri, 08 Jun 2007) | 1 line
Use macro version of GET_SIZE to avoid Coverity warning (#150) about a possible error.
........
r55842 | martin.v.loewis | 2007-06-09 00:42:52 -0700 (Sat, 09 Jun 2007) | 3 lines
Patch #1733960: Allow T_LONGLONG to accept ints.
Will backport to 2.5.
........
r55843 | martin.v.loewis | 2007-06-09 00:58:05 -0700 (Sat, 09 Jun 2007) | 2 lines
Fix Windows build.
........
r55845 | martin.v.loewis | 2007-06-09 03:10:26 -0700 (Sat, 09 Jun 2007) | 2 lines
Provide LLONG_MAX for S390.
........
r55854 | thomas.heller | 2007-06-10 08:59:17 -0700 (Sun, 10 Jun 2007) | 4 lines
First version of build scripts for Windows/AMD64 (no external
components are built yet, and 'kill_python' is disabled).
........
r55855 | thomas.heller | 2007-06-10 10:55:51 -0700 (Sun, 10 Jun 2007) | 3 lines
For now, disable the _bsddb, _sqlite3, _ssl, _testcapi, _tkinter
modules in the ReleaseAMD64 configuration because they do not compile.
........
r55856 | thomas.heller | 2007-06-10 11:27:54 -0700 (Sun, 10 Jun 2007) | 1 line
Need to set the environment variables, otherwise devenv.com is not found.
........
r55860 | thomas.heller | 2007-06-10 14:01:17 -0700 (Sun, 10 Jun 2007) | 1 line
Revert commit 55855.
........
................
r55880 | neal.norwitz | 2007-06-10 22:07:36 -0700 (Sun, 10 Jun 2007) | 5 lines
Fix the refleak counter on test_collections. The ABC metaclass creates
a registry which must be cleared on each run. Otherwise, there *seem*
to be refleaks when there really aren't any. (The class is held within
the registry even though it's no longer needed.)
................
r55884 | neal.norwitz | 2007-06-10 22:46:33 -0700 (Sun, 10 Jun 2007) | 1 line
These tests have been removed, so they are no longer needed here
................
r55886 | georg.brandl | 2007-06-11 00:26:37 -0700 (Mon, 11 Jun 2007) | 3 lines
Optimize access to True and False in the compiler (if True)
and the peepholer (LOAD_NAME True).
................
r55905 | georg.brandl | 2007-06-11 10:02:26 -0700 (Mon, 11 Jun 2007) | 5 lines
Remove __oct__ and __hex__ and use __index__ for converting
non-ints before formatting in a base.
Add a bin() builtin.
................
r55906 | georg.brandl | 2007-06-11 10:04:44 -0700 (Mon, 11 Jun 2007) | 2 lines
int(x, 0) does not "guess".
................
r55907 | georg.brandl | 2007-06-11 10:05:47 -0700 (Mon, 11 Jun 2007) | 2 lines
Add a comment to explain that nb_oct and nb_hex are nonfunctional.
................
r55908 | guido.van.rossum | 2007-06-11 10:49:18 -0700 (Mon, 11 Jun 2007) | 2 lines
Get rid of unused imports and comment.
................
r55910 | guido.van.rossum | 2007-06-11 13:05:17 -0700 (Mon, 11 Jun 2007) | 2 lines
_Abstract.__new__ now requires either no arguments or __init__ overridden.
................
r55911 | guido.van.rossum | 2007-06-11 13:07:49 -0700 (Mon, 11 Jun 2007) | 7 lines
Move the collections ABCs to a separate file, _abcoll.py, in order to avoid
needing to import _collections.so during the bootstrap (this will become
apparent in the next submit of os.py).
Add (plain and mutable) ABCs for Set, Mapping, Sequence.
................
r55912 | guido.van.rossum | 2007-06-11 13:09:31 -0700 (Mon, 11 Jun 2007) | 2 lines
Rewrite the _Environ class to use the new collections ABCs.
................
r55913 | guido.van.rossum | 2007-06-11 13:59:45 -0700 (Mon, 11 Jun 2007) | 72 lines
Merged revisions 55869-55912 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r55869 | neal.norwitz | 2007-06-10 17:42:11 -0700 (Sun, 10 Jun 2007) | 1 line
Add Atul Varma for patch # 1667860
........
r55870 | neal.norwitz | 2007-06-10 18:22:03 -0700 (Sun, 10 Jun 2007) | 1 line
Ignore valgrind problems on Ubuntu from ld
........
r55872 | neal.norwitz | 2007-06-10 18:48:46 -0700 (Sun, 10 Jun 2007) | 2 lines
Ignore config.status.lineno which seems new (new autoconf?)
........
r55873 | neal.norwitz | 2007-06-10 19:14:39 -0700 (Sun, 10 Jun 2007) | 1 line
Prevent these tests from running on Win64 since they don\'t apply there either
........
r55874 | neal.norwitz | 2007-06-10 19:16:10 -0700 (Sun, 10 Jun 2007) | 5 lines
Fix a bug when there was a newline in the string expandtabs was called on.
This also catches another condition that can overflow.
Will backport.
........
r55879 | neal.norwitz | 2007-06-10 21:52:37 -0700 (Sun, 10 Jun 2007) | 1 line
Prevent hang if the port cannot be opened.
........
r55881 | neal.norwitz | 2007-06-10 22:28:45 -0700 (Sun, 10 Jun 2007) | 4 lines
Add all of the distuils modules that don't seem to have explicit tests. :-(
Move an import in mworkscompiler so that this module can be imported on
any platform. Hopefully this works on all platforms.
........
r55882 | neal.norwitz | 2007-06-10 22:35:10 -0700 (Sun, 10 Jun 2007) | 4 lines
SF #1734732, lower case the module names per PEP 8.
Will backport.
........
r55885 | neal.norwitz | 2007-06-10 23:16:48 -0700 (Sun, 10 Jun 2007) | 4 lines
Not sure why this only fails sometimes on Unix machines. Better
to disable it and only import msvccompiler on Windows since that's
the only place it can work anyways.
........
r55887 | neal.norwitz | 2007-06-11 00:29:43 -0700 (Mon, 11 Jun 2007) | 4 lines
Bug #1734723: Fix repr.Repr() so it doesn't ignore the maxtuple attribute.
Will backport
........
r55889 | neal.norwitz | 2007-06-11 00:36:24 -0700 (Mon, 11 Jun 2007) | 1 line
Reflow long line
........
r55896 | thomas.heller | 2007-06-11 08:58:33 -0700 (Mon, 11 Jun 2007) | 3 lines
Use "O&" in calls to PyArg_Parse when we need a 'void*' instead of "k"
or "K" codes.
........
r55901 | facundo.batista | 2007-06-11 09:27:08 -0700 (Mon, 11 Jun 2007) | 5 lines
Added versionchanged flag to all the methods which received
a new optional timeout parameter, and a versionadded flag to
the socket.create_connection function.
........
................
r55914 | guido.van.rossum | 2007-06-11 14:19:50 -0700 (Mon, 11 Jun 2007) | 3 lines
New super() implementation, for PEP 3135 (though the PEP is not yet updated
to this design, and small tweaks may still be made later).
................
r55923 | guido.van.rossum | 2007-06-11 21:15:24 -0700 (Mon, 11 Jun 2007) | 4 lines
I'm guessing this module broke when Neal ripped out the types module --
it used 'list' both as a local variable and as the built-in list type.
Renamed the local variable since that was easier.
................
r55924 | guido.van.rossum | 2007-06-11 21:20:05 -0700 (Mon, 11 Jun 2007) | 5 lines
Change all occurrences of super(<thisclass>, <firstarg>) to super().
Seems to have worked, all the tests still pass.
Exception: test_descr and test_descrtut, which have tons of these
and are there to test the various usages.
................
r55939 | collin.winter | 2007-06-12 13:57:33 -0700 (Tue, 12 Jun 2007) | 1 line
Patch #1735485: remove StandardError from the exception hierarchy.
................
r55954 | neal.norwitz | 2007-06-12 21:56:32 -0700 (Tue, 12 Jun 2007) | 51 lines
Merged revisions 55913-55950 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r55926 | marc-andre.lemburg | 2007-06-12 02:09:58 -0700 (Tue, 12 Jun 2007) | 3 lines
Apply patch #1734945 to support TurboLinux as distribution.
........
r55927 | marc-andre.lemburg | 2007-06-12 02:26:49 -0700 (Tue, 12 Jun 2007) | 3 lines
Add patch #1726668: Windows Vista support.
........
r55929 | thomas.heller | 2007-06-12 08:36:22 -0700 (Tue, 12 Jun 2007) | 1 line
Checkout, but do not yet try to build, exernal sources.
........
r55930 | thomas.heller | 2007-06-12 09:08:27 -0700 (Tue, 12 Jun 2007) | 6 lines
Add bufferoverflowU.lib to the libraries needed by _ssl (is this the
right thing to do?).
Set the /XP64 /RETAIL build enviroment in the makefile when building
ReleaseAMD64.
........
r55931 | thomas.heller | 2007-06-12 09:23:19 -0700 (Tue, 12 Jun 2007) | 5 lines
Revert this change, since it breaks the win32 build:
Add bufferoverflowU.lib to the libraries needed by _ssl (is this the
right thing to do?).
........
r55934 | thomas.heller | 2007-06-12 10:28:31 -0700 (Tue, 12 Jun 2007) | 3 lines
Specify the bufferoverflowU.lib to the makefile on the command line
(for ReleaseAMD64 builds).
........
r55937 | thomas.heller | 2007-06-12 12:02:59 -0700 (Tue, 12 Jun 2007) | 3 lines
Add bufferoverflowU.lib to PCBuild\_bsddb.vcproj.
Build sqlite3.dll and bsddb.
........
r55938 | thomas.heller | 2007-06-12 12:56:12 -0700 (Tue, 12 Jun 2007) | 2 lines
Don't rebuild Berkeley DB if not needed (this was committed by accident).
........
r55948 | martin.v.loewis | 2007-06-12 20:42:19 -0700 (Tue, 12 Jun 2007) | 3 lines
Provide PY_LLONG_MAX on all systems having long long.
Will backport to 2.5.
........
................
r55959 | guido.van.rossum | 2007-06-13 09:22:41 -0700 (Wed, 13 Jun 2007) | 2 lines
Fix a compilation warning.
................
2007-06-14 02:07:49 +08:00
|
|
|
|
|
|
|
PyObject *
|
|
|
|
PyNumber_ToBase(PyObject *n, int base)
|
|
|
|
{
|
2020-03-10 02:03:38 +08:00
|
|
|
if (!(base == 2 || base == 8 || base == 10 || base == 16)) {
|
|
|
|
PyErr_SetString(PyExc_SystemError,
|
|
|
|
"PyNumber_ToBase: base must be 2, 8, 10 or 16");
|
|
|
|
return NULL;
|
|
|
|
}
|
2020-05-28 15:33:45 +08:00
|
|
|
PyObject *index = _PyNumber_Index(n);
|
2010-05-09 23:52:27 +08:00
|
|
|
if (!index)
|
|
|
|
return NULL;
|
2020-03-10 02:03:38 +08:00
|
|
|
PyObject *res = _PyLong_Format(index, base);
|
2010-05-09 23:52:27 +08:00
|
|
|
Py_DECREF(index);
|
|
|
|
return res;
|
Merged revisions 55817-55961 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/p3yk
................
r55837 | guido.van.rossum | 2007-06-08 16:04:42 -0700 (Fri, 08 Jun 2007) | 2 lines
PEP 3119 -- the abc module.
................
r55838 | guido.van.rossum | 2007-06-08 17:38:55 -0700 (Fri, 08 Jun 2007) | 2 lines
Implement part of PEP 3119 -- One Trick Ponies.
................
r55847 | guido.van.rossum | 2007-06-09 08:28:06 -0700 (Sat, 09 Jun 2007) | 2 lines
Different way to do one trick ponies, allowing registration (per PEP strawman).
................
r55849 | guido.van.rossum | 2007-06-09 18:06:38 -0700 (Sat, 09 Jun 2007) | 3 lines
Make sure that the magic looking for __hash__ (etc.) doesn't apply to
real subclasses of Hashable.
................
r55852 | guido.van.rossum | 2007-06-10 08:29:51 -0700 (Sun, 10 Jun 2007) | 2 lines
Add some more examples, e.g. generators and dict views.
................
r55853 | guido.van.rossum | 2007-06-10 08:31:59 -0700 (Sun, 10 Jun 2007) | 2 lines
keys() and items() *are* containers -- just values() isn't.
................
r55864 | georg.brandl | 2007-06-10 15:29:40 -0700 (Sun, 10 Jun 2007) | 2 lines
PEP 3127: new octal literals, binary literals.
................
r55865 | georg.brandl | 2007-06-10 15:31:37 -0700 (Sun, 10 Jun 2007) | 2 lines
Some octal literal fixes in Tools.
................
r55866 | georg.brandl | 2007-06-10 15:37:43 -0700 (Sun, 10 Jun 2007) | 2 lines
Tokenizer changes for PEP 3127.
................
r55867 | georg.brandl | 2007-06-10 15:37:55 -0700 (Sun, 10 Jun 2007) | 2 lines
Some docs for PEP 3127.
................
r55868 | georg.brandl | 2007-06-10 15:44:39 -0700 (Sun, 10 Jun 2007) | 2 lines
Missed a place in intobject.c. Is that used anymore anyway?
................
r55871 | neal.norwitz | 2007-06-10 18:31:49 -0700 (Sun, 10 Jun 2007) | 182 lines
Merged revisions 55729-55868 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r55731 | neal.norwitz | 2007-06-01 00:29:12 -0700 (Fri, 01 Jun 2007) | 7 lines
SF 1668596/1720897: distutils now copies data files
even if package_dir is empty.
This needs to be backported. I'm too tired tonight. It would be great
if someone backports this if the buildbots are ok with it. Otherwise,
I will try to get to it tomorrow.
........
r55732 | georg.brandl | 2007-06-01 04:33:33 -0700 (Fri, 01 Jun 2007) | 2 lines
Bug #1722484: remove docstrings again when running with -OO.
........
r55735 | georg.brandl | 2007-06-01 12:20:27 -0700 (Fri, 01 Jun 2007) | 2 lines
Fix wrong issue number.
........
r55739 | brett.cannon | 2007-06-01 20:02:29 -0700 (Fri, 01 Jun 2007) | 3 lines
Have configure raise an error when building on AtheOS. Code specific to AtheOS
will be removed in Python 2.7.
........
r55746 | neal.norwitz | 2007-06-02 11:33:53 -0700 (Sat, 02 Jun 2007) | 1 line
Update expected birthday of 2.6
........
r55751 | neal.norwitz | 2007-06-03 13:32:50 -0700 (Sun, 03 Jun 2007) | 10 lines
Backout the original 'fix' to 1721309 which had no effect.
Different versions of Berkeley DB handle this differently.
The comments and bug report should have the details. Memory is allocated
in 4.4 (and presumably earlier), but not in 4.5. Thus
4.5 has the free error, but not earlier versions.
Mostly update comments, plus make the free conditional.
This fix was already applied to the 2.5 branch.
........
r55752 | brett.cannon | 2007-06-03 16:13:41 -0700 (Sun, 03 Jun 2007) | 6 lines
Make _strptime.TimeRE().pattern() use ``\s+`` for matching whitespace instead
of ``\s*``. This prevents patterns from "stealing" bits from other patterns in
order to make a match work.
Closes bug #1730389. Will be backported.
........
r55766 | hyeshik.chang | 2007-06-05 11:16:52 -0700 (Tue, 05 Jun 2007) | 4 lines
Fix build on FreeBSD. Bluetooth HCI API in FreeBSD is quite different
from Linux's. Just fix the build for now but the code doesn't
support the complete capability of HCI on FreeBSD yet.
........
r55770 | hyeshik.chang | 2007-06-05 11:58:51 -0700 (Tue, 05 Jun 2007) | 4 lines
Bug #1728403: Fix a bug that CJKCodecs StreamReader hangs when it
reads a file that ends with incomplete sequence and sizehint argument
for .read() is specified.
........
r55775 | hyeshik.chang | 2007-06-05 12:28:15 -0700 (Tue, 05 Jun 2007) | 2 lines
Fix for Windows: close a temporary file before trying to delete it.
........
r55783 | guido.van.rossum | 2007-06-05 14:24:47 -0700 (Tue, 05 Jun 2007) | 2 lines
Patch by Tim Delany (missing DECREF). SF #1731330.
........
r55785 | collin.winter | 2007-06-05 17:17:35 -0700 (Tue, 05 Jun 2007) | 3 lines
Patch #1731049: make threading.py use a proper "raise" when checking internal state, rather than assert statements (which get stripped out by -O).
........
r55786 | facundo.batista | 2007-06-06 08:13:37 -0700 (Wed, 06 Jun 2007) | 4 lines
FTP.ntransfercmd method now uses create_connection when passive,
using the timeout received in connection time.
........
r55792 | facundo.batista | 2007-06-06 10:15:23 -0700 (Wed, 06 Jun 2007) | 7 lines
Added an optional timeout parameter to function urllib2.urlopen,
with tests in test_urllib2net.py (must have network resource
enabled to execute them). Also modified test_urllib2.py because
testing mock classes must take it into acount. Docs are also
updated.
........
r55793 | thomas.heller | 2007-06-06 13:19:19 -0700 (Wed, 06 Jun 2007) | 1 line
Build _ctypes and _ctypes_test in the ReleaseAMD64 configuration.
........
r55802 | georg.brandl | 2007-06-07 06:23:24 -0700 (Thu, 07 Jun 2007) | 3 lines
Disallow function calls like foo(None=1).
Backport from py3k rev. 55708 by Guido.
........
r55804 | georg.brandl | 2007-06-07 06:30:24 -0700 (Thu, 07 Jun 2007) | 2 lines
Make reindent.py executable.
........
r55805 | georg.brandl | 2007-06-07 06:34:10 -0700 (Thu, 07 Jun 2007) | 2 lines
Patch #1667860: Fix UnboundLocalError in urllib2.
........
r55821 | kristjan.jonsson | 2007-06-07 16:53:49 -0700 (Thu, 07 Jun 2007) | 1 line
Fixing changes to getbuildinfo.c that broke linux builds
........
r55828 | thomas.heller | 2007-06-08 09:10:27 -0700 (Fri, 08 Jun 2007) | 1 line
Make this test work with older Python releases where struct has no 't' format character.
........
r55829 | martin.v.loewis | 2007-06-08 10:29:20 -0700 (Fri, 08 Jun 2007) | 3 lines
Bug #1733488: Fix compilation of bufferobject.c on AIX.
Will backport to 2.5.
........
r55831 | thomas.heller | 2007-06-08 11:20:09 -0700 (Fri, 08 Jun 2007) | 2 lines
[ 1715718 ] x64 clean compile patch for _ctypes, by Kristj?n Valur
with small modifications.
........
r55832 | thomas.heller | 2007-06-08 12:01:06 -0700 (Fri, 08 Jun 2007) | 1 line
Fix gcc warnings intruduced by passing Py_ssize_t to PyErr_Format calls.
........
r55833 | thomas.heller | 2007-06-08 12:08:31 -0700 (Fri, 08 Jun 2007) | 2 lines
Fix wrong documentation, and correct the punktuation.
Closes [1700455].
........
r55834 | thomas.heller | 2007-06-08 12:14:23 -0700 (Fri, 08 Jun 2007) | 1 line
Fix warnings by using proper function prototype.
........
r55839 | neal.norwitz | 2007-06-08 20:36:34 -0700 (Fri, 08 Jun 2007) | 7 lines
Prevent expandtabs() on string and unicode objects from causing a segfault when
a large width is passed on 32-bit platforms. Found by Google.
It would be good for people to review this especially carefully and verify
I don't have an off by one error and there is no other way to cause overflow.
........
r55841 | neal.norwitz | 2007-06-08 21:48:22 -0700 (Fri, 08 Jun 2007) | 1 line
Use macro version of GET_SIZE to avoid Coverity warning (#150) about a possible error.
........
r55842 | martin.v.loewis | 2007-06-09 00:42:52 -0700 (Sat, 09 Jun 2007) | 3 lines
Patch #1733960: Allow T_LONGLONG to accept ints.
Will backport to 2.5.
........
r55843 | martin.v.loewis | 2007-06-09 00:58:05 -0700 (Sat, 09 Jun 2007) | 2 lines
Fix Windows build.
........
r55845 | martin.v.loewis | 2007-06-09 03:10:26 -0700 (Sat, 09 Jun 2007) | 2 lines
Provide LLONG_MAX for S390.
........
r55854 | thomas.heller | 2007-06-10 08:59:17 -0700 (Sun, 10 Jun 2007) | 4 lines
First version of build scripts for Windows/AMD64 (no external
components are built yet, and 'kill_python' is disabled).
........
r55855 | thomas.heller | 2007-06-10 10:55:51 -0700 (Sun, 10 Jun 2007) | 3 lines
For now, disable the _bsddb, _sqlite3, _ssl, _testcapi, _tkinter
modules in the ReleaseAMD64 configuration because they do not compile.
........
r55856 | thomas.heller | 2007-06-10 11:27:54 -0700 (Sun, 10 Jun 2007) | 1 line
Need to set the environment variables, otherwise devenv.com is not found.
........
r55860 | thomas.heller | 2007-06-10 14:01:17 -0700 (Sun, 10 Jun 2007) | 1 line
Revert commit 55855.
........
................
r55880 | neal.norwitz | 2007-06-10 22:07:36 -0700 (Sun, 10 Jun 2007) | 5 lines
Fix the refleak counter on test_collections. The ABC metaclass creates
a registry which must be cleared on each run. Otherwise, there *seem*
to be refleaks when there really aren't any. (The class is held within
the registry even though it's no longer needed.)
................
r55884 | neal.norwitz | 2007-06-10 22:46:33 -0700 (Sun, 10 Jun 2007) | 1 line
These tests have been removed, so they are no longer needed here
................
r55886 | georg.brandl | 2007-06-11 00:26:37 -0700 (Mon, 11 Jun 2007) | 3 lines
Optimize access to True and False in the compiler (if True)
and the peepholer (LOAD_NAME True).
................
r55905 | georg.brandl | 2007-06-11 10:02:26 -0700 (Mon, 11 Jun 2007) | 5 lines
Remove __oct__ and __hex__ and use __index__ for converting
non-ints before formatting in a base.
Add a bin() builtin.
................
r55906 | georg.brandl | 2007-06-11 10:04:44 -0700 (Mon, 11 Jun 2007) | 2 lines
int(x, 0) does not "guess".
................
r55907 | georg.brandl | 2007-06-11 10:05:47 -0700 (Mon, 11 Jun 2007) | 2 lines
Add a comment to explain that nb_oct and nb_hex are nonfunctional.
................
r55908 | guido.van.rossum | 2007-06-11 10:49:18 -0700 (Mon, 11 Jun 2007) | 2 lines
Get rid of unused imports and comment.
................
r55910 | guido.van.rossum | 2007-06-11 13:05:17 -0700 (Mon, 11 Jun 2007) | 2 lines
_Abstract.__new__ now requires either no arguments or __init__ overridden.
................
r55911 | guido.van.rossum | 2007-06-11 13:07:49 -0700 (Mon, 11 Jun 2007) | 7 lines
Move the collections ABCs to a separate file, _abcoll.py, in order to avoid
needing to import _collections.so during the bootstrap (this will become
apparent in the next submit of os.py).
Add (plain and mutable) ABCs for Set, Mapping, Sequence.
................
r55912 | guido.van.rossum | 2007-06-11 13:09:31 -0700 (Mon, 11 Jun 2007) | 2 lines
Rewrite the _Environ class to use the new collections ABCs.
................
r55913 | guido.van.rossum | 2007-06-11 13:59:45 -0700 (Mon, 11 Jun 2007) | 72 lines
Merged revisions 55869-55912 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r55869 | neal.norwitz | 2007-06-10 17:42:11 -0700 (Sun, 10 Jun 2007) | 1 line
Add Atul Varma for patch # 1667860
........
r55870 | neal.norwitz | 2007-06-10 18:22:03 -0700 (Sun, 10 Jun 2007) | 1 line
Ignore valgrind problems on Ubuntu from ld
........
r55872 | neal.norwitz | 2007-06-10 18:48:46 -0700 (Sun, 10 Jun 2007) | 2 lines
Ignore config.status.lineno which seems new (new autoconf?)
........
r55873 | neal.norwitz | 2007-06-10 19:14:39 -0700 (Sun, 10 Jun 2007) | 1 line
Prevent these tests from running on Win64 since they don\'t apply there either
........
r55874 | neal.norwitz | 2007-06-10 19:16:10 -0700 (Sun, 10 Jun 2007) | 5 lines
Fix a bug when there was a newline in the string expandtabs was called on.
This also catches another condition that can overflow.
Will backport.
........
r55879 | neal.norwitz | 2007-06-10 21:52:37 -0700 (Sun, 10 Jun 2007) | 1 line
Prevent hang if the port cannot be opened.
........
r55881 | neal.norwitz | 2007-06-10 22:28:45 -0700 (Sun, 10 Jun 2007) | 4 lines
Add all of the distuils modules that don't seem to have explicit tests. :-(
Move an import in mworkscompiler so that this module can be imported on
any platform. Hopefully this works on all platforms.
........
r55882 | neal.norwitz | 2007-06-10 22:35:10 -0700 (Sun, 10 Jun 2007) | 4 lines
SF #1734732, lower case the module names per PEP 8.
Will backport.
........
r55885 | neal.norwitz | 2007-06-10 23:16:48 -0700 (Sun, 10 Jun 2007) | 4 lines
Not sure why this only fails sometimes on Unix machines. Better
to disable it and only import msvccompiler on Windows since that's
the only place it can work anyways.
........
r55887 | neal.norwitz | 2007-06-11 00:29:43 -0700 (Mon, 11 Jun 2007) | 4 lines
Bug #1734723: Fix repr.Repr() so it doesn't ignore the maxtuple attribute.
Will backport
........
r55889 | neal.norwitz | 2007-06-11 00:36:24 -0700 (Mon, 11 Jun 2007) | 1 line
Reflow long line
........
r55896 | thomas.heller | 2007-06-11 08:58:33 -0700 (Mon, 11 Jun 2007) | 3 lines
Use "O&" in calls to PyArg_Parse when we need a 'void*' instead of "k"
or "K" codes.
........
r55901 | facundo.batista | 2007-06-11 09:27:08 -0700 (Mon, 11 Jun 2007) | 5 lines
Added versionchanged flag to all the methods which received
a new optional timeout parameter, and a versionadded flag to
the socket.create_connection function.
........
................
r55914 | guido.van.rossum | 2007-06-11 14:19:50 -0700 (Mon, 11 Jun 2007) | 3 lines
New super() implementation, for PEP 3135 (though the PEP is not yet updated
to this design, and small tweaks may still be made later).
................
r55923 | guido.van.rossum | 2007-06-11 21:15:24 -0700 (Mon, 11 Jun 2007) | 4 lines
I'm guessing this module broke when Neal ripped out the types module --
it used 'list' both as a local variable and as the built-in list type.
Renamed the local variable since that was easier.
................
r55924 | guido.van.rossum | 2007-06-11 21:20:05 -0700 (Mon, 11 Jun 2007) | 5 lines
Change all occurrences of super(<thisclass>, <firstarg>) to super().
Seems to have worked, all the tests still pass.
Exception: test_descr and test_descrtut, which have tons of these
and are there to test the various usages.
................
r55939 | collin.winter | 2007-06-12 13:57:33 -0700 (Tue, 12 Jun 2007) | 1 line
Patch #1735485: remove StandardError from the exception hierarchy.
................
r55954 | neal.norwitz | 2007-06-12 21:56:32 -0700 (Tue, 12 Jun 2007) | 51 lines
Merged revisions 55913-55950 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r55926 | marc-andre.lemburg | 2007-06-12 02:09:58 -0700 (Tue, 12 Jun 2007) | 3 lines
Apply patch #1734945 to support TurboLinux as distribution.
........
r55927 | marc-andre.lemburg | 2007-06-12 02:26:49 -0700 (Tue, 12 Jun 2007) | 3 lines
Add patch #1726668: Windows Vista support.
........
r55929 | thomas.heller | 2007-06-12 08:36:22 -0700 (Tue, 12 Jun 2007) | 1 line
Checkout, but do not yet try to build, exernal sources.
........
r55930 | thomas.heller | 2007-06-12 09:08:27 -0700 (Tue, 12 Jun 2007) | 6 lines
Add bufferoverflowU.lib to the libraries needed by _ssl (is this the
right thing to do?).
Set the /XP64 /RETAIL build enviroment in the makefile when building
ReleaseAMD64.
........
r55931 | thomas.heller | 2007-06-12 09:23:19 -0700 (Tue, 12 Jun 2007) | 5 lines
Revert this change, since it breaks the win32 build:
Add bufferoverflowU.lib to the libraries needed by _ssl (is this the
right thing to do?).
........
r55934 | thomas.heller | 2007-06-12 10:28:31 -0700 (Tue, 12 Jun 2007) | 3 lines
Specify the bufferoverflowU.lib to the makefile on the command line
(for ReleaseAMD64 builds).
........
r55937 | thomas.heller | 2007-06-12 12:02:59 -0700 (Tue, 12 Jun 2007) | 3 lines
Add bufferoverflowU.lib to PCBuild\_bsddb.vcproj.
Build sqlite3.dll and bsddb.
........
r55938 | thomas.heller | 2007-06-12 12:56:12 -0700 (Tue, 12 Jun 2007) | 2 lines
Don't rebuild Berkeley DB if not needed (this was committed by accident).
........
r55948 | martin.v.loewis | 2007-06-12 20:42:19 -0700 (Tue, 12 Jun 2007) | 3 lines
Provide PY_LLONG_MAX on all systems having long long.
Will backport to 2.5.
........
................
r55959 | guido.van.rossum | 2007-06-13 09:22:41 -0700 (Wed, 13 Jun 2007) | 2 lines
Fix a compilation warning.
................
2007-06-14 02:07:49 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
|
1998-05-22 08:47:05 +08:00
|
|
|
/* Operations on sequences */
|
1995-07-18 22:12:02 +08:00
|
|
|
|
1998-05-22 08:47:05 +08:00
|
|
|
int
|
2000-07-09 12:06:11 +08:00
|
|
|
PySequence_Check(PyObject *s)
|
1995-07-18 22:12:02 +08:00
|
|
|
{
|
2010-05-09 23:52:27 +08:00
|
|
|
if (PyDict_Check(s))
|
|
|
|
return 0;
|
2020-02-07 08:53:23 +08:00
|
|
|
return Py_TYPE(s)->tp_as_sequence &&
|
|
|
|
Py_TYPE(s)->tp_as_sequence->sq_item != NULL;
|
1995-07-18 22:12:02 +08:00
|
|
|
}
|
|
|
|
|
2006-02-16 01:27:45 +08:00
|
|
|
Py_ssize_t
|
2000-07-12 20:56:19 +08:00
|
|
|
PySequence_Size(PyObject *s)
|
1995-07-18 22:12:02 +08:00
|
|
|
{
|
2010-05-09 23:52:27 +08:00
|
|
|
if (s == NULL) {
|
|
|
|
null_error();
|
|
|
|
return -1;
|
|
|
|
}
|
1995-07-18 22:12:02 +08:00
|
|
|
|
2021-01-29 23:53:03 +08:00
|
|
|
PySequenceMethods *m = Py_TYPE(s)->tp_as_sequence;
|
2017-04-16 14:21:44 +08:00
|
|
|
if (m && m->sq_length) {
|
|
|
|
Py_ssize_t len = m->sq_length(s);
|
2021-01-28 00:39:16 +08:00
|
|
|
assert(_Py_CheckSlotResult(s, "__len__", len >= 0));
|
2017-04-16 14:21:44 +08:00
|
|
|
return len;
|
|
|
|
}
|
1995-07-18 22:12:02 +08:00
|
|
|
|
2020-02-07 08:53:23 +08:00
|
|
|
if (Py_TYPE(s)->tp_as_mapping && Py_TYPE(s)->tp_as_mapping->mp_length) {
|
2018-07-24 04:43:42 +08:00
|
|
|
type_error("%.200s is not a sequence", s);
|
|
|
|
return -1;
|
|
|
|
}
|
2010-05-09 23:52:27 +08:00
|
|
|
type_error("object of type '%.200s' has no len()", s);
|
|
|
|
return -1;
|
1995-07-18 22:12:02 +08:00
|
|
|
}
|
|
|
|
|
2000-07-17 17:22:55 +08:00
|
|
|
#undef PySequence_Length
|
2006-02-16 01:27:45 +08:00
|
|
|
Py_ssize_t
|
2000-07-17 17:22:55 +08:00
|
|
|
PySequence_Length(PyObject *s)
|
|
|
|
{
|
2010-05-09 23:52:27 +08:00
|
|
|
return PySequence_Size(s);
|
2000-07-17 17:22:55 +08:00
|
|
|
}
|
|
|
|
#define PySequence_Length PySequence_Size
|
|
|
|
|
1995-07-18 22:12:02 +08:00
|
|
|
PyObject *
|
2000-07-09 12:06:11 +08:00
|
|
|
PySequence_Concat(PyObject *s, PyObject *o)
|
1995-07-18 22:12:02 +08:00
|
|
|
{
|
2016-08-19 22:59:55 +08:00
|
|
|
if (s == NULL || o == NULL) {
|
2010-05-09 23:52:27 +08:00
|
|
|
return null_error();
|
2016-08-19 22:59:55 +08:00
|
|
|
}
|
1995-07-18 22:12:02 +08:00
|
|
|
|
2021-01-29 23:53:03 +08:00
|
|
|
PySequenceMethods *m = Py_TYPE(s)->tp_as_sequence;
|
|
|
|
if (m && m->sq_concat) {
|
|
|
|
PyObject *res = m->sq_concat(s, o);
|
|
|
|
assert(_Py_CheckSlotResult(s, "+", res != NULL));
|
|
|
|
return res;
|
|
|
|
}
|
1995-07-18 22:12:02 +08:00
|
|
|
|
2010-05-09 23:52:27 +08:00
|
|
|
/* 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)) {
|
2021-01-29 23:53:03 +08:00
|
|
|
PyObject *result = BINARY_OP1(s, o, NB_SLOT(nb_add), "+");
|
2010-05-09 23:52:27 +08:00
|
|
|
if (result != Py_NotImplemented)
|
|
|
|
return result;
|
|
|
|
Py_DECREF(result);
|
|
|
|
}
|
|
|
|
return type_error("'%.200s' object can't be concatenated", s);
|
1995-07-18 22:12:02 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
PyObject *
|
2006-02-16 01:27:45 +08:00
|
|
|
PySequence_Repeat(PyObject *o, Py_ssize_t count)
|
1995-07-18 22:12:02 +08:00
|
|
|
{
|
2016-08-19 22:59:55 +08:00
|
|
|
if (o == NULL) {
|
2010-05-09 23:52:27 +08:00
|
|
|
return null_error();
|
2016-08-19 22:59:55 +08:00
|
|
|
}
|
2010-05-09 23:52:27 +08:00
|
|
|
|
2021-01-29 23:53:03 +08:00
|
|
|
PySequenceMethods *m = Py_TYPE(o)->tp_as_sequence;
|
|
|
|
if (m && m->sq_repeat) {
|
|
|
|
PyObject *res = m->sq_repeat(o, count);
|
|
|
|
assert(_Py_CheckSlotResult(o, "*", res != NULL));
|
|
|
|
return res;
|
|
|
|
}
|
2010-05-09 23:52:27 +08:00
|
|
|
|
|
|
|
/* 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 = PyLong_FromSsize_t(count);
|
|
|
|
if (n == NULL)
|
|
|
|
return NULL;
|
2021-01-29 23:53:03 +08:00
|
|
|
result = BINARY_OP1(o, n, NB_SLOT(nb_multiply), "*");
|
2010-05-09 23:52:27 +08:00
|
|
|
Py_DECREF(n);
|
|
|
|
if (result != Py_NotImplemented)
|
|
|
|
return result;
|
|
|
|
Py_DECREF(result);
|
|
|
|
}
|
|
|
|
return type_error("'%.200s' object can't be repeated", o);
|
1995-07-18 22:12:02 +08:00
|
|
|
}
|
|
|
|
|
2000-08-25 04:08:19 +08:00
|
|
|
PyObject *
|
|
|
|
PySequence_InPlaceConcat(PyObject *s, PyObject *o)
|
|
|
|
{
|
2016-08-19 22:59:55 +08:00
|
|
|
if (s == NULL || o == NULL) {
|
2010-05-09 23:52:27 +08:00
|
|
|
return null_error();
|
2016-08-19 22:59:55 +08:00
|
|
|
}
|
2000-08-25 04:08:19 +08:00
|
|
|
|
2021-01-29 23:53:03 +08:00
|
|
|
PySequenceMethods *m = Py_TYPE(s)->tp_as_sequence;
|
|
|
|
if (m && m->sq_inplace_concat) {
|
|
|
|
PyObject *res = m->sq_inplace_concat(s, o);
|
|
|
|
assert(_Py_CheckSlotResult(s, "+=", res != NULL));
|
|
|
|
return res;
|
|
|
|
}
|
|
|
|
if (m && m->sq_concat) {
|
|
|
|
PyObject *res = m->sq_concat(s, o);
|
|
|
|
assert(_Py_CheckSlotResult(s, "+", res != NULL));
|
|
|
|
return res;
|
|
|
|
}
|
2000-08-25 04:08:19 +08:00
|
|
|
|
2010-05-09 23:52:27 +08:00
|
|
|
if (PySequence_Check(s) && PySequence_Check(o)) {
|
2021-01-29 23:53:03 +08:00
|
|
|
PyObject *result = BINARY_IOP1(s, o, NB_SLOT(nb_inplace_add),
|
|
|
|
NB_SLOT(nb_add), "+=");
|
2010-05-09 23:52:27 +08:00
|
|
|
if (result != Py_NotImplemented)
|
|
|
|
return result;
|
|
|
|
Py_DECREF(result);
|
|
|
|
}
|
|
|
|
return type_error("'%.200s' object can't be concatenated", s);
|
2000-08-25 04:08:19 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
PyObject *
|
2006-02-16 01:27:45 +08:00
|
|
|
PySequence_InPlaceRepeat(PyObject *o, Py_ssize_t count)
|
2000-08-25 04:08:19 +08:00
|
|
|
{
|
2016-08-19 22:59:55 +08:00
|
|
|
if (o == NULL) {
|
2010-05-09 23:52:27 +08:00
|
|
|
return null_error();
|
2016-08-19 22:59:55 +08:00
|
|
|
}
|
2010-05-09 23:52:27 +08:00
|
|
|
|
2021-01-29 23:53:03 +08:00
|
|
|
PySequenceMethods *m = Py_TYPE(o)->tp_as_sequence;
|
|
|
|
if (m && m->sq_inplace_repeat) {
|
|
|
|
PyObject *res = m->sq_inplace_repeat(o, count);
|
|
|
|
assert(_Py_CheckSlotResult(o, "*=", res != NULL));
|
|
|
|
return res;
|
|
|
|
}
|
|
|
|
if (m && m->sq_repeat) {
|
|
|
|
PyObject *res = m->sq_repeat(o, count);
|
|
|
|
assert(_Py_CheckSlotResult(o, "*", res != NULL));
|
|
|
|
return res;
|
|
|
|
}
|
2010-05-09 23:52:27 +08:00
|
|
|
|
|
|
|
if (PySequence_Check(o)) {
|
|
|
|
PyObject *n, *result;
|
|
|
|
n = PyLong_FromSsize_t(count);
|
|
|
|
if (n == NULL)
|
|
|
|
return NULL;
|
2021-01-29 23:53:03 +08:00
|
|
|
result = BINARY_IOP1(o, n, NB_SLOT(nb_inplace_multiply),
|
|
|
|
NB_SLOT(nb_multiply), "*=");
|
2010-05-09 23:52:27 +08:00
|
|
|
Py_DECREF(n);
|
|
|
|
if (result != Py_NotImplemented)
|
|
|
|
return result;
|
|
|
|
Py_DECREF(result);
|
|
|
|
}
|
|
|
|
return type_error("'%.200s' object can't be repeated", o);
|
2000-08-25 04:08:19 +08:00
|
|
|
}
|
|
|
|
|
1995-07-18 22:12:02 +08:00
|
|
|
PyObject *
|
2006-02-16 01:27:45 +08:00
|
|
|
PySequence_GetItem(PyObject *s, Py_ssize_t i)
|
1995-07-18 22:12:02 +08:00
|
|
|
{
|
2016-08-19 22:59:55 +08:00
|
|
|
if (s == NULL) {
|
2010-05-09 23:52:27 +08:00
|
|
|
return null_error();
|
2016-08-19 22:59:55 +08:00
|
|
|
}
|
2010-05-09 23:52:27 +08:00
|
|
|
|
2021-01-29 23:53:03 +08:00
|
|
|
PySequenceMethods *m = Py_TYPE(s)->tp_as_sequence;
|
2010-05-09 23:52:27 +08:00
|
|
|
if (m && m->sq_item) {
|
|
|
|
if (i < 0) {
|
|
|
|
if (m->sq_length) {
|
|
|
|
Py_ssize_t l = (*m->sq_length)(s);
|
2021-01-28 00:39:16 +08:00
|
|
|
assert(_Py_CheckSlotResult(s, "__len__", l >= 0));
|
2015-11-05 20:56:58 +08:00
|
|
|
if (l < 0) {
|
2010-05-09 23:52:27 +08:00
|
|
|
return NULL;
|
2015-11-05 20:56:58 +08:00
|
|
|
}
|
2010-05-09 23:52:27 +08:00
|
|
|
i += l;
|
|
|
|
}
|
|
|
|
}
|
2021-01-29 23:53:03 +08:00
|
|
|
PyObject *res = m->sq_item(s, i);
|
|
|
|
assert(_Py_CheckSlotResult(s, "__getitem__", res != NULL));
|
|
|
|
return res;
|
2010-05-09 23:52:27 +08:00
|
|
|
}
|
1995-07-18 22:12:02 +08:00
|
|
|
|
2020-02-07 08:53:23 +08:00
|
|
|
if (Py_TYPE(s)->tp_as_mapping && Py_TYPE(s)->tp_as_mapping->mp_subscript) {
|
2018-07-24 04:43:42 +08:00
|
|
|
return type_error("%.200s is not a sequence", s);
|
|
|
|
}
|
2010-05-09 23:52:27 +08:00
|
|
|
return type_error("'%.200s' object does not support indexing", s);
|
1995-07-18 22:12:02 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
PyObject *
|
2006-02-16 01:27:45 +08:00
|
|
|
PySequence_GetSlice(PyObject *s, Py_ssize_t i1, Py_ssize_t i2)
|
1995-07-18 22:12:02 +08:00
|
|
|
{
|
2016-08-19 22:59:55 +08:00
|
|
|
if (!s) {
|
|
|
|
return null_error();
|
|
|
|
}
|
1998-05-22 08:47:05 +08:00
|
|
|
|
2021-01-29 23:53:03 +08:00
|
|
|
PyMappingMethods *mp = Py_TYPE(s)->tp_as_mapping;
|
2010-09-12 00:02:03 +08:00
|
|
|
if (mp && mp->mp_subscript) {
|
2010-05-09 23:52:27 +08:00
|
|
|
PyObject *slice = _PySlice_FromIndices(i1, i2);
|
2021-01-29 23:53:03 +08:00
|
|
|
if (!slice) {
|
2010-05-09 23:52:27 +08:00
|
|
|
return NULL;
|
2021-01-29 23:53:03 +08:00
|
|
|
}
|
|
|
|
PyObject *res = mp->mp_subscript(s, slice);
|
|
|
|
assert(_Py_CheckSlotResult(s, "__getitem__", res != NULL));
|
2010-05-09 23:52:27 +08:00
|
|
|
Py_DECREF(slice);
|
|
|
|
return res;
|
|
|
|
}
|
1997-04-02 13:31:09 +08:00
|
|
|
|
2010-05-09 23:52:27 +08:00
|
|
|
return type_error("'%.200s' object is unsliceable", s);
|
1995-07-18 22:12:02 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
int
|
2006-02-16 01:27:45 +08:00
|
|
|
PySequence_SetItem(PyObject *s, Py_ssize_t i, PyObject *o)
|
1995-07-18 22:12:02 +08:00
|
|
|
{
|
2010-05-09 23:52:27 +08:00
|
|
|
if (s == NULL) {
|
|
|
|
null_error();
|
|
|
|
return -1;
|
|
|
|
}
|
1998-05-22 08:47:05 +08:00
|
|
|
|
2021-01-29 23:53:03 +08:00
|
|
|
PySequenceMethods *m = Py_TYPE(s)->tp_as_sequence;
|
2010-05-09 23:52:27 +08:00
|
|
|
if (m && m->sq_ass_item) {
|
|
|
|
if (i < 0) {
|
|
|
|
if (m->sq_length) {
|
|
|
|
Py_ssize_t l = (*m->sq_length)(s);
|
2021-01-28 00:39:16 +08:00
|
|
|
assert(_Py_CheckSlotResult(s, "__len__", l >= 0));
|
2017-04-16 14:21:44 +08:00
|
|
|
if (l < 0) {
|
2010-05-09 23:52:27 +08:00
|
|
|
return -1;
|
2017-04-16 14:21:44 +08:00
|
|
|
}
|
2010-05-09 23:52:27 +08:00
|
|
|
i += l;
|
|
|
|
}
|
|
|
|
}
|
2021-01-29 23:53:03 +08:00
|
|
|
int res = m->sq_ass_item(s, i, o);
|
|
|
|
assert(_Py_CheckSlotResult(s, "__setitem__", res >= 0));
|
|
|
|
return res;
|
2010-05-09 23:52:27 +08:00
|
|
|
}
|
1998-05-22 08:47:05 +08:00
|
|
|
|
2020-02-07 08:53:23 +08:00
|
|
|
if (Py_TYPE(s)->tp_as_mapping && Py_TYPE(s)->tp_as_mapping->mp_ass_subscript) {
|
2018-07-24 04:43:42 +08:00
|
|
|
type_error("%.200s is not a sequence", s);
|
|
|
|
return -1;
|
|
|
|
}
|
2010-05-09 23:52:27 +08:00
|
|
|
type_error("'%.200s' object does not support item assignment", s);
|
|
|
|
return -1;
|
1995-07-18 22:12:02 +08:00
|
|
|
}
|
|
|
|
|
1996-08-22 01:41:54 +08:00
|
|
|
int
|
2006-02-16 01:27:45 +08:00
|
|
|
PySequence_DelItem(PyObject *s, Py_ssize_t i)
|
1996-08-22 01:41:54 +08:00
|
|
|
{
|
2010-05-09 23:52:27 +08:00
|
|
|
if (s == NULL) {
|
|
|
|
null_error();
|
|
|
|
return -1;
|
|
|
|
}
|
1998-05-22 08:47:05 +08:00
|
|
|
|
2021-01-29 23:53:03 +08:00
|
|
|
PySequenceMethods *m = Py_TYPE(s)->tp_as_sequence;
|
2010-05-09 23:52:27 +08:00
|
|
|
if (m && m->sq_ass_item) {
|
|
|
|
if (i < 0) {
|
|
|
|
if (m->sq_length) {
|
|
|
|
Py_ssize_t l = (*m->sq_length)(s);
|
2021-01-28 00:39:16 +08:00
|
|
|
assert(_Py_CheckSlotResult(s, "__len__", l >= 0));
|
2017-04-16 14:21:44 +08:00
|
|
|
if (l < 0) {
|
2010-05-09 23:52:27 +08:00
|
|
|
return -1;
|
2017-04-16 14:21:44 +08:00
|
|
|
}
|
2010-05-09 23:52:27 +08:00
|
|
|
i += l;
|
|
|
|
}
|
|
|
|
}
|
2021-01-29 23:53:03 +08:00
|
|
|
int res = m->sq_ass_item(s, i, (PyObject *)NULL);
|
|
|
|
assert(_Py_CheckSlotResult(s, "__delitem__", res >= 0));
|
|
|
|
return res;
|
2010-05-09 23:52:27 +08:00
|
|
|
}
|
1998-05-22 08:47:05 +08:00
|
|
|
|
2020-02-07 08:53:23 +08:00
|
|
|
if (Py_TYPE(s)->tp_as_mapping && Py_TYPE(s)->tp_as_mapping->mp_ass_subscript) {
|
2018-07-24 04:43:42 +08:00
|
|
|
type_error("%.200s is not a sequence", s);
|
|
|
|
return -1;
|
|
|
|
}
|
2010-05-09 23:52:27 +08:00
|
|
|
type_error("'%.200s' object doesn't support item deletion", s);
|
|
|
|
return -1;
|
1996-08-22 01:41:54 +08:00
|
|
|
}
|
|
|
|
|
1998-05-22 08:47:05 +08:00
|
|
|
int
|
2006-02-16 01:27:45 +08:00
|
|
|
PySequence_SetSlice(PyObject *s, Py_ssize_t i1, Py_ssize_t i2, PyObject *o)
|
1995-07-18 22:12:02 +08:00
|
|
|
{
|
2010-05-09 23:52:27 +08:00
|
|
|
if (s == NULL) {
|
|
|
|
null_error();
|
|
|
|
return -1;
|
|
|
|
}
|
1995-07-18 22:12:02 +08:00
|
|
|
|
2021-01-29 23:53:03 +08:00
|
|
|
PyMappingMethods *mp = Py_TYPE(s)->tp_as_mapping;
|
2010-09-12 00:02:03 +08:00
|
|
|
if (mp && mp->mp_ass_subscript) {
|
2010-05-09 23:52:27 +08:00
|
|
|
PyObject *slice = _PySlice_FromIndices(i1, i2);
|
|
|
|
if (!slice)
|
|
|
|
return -1;
|
2021-01-29 23:53:03 +08:00
|
|
|
int res = mp->mp_ass_subscript(s, slice, o);
|
|
|
|
assert(_Py_CheckSlotResult(s, "__setitem__", res >= 0));
|
2010-05-09 23:52:27 +08:00
|
|
|
Py_DECREF(slice);
|
|
|
|
return res;
|
|
|
|
}
|
2000-08-18 06:37:32 +08:00
|
|
|
|
2010-05-09 23:52:27 +08:00
|
|
|
type_error("'%.200s' object doesn't support slice assignment", s);
|
|
|
|
return -1;
|
1995-07-18 22:12:02 +08:00
|
|
|
}
|
|
|
|
|
1998-05-22 08:47:05 +08:00
|
|
|
int
|
2006-02-16 01:27:45 +08:00
|
|
|
PySequence_DelSlice(PyObject *s, Py_ssize_t i1, Py_ssize_t i2)
|
1996-08-22 01:41:54 +08:00
|
|
|
{
|
2010-05-09 23:52:27 +08:00
|
|
|
if (s == NULL) {
|
|
|
|
null_error();
|
|
|
|
return -1;
|
|
|
|
}
|
1996-08-22 01:41:54 +08:00
|
|
|
|
2021-01-29 23:53:03 +08:00
|
|
|
PyMappingMethods *mp = Py_TYPE(s)->tp_as_mapping;
|
2010-09-12 00:02:03 +08:00
|
|
|
if (mp && mp->mp_ass_subscript) {
|
2010-05-09 23:52:27 +08:00
|
|
|
PyObject *slice = _PySlice_FromIndices(i1, i2);
|
2021-01-29 23:53:03 +08:00
|
|
|
if (!slice) {
|
2010-05-09 23:52:27 +08:00
|
|
|
return -1;
|
2021-01-29 23:53:03 +08:00
|
|
|
}
|
|
|
|
int res = mp->mp_ass_subscript(s, slice, NULL);
|
|
|
|
assert(_Py_CheckSlotResult(s, "__delitem__", res >= 0));
|
2010-05-09 23:52:27 +08:00
|
|
|
Py_DECREF(slice);
|
|
|
|
return res;
|
|
|
|
}
|
|
|
|
type_error("'%.200s' object doesn't support slice deletion", s);
|
|
|
|
return -1;
|
1996-08-22 01:41:54 +08:00
|
|
|
}
|
|
|
|
|
1995-07-18 22:12:02 +08:00
|
|
|
PyObject *
|
2000-07-09 12:06:11 +08:00
|
|
|
PySequence_Tuple(PyObject *v)
|
1995-07-18 22:12:02 +08:00
|
|
|
{
|
2010-05-09 23:52:27 +08:00
|
|
|
PyObject *it; /* iter(v) */
|
|
|
|
Py_ssize_t n; /* guess for result tuple size */
|
|
|
|
PyObject *result = NULL;
|
|
|
|
Py_ssize_t j;
|
|
|
|
|
2016-08-19 22:59:55 +08:00
|
|
|
if (v == NULL) {
|
2010-05-09 23:52:27 +08:00
|
|
|
return null_error();
|
2016-08-19 22:59:55 +08:00
|
|
|
}
|
2010-05-09 23:52:27 +08:00
|
|
|
|
|
|
|
/* 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;
|
|
|
|
}
|
2015-05-18 05:45:58 +08:00
|
|
|
if (PyList_CheckExact(v))
|
2010-05-09 23:52:27 +08:00
|
|
|
return PyList_AsTuple(v);
|
|
|
|
|
|
|
|
/* Get iterator. */
|
|
|
|
it = PyObject_GetIter(v);
|
|
|
|
if (it == NULL)
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
/* Guess result size and allocate space. */
|
2012-10-06 20:03:24 +08:00
|
|
|
n = PyObject_LengthHint(v, 10);
|
2010-05-09 23:52:27 +08:00
|
|
|
if (n == -1)
|
|
|
|
goto Fail;
|
|
|
|
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) {
|
2016-07-25 10:30:05 +08:00
|
|
|
size_t newn = (size_t)n;
|
2010-05-09 23:52:27 +08:00
|
|
|
/* 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%.
|
|
|
|
*/
|
2016-07-25 10:30:05 +08:00
|
|
|
newn += 10u;
|
|
|
|
newn += newn >> 2;
|
|
|
|
if (newn > PY_SSIZE_T_MAX) {
|
2010-05-09 23:52:27 +08:00
|
|
|
/* Check for overflow */
|
|
|
|
PyErr_NoMemory();
|
|
|
|
Py_DECREF(item);
|
|
|
|
goto Fail;
|
|
|
|
}
|
2016-07-25 10:30:05 +08:00
|
|
|
n = (Py_ssize_t)newn;
|
2010-05-09 23:52:27 +08:00
|
|
|
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;
|
2001-05-05 11:56:37 +08:00
|
|
|
|
|
|
|
Fail:
|
2010-05-09 23:52:27 +08:00
|
|
|
Py_XDECREF(result);
|
|
|
|
Py_DECREF(it);
|
|
|
|
return NULL;
|
1995-07-18 22:12:02 +08:00
|
|
|
}
|
|
|
|
|
1996-12-06 05:51:24 +08:00
|
|
|
PyObject *
|
2000-07-09 12:06:11 +08:00
|
|
|
PySequence_List(PyObject *v)
|
1996-12-06 05:51:24 +08:00
|
|
|
{
|
2010-05-09 23:52:27 +08:00
|
|
|
PyObject *result; /* result list */
|
|
|
|
PyObject *rv; /* return value from PyList_Extend */
|
1998-05-22 08:47:05 +08:00
|
|
|
|
2016-08-19 22:59:55 +08:00
|
|
|
if (v == NULL) {
|
2010-05-09 23:52:27 +08:00
|
|
|
return null_error();
|
2016-08-19 22:59:55 +08:00
|
|
|
}
|
1998-07-11 02:03:50 +08:00
|
|
|
|
2010-05-09 23:52:27 +08:00
|
|
|
result = PyList_New(0);
|
|
|
|
if (result == NULL)
|
|
|
|
return NULL;
|
2001-05-02 04:45:31 +08:00
|
|
|
|
2010-05-09 23:52:27 +08:00
|
|
|
rv = _PyList_Extend((PyListObject *)result, v);
|
|
|
|
if (rv == NULL) {
|
|
|
|
Py_DECREF(result);
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
Py_DECREF(rv);
|
|
|
|
return result;
|
1998-05-22 08:47:05 +08:00
|
|
|
}
|
1997-04-02 13:31:09 +08:00
|
|
|
|
2000-06-19 02:43:14 +08:00
|
|
|
PyObject *
|
2000-07-09 12:06:11 +08:00
|
|
|
PySequence_Fast(PyObject *v, const char *m)
|
2000-06-19 02:43:14 +08:00
|
|
|
{
|
2010-05-09 23:52:27 +08:00
|
|
|
PyObject *it;
|
2004-01-12 07:26:51 +08:00
|
|
|
|
2016-08-19 22:59:55 +08:00
|
|
|
if (v == NULL) {
|
2010-05-09 23:52:27 +08:00
|
|
|
return null_error();
|
2016-08-19 22:59:55 +08:00
|
|
|
}
|
2000-06-19 02:43:14 +08:00
|
|
|
|
2010-05-09 23:52:27 +08:00
|
|
|
if (PyList_CheckExact(v) || PyTuple_CheckExact(v)) {
|
|
|
|
Py_INCREF(v);
|
|
|
|
return v;
|
|
|
|
}
|
2000-06-19 02:43:14 +08:00
|
|
|
|
2010-05-09 23:52:27 +08:00
|
|
|
it = PyObject_GetIter(v);
|
|
|
|
if (it == NULL) {
|
2020-06-23 21:55:06 +08:00
|
|
|
PyThreadState *tstate = _PyThreadState_GET();
|
|
|
|
if (_PyErr_ExceptionMatches(tstate, PyExc_TypeError)) {
|
|
|
|
_PyErr_SetString(tstate, PyExc_TypeError, m);
|
|
|
|
}
|
2010-05-09 23:52:27 +08:00
|
|
|
return NULL;
|
|
|
|
}
|
2004-01-12 07:26:51 +08:00
|
|
|
|
2010-05-09 23:52:27 +08:00
|
|
|
v = PySequence_List(it);
|
|
|
|
Py_DECREF(it);
|
2000-06-19 02:43:14 +08:00
|
|
|
|
2010-05-09 23:52:27 +08:00
|
|
|
return v;
|
2000-06-19 02:43:14 +08:00
|
|
|
}
|
|
|
|
|
2001-09-08 12:00:12 +08:00
|
|
|
/* Iterate over seq. Result depends on the operation:
|
2010-05-09 23:52:27 +08:00
|
|
|
PY_ITERSEARCH_COUNT: -1 if error, else # of times obj appears in seq.
|
|
|
|
PY_ITERSEARCH_INDEX: 0-based index of first occurrence of obj in seq;
|
|
|
|
set ValueError and return -1 if none found; also return -1 on error.
|
2001-09-08 12:00:12 +08:00
|
|
|
Py_ITERSEARCH_CONTAINS: return 1 if obj in seq, else 0; -1 on error.
|
|
|
|
*/
|
2006-03-05 02:49:58 +08:00
|
|
|
Py_ssize_t
|
2001-09-08 12:00:12 +08:00
|
|
|
_PySequence_IterSearch(PyObject *seq, PyObject *obj, int operation)
|
1998-05-22 08:47:05 +08:00
|
|
|
{
|
2010-05-09 23:52:27 +08:00
|
|
|
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) {
|
2020-06-22 15:43:35 +08:00
|
|
|
if (PyErr_ExceptionMatches(PyExc_TypeError)) {
|
|
|
|
type_error("argument of type '%.200s' is not iterable", seq);
|
|
|
|
}
|
2010-05-09 23:52:27 +08:00
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
n = wrapped = 0;
|
|
|
|
for (;;) {
|
|
|
|
int cmp;
|
|
|
|
PyObject *item = PyIter_Next(it);
|
|
|
|
if (item == NULL) {
|
|
|
|
if (PyErr_Occurred())
|
|
|
|
goto Fail;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
2019-08-04 19:12:48 +08:00
|
|
|
cmp = PyObject_RichCompareBool(item, obj, Py_EQ);
|
2010-05-09 23:52:27 +08:00
|
|
|
Py_DECREF(item);
|
|
|
|
if (cmp < 0)
|
|
|
|
goto Fail;
|
|
|
|
if (cmp > 0) {
|
|
|
|
switch (operation) {
|
|
|
|
case PY_ITERSEARCH_COUNT:
|
|
|
|
if (n == PY_SSIZE_T_MAX) {
|
|
|
|
PyErr_SetString(PyExc_OverflowError,
|
|
|
|
"count exceeds C integer size");
|
|
|
|
goto Fail;
|
|
|
|
}
|
|
|
|
++n;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case PY_ITERSEARCH_INDEX:
|
|
|
|
if (wrapped) {
|
|
|
|
PyErr_SetString(PyExc_OverflowError,
|
|
|
|
"index exceeds C integer size");
|
|
|
|
goto Fail;
|
|
|
|
}
|
|
|
|
goto Done;
|
|
|
|
|
|
|
|
case PY_ITERSEARCH_CONTAINS:
|
|
|
|
n = 1;
|
|
|
|
goto Done;
|
|
|
|
|
|
|
|
default:
|
2017-09-15 09:13:16 +08:00
|
|
|
Py_UNREACHABLE();
|
2010-05-09 23:52:27 +08:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if (operation == PY_ITERSEARCH_INDEX) {
|
|
|
|
if (n == PY_SSIZE_T_MAX)
|
|
|
|
wrapped = 1;
|
|
|
|
++n;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if (operation != PY_ITERSEARCH_INDEX)
|
|
|
|
goto Done;
|
|
|
|
|
|
|
|
PyErr_SetString(PyExc_ValueError,
|
|
|
|
"sequence.index(x): x not in sequence");
|
|
|
|
/* fall into failure code */
|
2001-05-05 19:33:43 +08:00
|
|
|
Fail:
|
2010-05-09 23:52:27 +08:00
|
|
|
n = -1;
|
|
|
|
/* fall through */
|
2001-09-08 12:00:12 +08:00
|
|
|
Done:
|
2010-05-09 23:52:27 +08:00
|
|
|
Py_DECREF(it);
|
|
|
|
return n;
|
2001-09-08 12:00:12 +08:00
|
|
|
|
1996-12-06 05:51:24 +08:00
|
|
|
}
|
|
|
|
|
2001-09-08 12:00:12 +08:00
|
|
|
/* Return # of times o appears in s. */
|
2006-03-05 02:49:58 +08:00
|
|
|
Py_ssize_t
|
2001-09-08 12:00:12 +08:00
|
|
|
PySequence_Count(PyObject *s, PyObject *o)
|
1995-07-18 22:12:02 +08:00
|
|
|
{
|
2010-05-09 23:52:27 +08:00
|
|
|
return _PySequence_IterSearch(s, o, PY_ITERSEARCH_COUNT);
|
1995-07-18 22:12:02 +08:00
|
|
|
}
|
|
|
|
|
2001-05-06 05:05:01 +08:00
|
|
|
/* Return -1 if error; 1 if ob in seq; 0 if ob not in seq.
|
2001-09-08 12:00:12 +08:00
|
|
|
* Use sq_contains if possible, else defer to _PySequence_IterSearch().
|
2001-05-06 05:05:01 +08:00
|
|
|
*/
|
|
|
|
int
|
|
|
|
PySequence_Contains(PyObject *seq, PyObject *ob)
|
|
|
|
{
|
2020-02-07 08:53:23 +08:00
|
|
|
PySequenceMethods *sqm = Py_TYPE(seq)->tp_as_sequence;
|
2021-01-29 23:53:03 +08:00
|
|
|
if (sqm != NULL && sqm->sq_contains != NULL) {
|
|
|
|
int res = (*sqm->sq_contains)(seq, ob);
|
|
|
|
assert(_Py_CheckSlotResult(seq, "__contains__", res >= 0));
|
|
|
|
return res;
|
|
|
|
}
|
|
|
|
Py_ssize_t result = _PySequence_IterSearch(seq, ob, PY_ITERSEARCH_CONTAINS);
|
2010-05-09 23:52:27 +08:00
|
|
|
return Py_SAFE_DOWNCAST(result, Py_ssize_t, int);
|
2001-05-06 05:05:01 +08:00
|
|
|
}
|
|
|
|
|
1998-05-22 08:47:05 +08:00
|
|
|
/* Backwards compatibility */
|
|
|
|
#undef PySequence_In
|
|
|
|
int
|
2000-07-09 12:06:11 +08:00
|
|
|
PySequence_In(PyObject *w, PyObject *v)
|
1995-07-18 22:12:02 +08:00
|
|
|
{
|
2010-05-09 23:52:27 +08:00
|
|
|
return PySequence_Contains(w, v);
|
1995-07-18 22:12:02 +08:00
|
|
|
}
|
|
|
|
|
2006-03-05 02:49:58 +08:00
|
|
|
Py_ssize_t
|
2000-07-09 12:06:11 +08:00
|
|
|
PySequence_Index(PyObject *s, PyObject *o)
|
1995-07-18 22:12:02 +08:00
|
|
|
{
|
2010-05-09 23:52:27 +08:00
|
|
|
return _PySequence_IterSearch(s, o, PY_ITERSEARCH_INDEX);
|
1995-07-18 22:12:02 +08:00
|
|
|
}
|
|
|
|
|
1998-05-22 08:47:05 +08:00
|
|
|
/* Operations on mappings */
|
|
|
|
|
|
|
|
int
|
2000-07-09 12:06:11 +08:00
|
|
|
PyMapping_Check(PyObject *o)
|
1995-07-18 22:12:02 +08:00
|
|
|
{
|
2020-02-07 08:53:23 +08:00
|
|
|
return o && Py_TYPE(o)->tp_as_mapping &&
|
|
|
|
Py_TYPE(o)->tp_as_mapping->mp_subscript;
|
1995-07-18 22:12:02 +08:00
|
|
|
}
|
|
|
|
|
2006-02-16 01:27:45 +08:00
|
|
|
Py_ssize_t
|
2000-07-12 20:56:19 +08:00
|
|
|
PyMapping_Size(PyObject *o)
|
1995-07-18 22:12:02 +08:00
|
|
|
{
|
2010-05-09 23:52:27 +08:00
|
|
|
if (o == NULL) {
|
|
|
|
null_error();
|
|
|
|
return -1;
|
|
|
|
}
|
1995-07-18 22:12:02 +08:00
|
|
|
|
2021-01-29 23:53:03 +08:00
|
|
|
PyMappingMethods *m = Py_TYPE(o)->tp_as_mapping;
|
2017-04-16 14:21:44 +08:00
|
|
|
if (m && m->mp_length) {
|
|
|
|
Py_ssize_t len = m->mp_length(o);
|
2021-01-28 00:39:16 +08:00
|
|
|
assert(_Py_CheckSlotResult(o, "__len__", len >= 0));
|
2017-04-16 14:21:44 +08:00
|
|
|
return len;
|
|
|
|
}
|
1995-07-18 22:12:02 +08:00
|
|
|
|
2020-02-07 08:53:23 +08:00
|
|
|
if (Py_TYPE(o)->tp_as_sequence && Py_TYPE(o)->tp_as_sequence->sq_length) {
|
2018-07-24 04:43:42 +08:00
|
|
|
type_error("%.200s is not a mapping", o);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
/* PyMapping_Size() can be called from PyObject_Size(). */
|
2010-05-09 23:52:27 +08:00
|
|
|
type_error("object of type '%.200s' has no len()", o);
|
|
|
|
return -1;
|
1995-07-18 22:12:02 +08:00
|
|
|
}
|
|
|
|
|
2000-07-17 17:22:55 +08:00
|
|
|
#undef PyMapping_Length
|
2006-02-16 01:27:45 +08:00
|
|
|
Py_ssize_t
|
2000-07-17 17:22:55 +08:00
|
|
|
PyMapping_Length(PyObject *o)
|
|
|
|
{
|
2010-05-09 23:52:27 +08:00
|
|
|
return PyMapping_Size(o);
|
2000-07-17 17:22:55 +08:00
|
|
|
}
|
|
|
|
#define PyMapping_Length PyMapping_Size
|
|
|
|
|
1998-05-22 08:47:05 +08:00
|
|
|
PyObject *
|
2013-10-20 02:03:34 +08:00
|
|
|
PyMapping_GetItemString(PyObject *o, const char *key)
|
1998-05-22 08:47:05 +08:00
|
|
|
{
|
2010-05-09 23:52:27 +08:00
|
|
|
PyObject *okey, *r;
|
1998-05-22 08:47:05 +08:00
|
|
|
|
2016-08-19 22:59:55 +08:00
|
|
|
if (key == NULL) {
|
2010-05-09 23:52:27 +08:00
|
|
|
return null_error();
|
2016-08-19 22:59:55 +08:00
|
|
|
}
|
1998-05-22 08:47:05 +08:00
|
|
|
|
2010-05-09 23:52:27 +08:00
|
|
|
okey = PyUnicode_FromString(key);
|
|
|
|
if (okey == NULL)
|
|
|
|
return NULL;
|
|
|
|
r = PyObject_GetItem(o, okey);
|
|
|
|
Py_DECREF(okey);
|
|
|
|
return r;
|
1998-05-22 08:47:05 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
int
|
2013-10-20 02:03:34 +08:00
|
|
|
PyMapping_SetItemString(PyObject *o, const char *key, PyObject *value)
|
1998-05-22 08:47:05 +08:00
|
|
|
{
|
2010-05-09 23:52:27 +08:00
|
|
|
PyObject *okey;
|
|
|
|
int r;
|
1998-05-22 08:47:05 +08:00
|
|
|
|
2010-05-09 23:52:27 +08:00
|
|
|
if (key == NULL) {
|
|
|
|
null_error();
|
|
|
|
return -1;
|
|
|
|
}
|
1998-05-22 08:47:05 +08:00
|
|
|
|
2010-05-09 23:52:27 +08:00
|
|
|
okey = PyUnicode_FromString(key);
|
|
|
|
if (okey == NULL)
|
|
|
|
return -1;
|
|
|
|
r = PyObject_SetItem(o, okey, value);
|
|
|
|
Py_DECREF(okey);
|
|
|
|
return r;
|
1998-05-22 08:47:05 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
int
|
2013-10-20 02:03:34 +08:00
|
|
|
PyMapping_HasKeyString(PyObject *o, const char *key)
|
1995-07-18 22:12:02 +08:00
|
|
|
{
|
2010-05-09 23:52:27 +08:00
|
|
|
PyObject *v;
|
1998-05-22 08:47:05 +08:00
|
|
|
|
2010-05-09 23:52:27 +08:00
|
|
|
v = PyMapping_GetItemString(o, key);
|
|
|
|
if (v) {
|
|
|
|
Py_DECREF(v);
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
PyErr_Clear();
|
|
|
|
return 0;
|
1995-07-18 22:12:02 +08:00
|
|
|
}
|
|
|
|
|
1998-05-22 08:47:05 +08:00
|
|
|
int
|
2000-07-09 12:06:11 +08:00
|
|
|
PyMapping_HasKey(PyObject *o, PyObject *key)
|
1995-07-18 22:12:02 +08:00
|
|
|
{
|
2010-05-09 23:52:27 +08:00
|
|
|
PyObject *v;
|
1998-05-22 08:47:05 +08:00
|
|
|
|
2010-05-09 23:52:27 +08:00
|
|
|
v = PyObject_GetItem(o, key);
|
|
|
|
if (v) {
|
|
|
|
Py_DECREF(v);
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
PyErr_Clear();
|
|
|
|
return 0;
|
1995-07-18 22:12:02 +08:00
|
|
|
}
|
|
|
|
|
2017-10-08 16:17:46 +08:00
|
|
|
/* This function is quite similar to PySequence_Fast(), but specialized to be
|
|
|
|
a helper for PyMapping_Keys(), PyMapping_Items() and PyMapping_Values().
|
|
|
|
*/
|
|
|
|
static PyObject *
|
|
|
|
method_output_as_list(PyObject *o, _Py_Identifier *meth_id)
|
|
|
|
{
|
|
|
|
PyObject *it, *result, *meth_output;
|
|
|
|
|
|
|
|
assert(o != NULL);
|
2019-07-08 16:19:25 +08:00
|
|
|
meth_output = _PyObject_CallMethodIdNoArgs(o, meth_id);
|
2017-10-08 16:17:46 +08:00
|
|
|
if (meth_output == NULL || PyList_CheckExact(meth_output)) {
|
|
|
|
return meth_output;
|
|
|
|
}
|
|
|
|
it = PyObject_GetIter(meth_output);
|
|
|
|
if (it == NULL) {
|
2020-06-23 21:55:06 +08:00
|
|
|
PyThreadState *tstate = _PyThreadState_GET();
|
|
|
|
if (_PyErr_ExceptionMatches(tstate, PyExc_TypeError)) {
|
|
|
|
_PyErr_Format(tstate, PyExc_TypeError,
|
|
|
|
"%.200s.%U() returned a non-iterable (type %.200s)",
|
|
|
|
Py_TYPE(o)->tp_name,
|
|
|
|
_PyUnicode_FromId(meth_id),
|
|
|
|
Py_TYPE(meth_output)->tp_name);
|
2017-10-08 16:17:46 +08:00
|
|
|
}
|
|
|
|
Py_DECREF(meth_output);
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
Py_DECREF(meth_output);
|
|
|
|
result = PySequence_List(it);
|
|
|
|
Py_DECREF(it);
|
|
|
|
return result;
|
|
|
|
}
|
|
|
|
|
2007-02-11 14:12:03 +08:00
|
|
|
PyObject *
|
|
|
|
PyMapping_Keys(PyObject *o)
|
|
|
|
{
|
2011-10-14 16:20:37 +08:00
|
|
|
_Py_IDENTIFIER(keys);
|
2007-02-11 14:12:03 +08:00
|
|
|
|
2017-10-08 16:17:46 +08:00
|
|
|
if (o == NULL) {
|
|
|
|
return null_error();
|
|
|
|
}
|
|
|
|
if (PyDict_CheckExact(o)) {
|
2010-05-09 23:52:27 +08:00
|
|
|
return PyDict_Keys(o);
|
2017-10-08 16:17:46 +08:00
|
|
|
}
|
|
|
|
return method_output_as_list(o, &PyId_keys);
|
2007-02-11 14:12:03 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
PyObject *
|
|
|
|
PyMapping_Items(PyObject *o)
|
|
|
|
{
|
2011-10-14 16:20:37 +08:00
|
|
|
_Py_IDENTIFIER(items);
|
2007-02-11 14:12:03 +08:00
|
|
|
|
2017-10-08 16:17:46 +08:00
|
|
|
if (o == NULL) {
|
|
|
|
return null_error();
|
|
|
|
}
|
|
|
|
if (PyDict_CheckExact(o)) {
|
2010-05-09 23:52:27 +08:00
|
|
|
return PyDict_Items(o);
|
2017-10-08 16:17:46 +08:00
|
|
|
}
|
|
|
|
return method_output_as_list(o, &PyId_items);
|
2007-02-11 14:12:03 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
PyObject *
|
|
|
|
PyMapping_Values(PyObject *o)
|
|
|
|
{
|
2011-10-14 16:20:37 +08:00
|
|
|
_Py_IDENTIFIER(values);
|
2007-02-11 14:12:03 +08:00
|
|
|
|
2017-10-08 16:17:46 +08:00
|
|
|
if (o == NULL) {
|
|
|
|
return null_error();
|
|
|
|
}
|
|
|
|
if (PyDict_CheckExact(o)) {
|
2010-05-09 23:52:27 +08:00
|
|
|
return PyDict_Values(o);
|
2017-10-08 16:17:46 +08:00
|
|
|
}
|
|
|
|
return method_output_as_list(o, &PyId_values);
|
2007-02-11 14:12:03 +08:00
|
|
|
}
|
|
|
|
|
2001-03-22 02:40:58 +08:00
|
|
|
/* isinstance(), issubclass() */
|
|
|
|
|
2012-03-21 11:26:41 +08:00
|
|
|
/* abstract_get_bases() has logically 4 return states:
|
abstract_get_bases(): Clarify exactly what the return values and
states can be for this function, and ensure that only AttributeErrors
are masked. Any other exception raised via the equivalent of
getattr(cls, '__bases__') should be propagated up.
abstract_issubclass(): If abstract_get_bases() returns NULL, we must
call PyErr_Occurred() to see if an exception is being propagated, and
return -1 or 0 as appropriate. This is the specific fix for a problem
whereby if getattr(derived, '__bases__') raised an exception, an
"undetected error" would occur (under a debug build). This nasty
situation was uncovered when writing a security proxy extension type
for the Zope3 project, where the security proxy raised a Forbidden
exception on getattr of __bases__.
PyObject_IsInstance(), PyObject_IsSubclass(): After both calls to
abstract_get_bases(), where we're setting the TypeError if the return
value is NULL, we must first check to see if an exception occurred,
and /not/ mask an existing exception.
Neil Schemenauer should double check that these changes don't break
his ExtensionClass examples (there aren't any test cases for those
examples and abstract_get_bases() was added by him in response to
problems with ExtensionClass). Neil, please add test cases if
possible!
I belive this is a bug fix candidate for Python 2.2.2.
2002-04-24 06:45:44 +08:00
|
|
|
*
|
|
|
|
* 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
|
2010-05-09 23:52:27 +08:00
|
|
|
* returned, but the exception is not cleared. That's because we want the
|
abstract_get_bases(): Clarify exactly what the return values and
states can be for this function, and ensure that only AttributeErrors
are masked. Any other exception raised via the equivalent of
getattr(cls, '__bases__') should be propagated up.
abstract_issubclass(): If abstract_get_bases() returns NULL, we must
call PyErr_Occurred() to see if an exception is being propagated, and
return -1 or 0 as appropriate. This is the specific fix for a problem
whereby if getattr(derived, '__bases__') raised an exception, an
"undetected error" would occur (under a debug build). This nasty
situation was uncovered when writing a security proxy extension type
for the Zope3 project, where the security proxy raised a Forbidden
exception on getattr of __bases__.
PyObject_IsInstance(), PyObject_IsSubclass(): After both calls to
abstract_get_bases(), where we're setting the TypeError if the return
value is NULL, we must first check to see if an exception occurred,
and /not/ mask an existing exception.
Neil Schemenauer should double check that these changes don't break
his ExtensionClass examples (there aren't any test cases for those
examples and abstract_get_bases() was added by him in response to
problems with ExtensionClass). Neil, please add test cases if
possible!
I belive this is a bug fix candidate for Python 2.2.2.
2002-04-24 06:45:44 +08:00
|
|
|
* 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.
|
|
|
|
*/
|
2001-10-18 11:18:43 +08:00
|
|
|
static PyObject *
|
|
|
|
abstract_get_bases(PyObject *cls)
|
2001-03-22 02:40:58 +08:00
|
|
|
{
|
2012-03-21 11:26:41 +08:00
|
|
|
_Py_IDENTIFIER(__bases__);
|
2010-05-09 23:52:27 +08:00
|
|
|
PyObject *bases;
|
|
|
|
|
2018-01-25 16:49:40 +08:00
|
|
|
(void)_PyObject_LookupAttrId(cls, &PyId___bases__, &bases);
|
|
|
|
if (bases != NULL && !PyTuple_Check(bases)) {
|
2010-05-09 23:52:27 +08:00
|
|
|
Py_DECREF(bases);
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
return bases;
|
2001-10-18 11:18:43 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
static int
|
|
|
|
abstract_issubclass(PyObject *derived, PyObject *cls)
|
|
|
|
{
|
2010-05-09 23:52:27 +08:00
|
|
|
PyObject *bases = NULL;
|
|
|
|
Py_ssize_t i, n;
|
|
|
|
int r = 0;
|
|
|
|
|
|
|
|
while (1) {
|
2020-02-22 21:11:48 +08:00
|
|
|
if (derived == cls) {
|
|
|
|
Py_XDECREF(bases); /* See below comment */
|
2010-05-09 23:52:27 +08:00
|
|
|
return 1;
|
2020-02-22 21:11:48 +08:00
|
|
|
}
|
|
|
|
/* Use XSETREF to drop bases reference *after* finishing with
|
|
|
|
derived; bases might be the only reference to it.
|
|
|
|
XSETREF is used instead of SETREF, because bases is NULL on the
|
|
|
|
first iteration of the loop.
|
|
|
|
*/
|
|
|
|
Py_XSETREF(bases, abstract_get_bases(derived));
|
2010-05-09 23:52:27 +08:00
|
|
|
if (bases == NULL) {
|
|
|
|
if (PyErr_Occurred())
|
|
|
|
return -1;
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
n = PyTuple_GET_SIZE(bases);
|
|
|
|
if (n == 0) {
|
|
|
|
Py_DECREF(bases);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
/* Avoid recursivity in the single inheritance case */
|
|
|
|
if (n == 1) {
|
|
|
|
derived = PyTuple_GET_ITEM(bases, 0);
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
for (i = 0; i < n; i++) {
|
|
|
|
r = abstract_issubclass(PyTuple_GET_ITEM(bases, i), cls);
|
|
|
|
if (r != 0)
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
Py_DECREF(bases);
|
|
|
|
return r;
|
|
|
|
}
|
2001-03-22 02:40:58 +08:00
|
|
|
}
|
|
|
|
|
2002-12-13 00:41:44 +08:00
|
|
|
static int
|
|
|
|
check_class(PyObject *cls, const char *error)
|
|
|
|
{
|
2010-05-09 23:52:27 +08:00
|
|
|
PyObject *bases = abstract_get_bases(cls);
|
|
|
|
if (bases == NULL) {
|
|
|
|
/* Do not mask errors. */
|
2020-06-23 21:55:06 +08:00
|
|
|
PyThreadState *tstate = _PyThreadState_GET();
|
|
|
|
if (!_PyErr_Occurred(tstate)) {
|
|
|
|
_PyErr_SetString(tstate, PyExc_TypeError, error);
|
|
|
|
}
|
2010-05-09 23:52:27 +08:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
Py_DECREF(bases);
|
|
|
|
return -1;
|
2002-12-13 00:41:44 +08:00
|
|
|
}
|
|
|
|
|
2004-03-21 06:52:14 +08:00
|
|
|
static int
|
2020-02-04 20:42:13 +08:00
|
|
|
object_isinstance(PyObject *inst, PyObject *cls)
|
2001-03-22 02:40:58 +08:00
|
|
|
{
|
2010-05-09 23:52:27 +08:00
|
|
|
PyObject *icls;
|
2018-01-25 16:49:40 +08:00
|
|
|
int retval;
|
2012-03-21 11:26:41 +08:00
|
|
|
_Py_IDENTIFIER(__class__);
|
2010-05-09 23:52:27 +08:00
|
|
|
if (PyType_Check(cls)) {
|
|
|
|
retval = PyObject_TypeCheck(inst, (PyTypeObject *)cls);
|
|
|
|
if (retval == 0) {
|
2018-01-25 16:49:40 +08:00
|
|
|
retval = _PyObject_LookupAttrId(inst, &PyId___class__, &icls);
|
|
|
|
if (icls != NULL) {
|
2020-02-07 08:53:23 +08:00
|
|
|
if (icls != (PyObject *)(Py_TYPE(inst)) && PyType_Check(icls)) {
|
2010-05-09 23:52:27 +08:00
|
|
|
retval = PyType_IsSubtype(
|
2018-01-25 16:49:40 +08:00
|
|
|
(PyTypeObject *)icls,
|
2010-05-09 23:52:27 +08:00
|
|
|
(PyTypeObject *)cls);
|
2018-01-25 16:49:40 +08:00
|
|
|
}
|
|
|
|
else {
|
|
|
|
retval = 0;
|
|
|
|
}
|
|
|
|
Py_DECREF(icls);
|
2010-05-09 23:52:27 +08:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
if (!check_class(cls,
|
2020-09-10 04:23:24 +08:00
|
|
|
"isinstance() arg 2 must be a type, a tuple of types or a union"))
|
2010-05-09 23:52:27 +08:00
|
|
|
return -1;
|
2018-01-25 16:49:40 +08:00
|
|
|
retval = _PyObject_LookupAttrId(inst, &PyId___class__, &icls);
|
|
|
|
if (icls != NULL) {
|
2010-05-09 23:52:27 +08:00
|
|
|
retval = abstract_issubclass(icls, cls);
|
|
|
|
Py_DECREF(icls);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return retval;
|
2001-03-22 02:40:58 +08:00
|
|
|
}
|
|
|
|
|
2019-11-05 07:51:22 +08:00
|
|
|
static int
|
2020-02-04 20:42:13 +08:00
|
|
|
object_recursive_isinstance(PyThreadState *tstate, PyObject *inst, PyObject *cls)
|
2004-03-21 06:52:14 +08:00
|
|
|
{
|
2012-01-23 00:24:29 +08:00
|
|
|
_Py_IDENTIFIER(__instancecheck__);
|
2010-05-09 23:52:27 +08:00
|
|
|
|
|
|
|
/* Quick test for an exact match */
|
2020-03-04 21:15:20 +08:00
|
|
|
if (Py_IS_TYPE(inst, (PyTypeObject *)cls)) {
|
2010-05-09 23:52:27 +08:00
|
|
|
return 1;
|
2020-02-04 20:42:13 +08:00
|
|
|
}
|
2010-05-09 23:52:27 +08:00
|
|
|
|
2014-10-03 15:26:37 +08:00
|
|
|
/* We know what type's __instancecheck__ does. */
|
|
|
|
if (PyType_CheckExact(cls)) {
|
2020-02-04 20:42:13 +08:00
|
|
|
return object_isinstance(inst, cls);
|
2014-10-03 15:26:37 +08:00
|
|
|
}
|
|
|
|
|
2010-05-09 23:52:27 +08:00
|
|
|
if (PyTuple_Check(cls)) {
|
2020-02-04 20:42:13 +08:00
|
|
|
/* Not a general sequence -- that opens up the road to
|
|
|
|
recursion and stack overflow. */
|
2019-11-05 07:51:22 +08:00
|
|
|
if (_Py_EnterRecursiveCall(tstate, " in __instancecheck__")) {
|
2010-05-09 23:52:27 +08:00
|
|
|
return -1;
|
2019-11-05 07:51:22 +08:00
|
|
|
}
|
|
|
|
Py_ssize_t n = PyTuple_GET_SIZE(cls);
|
|
|
|
int r = 0;
|
|
|
|
for (Py_ssize_t i = 0; i < n; ++i) {
|
2010-05-09 23:52:27 +08:00
|
|
|
PyObject *item = PyTuple_GET_ITEM(cls, i);
|
2020-02-04 20:42:13 +08:00
|
|
|
r = object_recursive_isinstance(tstate, inst, item);
|
|
|
|
if (r != 0) {
|
2010-05-09 23:52:27 +08:00
|
|
|
/* either found it, or got an error */
|
|
|
|
break;
|
2020-02-04 20:42:13 +08:00
|
|
|
}
|
2010-05-09 23:52:27 +08:00
|
|
|
}
|
2019-11-05 07:51:22 +08:00
|
|
|
_Py_LeaveRecursiveCall(tstate);
|
2010-05-09 23:52:27 +08:00
|
|
|
return r;
|
|
|
|
}
|
|
|
|
|
2020-02-04 20:42:13 +08:00
|
|
|
PyObject *checker = _PyObject_LookupSpecial(cls, &PyId___instancecheck__);
|
2010-05-09 23:52:27 +08:00
|
|
|
if (checker != NULL) {
|
2019-11-05 07:51:22 +08:00
|
|
|
if (_Py_EnterRecursiveCall(tstate, " in __instancecheck__")) {
|
2010-05-09 23:52:27 +08:00
|
|
|
Py_DECREF(checker);
|
2020-02-04 20:42:13 +08:00
|
|
|
return -1;
|
2010-05-09 23:52:27 +08:00
|
|
|
}
|
2020-02-04 20:42:13 +08:00
|
|
|
|
2020-02-12 00:46:57 +08:00
|
|
|
PyObject *res = PyObject_CallOneArg(checker, inst);
|
2019-11-05 07:51:22 +08:00
|
|
|
_Py_LeaveRecursiveCall(tstate);
|
2010-05-09 23:52:27 +08:00
|
|
|
Py_DECREF(checker);
|
2020-02-04 20:42:13 +08:00
|
|
|
|
|
|
|
if (res == NULL) {
|
|
|
|
return -1;
|
2010-05-09 23:52:27 +08:00
|
|
|
}
|
2020-02-04 20:42:13 +08:00
|
|
|
int ok = PyObject_IsTrue(res);
|
|
|
|
Py_DECREF(res);
|
|
|
|
|
2010-05-09 23:52:27 +08:00
|
|
|
return ok;
|
|
|
|
}
|
2019-11-05 07:51:22 +08:00
|
|
|
else if (_PyErr_Occurred(tstate)) {
|
2010-05-09 23:52:27 +08:00
|
|
|
return -1;
|
2019-11-05 07:51:22 +08:00
|
|
|
}
|
|
|
|
|
2020-02-04 20:42:13 +08:00
|
|
|
/* cls has no __instancecheck__() method */
|
|
|
|
return object_isinstance(inst, cls);
|
2010-05-09 23:52:27 +08:00
|
|
|
}
|
|
|
|
|
2019-11-05 07:51:22 +08:00
|
|
|
|
|
|
|
int
|
|
|
|
PyObject_IsInstance(PyObject *inst, PyObject *cls)
|
|
|
|
{
|
|
|
|
PyThreadState *tstate = _PyThreadState_GET();
|
2020-02-04 20:42:13 +08:00
|
|
|
return object_recursive_isinstance(tstate, inst, cls);
|
2019-11-05 07:51:22 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2010-05-09 23:52:27 +08:00
|
|
|
static int
|
2008-08-27 06:40:48 +08:00
|
|
|
recursive_issubclass(PyObject *derived, PyObject *cls)
|
2001-03-22 02:40:58 +08:00
|
|
|
{
|
2010-05-09 23:52:27 +08:00
|
|
|
if (PyType_Check(cls) && PyType_Check(derived)) {
|
|
|
|
/* Fast path (non-recursive) */
|
|
|
|
return PyType_IsSubtype((PyTypeObject *)derived, (PyTypeObject *)cls);
|
|
|
|
}
|
|
|
|
if (!check_class(derived,
|
|
|
|
"issubclass() arg 1 must be a class"))
|
|
|
|
return -1;
|
2020-09-10 04:23:24 +08:00
|
|
|
|
|
|
|
PyTypeObject *type = Py_TYPE(cls);
|
|
|
|
int is_union = (PyType_Check(type) && type == &_Py_UnionType);
|
|
|
|
if (!is_union && !check_class(cls,
|
|
|
|
"issubclass() arg 2 must be a class,"
|
|
|
|
" a tuple of classes, or a union.")) {
|
2010-05-09 23:52:27 +08:00
|
|
|
return -1;
|
2020-09-10 04:23:24 +08:00
|
|
|
}
|
2001-03-22 02:40:58 +08:00
|
|
|
|
2010-05-09 23:52:27 +08:00
|
|
|
return abstract_issubclass(derived, cls);
|
2001-03-22 02:40:58 +08:00
|
|
|
}
|
2001-04-21 03:13:02 +08:00
|
|
|
|
2019-11-05 07:51:22 +08:00
|
|
|
static int
|
|
|
|
object_issubclass(PyThreadState *tstate, PyObject *derived, PyObject *cls)
|
2004-03-21 06:52:14 +08:00
|
|
|
{
|
2012-01-23 00:24:29 +08:00
|
|
|
_Py_IDENTIFIER(__subclasscheck__);
|
2010-05-09 23:52:27 +08:00
|
|
|
PyObject *checker;
|
|
|
|
|
2014-10-03 15:26:37 +08:00
|
|
|
/* We know what type's __subclasscheck__ does. */
|
|
|
|
if (PyType_CheckExact(cls)) {
|
|
|
|
/* Quick test for an exact match */
|
|
|
|
if (derived == cls)
|
|
|
|
return 1;
|
|
|
|
return recursive_issubclass(derived, cls);
|
|
|
|
}
|
|
|
|
|
2010-05-09 23:52:27 +08:00
|
|
|
if (PyTuple_Check(cls)) {
|
|
|
|
|
2019-11-05 07:51:22 +08:00
|
|
|
if (_Py_EnterRecursiveCall(tstate, " in __subclasscheck__")) {
|
2010-05-09 23:52:27 +08:00
|
|
|
return -1;
|
2019-11-05 07:51:22 +08:00
|
|
|
}
|
|
|
|
Py_ssize_t n = PyTuple_GET_SIZE(cls);
|
|
|
|
int r = 0;
|
|
|
|
for (Py_ssize_t i = 0; i < n; ++i) {
|
2010-05-09 23:52:27 +08:00
|
|
|
PyObject *item = PyTuple_GET_ITEM(cls, i);
|
2019-11-05 07:51:22 +08:00
|
|
|
r = object_issubclass(tstate, derived, item);
|
2010-05-09 23:52:27 +08:00
|
|
|
if (r != 0)
|
|
|
|
/* either found it, or got an error */
|
|
|
|
break;
|
|
|
|
}
|
2019-11-05 07:51:22 +08:00
|
|
|
_Py_LeaveRecursiveCall(tstate);
|
2010-05-09 23:52:27 +08:00
|
|
|
return r;
|
|
|
|
}
|
|
|
|
|
2012-01-23 00:24:29 +08:00
|
|
|
checker = _PyObject_LookupSpecial(cls, &PyId___subclasscheck__);
|
2010-05-09 23:52:27 +08:00
|
|
|
if (checker != NULL) {
|
|
|
|
int ok = -1;
|
2019-11-05 07:51:22 +08:00
|
|
|
if (_Py_EnterRecursiveCall(tstate, " in __subclasscheck__")) {
|
2010-05-09 23:52:27 +08:00
|
|
|
Py_DECREF(checker);
|
|
|
|
return ok;
|
|
|
|
}
|
2020-02-12 00:46:57 +08:00
|
|
|
PyObject *res = PyObject_CallOneArg(checker, derived);
|
2019-11-05 07:51:22 +08:00
|
|
|
_Py_LeaveRecursiveCall(tstate);
|
2010-05-09 23:52:27 +08:00
|
|
|
Py_DECREF(checker);
|
|
|
|
if (res != NULL) {
|
|
|
|
ok = PyObject_IsTrue(res);
|
|
|
|
Py_DECREF(res);
|
|
|
|
}
|
|
|
|
return ok;
|
|
|
|
}
|
2019-11-05 07:51:22 +08:00
|
|
|
else if (_PyErr_Occurred(tstate)) {
|
2010-05-09 23:52:27 +08:00
|
|
|
return -1;
|
2019-11-05 07:51:22 +08:00
|
|
|
}
|
|
|
|
|
2014-10-03 15:26:37 +08:00
|
|
|
/* Probably never reached anymore. */
|
2010-05-09 23:52:27 +08:00
|
|
|
return recursive_issubclass(derived, cls);
|
2008-08-27 06:40:48 +08:00
|
|
|
}
|
|
|
|
|
2019-11-05 07:51:22 +08:00
|
|
|
|
|
|
|
int
|
|
|
|
PyObject_IsSubclass(PyObject *derived, PyObject *cls)
|
|
|
|
{
|
|
|
|
PyThreadState *tstate = _PyThreadState_GET();
|
|
|
|
return object_issubclass(tstate, derived, cls);
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2008-08-27 06:40:48 +08:00
|
|
|
int
|
|
|
|
_PyObject_RealIsInstance(PyObject *inst, PyObject *cls)
|
|
|
|
{
|
2020-02-04 20:42:13 +08:00
|
|
|
return object_isinstance(inst, cls);
|
2008-08-27 06:40:48 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
int
|
|
|
|
_PyObject_RealIsSubclass(PyObject *derived, PyObject *cls)
|
|
|
|
{
|
2010-05-09 23:52:27 +08:00
|
|
|
return recursive_issubclass(derived, cls);
|
2004-03-21 06:52:14 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2001-04-21 03:13:02 +08:00
|
|
|
PyObject *
|
|
|
|
PyObject_GetIter(PyObject *o)
|
|
|
|
{
|
2020-02-07 08:53:23 +08:00
|
|
|
PyTypeObject *t = Py_TYPE(o);
|
2016-12-10 00:08:59 +08:00
|
|
|
getiterfunc f;
|
|
|
|
|
2010-05-09 23:52:27 +08:00
|
|
|
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'",
|
2020-02-07 08:53:23 +08:00
|
|
|
Py_TYPE(res)->tp_name);
|
2010-05-09 23:52:27 +08:00
|
|
|
Py_DECREF(res);
|
|
|
|
res = NULL;
|
|
|
|
}
|
|
|
|
return res;
|
|
|
|
}
|
2001-04-23 22:08:49 +08:00
|
|
|
}
|
|
|
|
|
2021-03-24 06:47:21 +08:00
|
|
|
PyObject *
|
|
|
|
PyObject_GetAiter(PyObject *o) {
|
|
|
|
PyTypeObject *t = Py_TYPE(o);
|
|
|
|
unaryfunc f;
|
|
|
|
|
|
|
|
if (t->tp_as_async == NULL || t->tp_as_async->am_aiter == NULL) {
|
|
|
|
return type_error("'%.200s' object is not an AsyncIterable", o);
|
|
|
|
}
|
|
|
|
f = t->tp_as_async->am_aiter;
|
|
|
|
PyObject *it = (*f)(o);
|
|
|
|
if (it != NULL && !PyAiter_Check(it)) {
|
|
|
|
PyErr_Format(PyExc_TypeError,
|
|
|
|
"aiter() returned non-AsyncIterator of type '%.100s'",
|
|
|
|
Py_TYPE(it)->tp_name);
|
|
|
|
Py_DECREF(it);
|
|
|
|
it = NULL;
|
|
|
|
}
|
|
|
|
return it;
|
|
|
|
}
|
|
|
|
|
2021-02-16 23:05:58 +08:00
|
|
|
int
|
|
|
|
PyIter_Check(PyObject *obj)
|
2018-06-10 02:32:25 +08:00
|
|
|
{
|
2021-02-16 23:05:58 +08:00
|
|
|
PyTypeObject *tp = Py_TYPE(obj);
|
|
|
|
return (tp->tp_iternext != NULL &&
|
|
|
|
tp->tp_iternext != &_PyObject_NextNotImplemented);
|
2018-06-10 02:32:25 +08:00
|
|
|
}
|
|
|
|
|
2021-03-24 06:47:21 +08:00
|
|
|
int
|
|
|
|
PyAiter_Check(PyObject *obj)
|
|
|
|
{
|
|
|
|
PyTypeObject *tp = Py_TYPE(obj);
|
|
|
|
return (tp->tp_as_async != NULL &&
|
|
|
|
tp->tp_as_async->am_aiter != NULL &&
|
|
|
|
tp->tp_as_async->am_aiter != &_PyObject_NextNotImplemented &&
|
|
|
|
tp->tp_as_async->am_anext != NULL &&
|
|
|
|
tp->tp_as_async->am_anext != &_PyObject_NextNotImplemented);
|
|
|
|
}
|
|
|
|
|
2001-05-05 08:14:56 +08:00
|
|
|
/* 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.
|
2010-05-09 23:52:27 +08:00
|
|
|
* Else return the next object. PyErr_Occurred() will be false.
|
2001-05-05 08:14:56 +08:00
|
|
|
*/
|
2001-04-23 22:08:49 +08:00
|
|
|
PyObject *
|
|
|
|
PyIter_Next(PyObject *iter)
|
|
|
|
{
|
2010-05-09 23:52:27 +08:00
|
|
|
PyObject *result;
|
2020-02-07 08:53:23 +08:00
|
|
|
result = (*Py_TYPE(iter)->tp_iternext)(iter);
|
2020-06-23 21:55:06 +08:00
|
|
|
if (result == NULL) {
|
|
|
|
PyThreadState *tstate = _PyThreadState_GET();
|
|
|
|
if (_PyErr_Occurred(tstate)
|
|
|
|
&& _PyErr_ExceptionMatches(tstate, PyExc_StopIteration))
|
|
|
|
{
|
|
|
|
_PyErr_Clear(tstate);
|
|
|
|
}
|
|
|
|
}
|
2010-05-09 23:52:27 +08:00
|
|
|
return result;
|
2001-04-21 03:13:02 +08:00
|
|
|
}
|
2010-03-14 14:49:55 +08:00
|
|
|
|
2020-11-11 04:09:55 +08:00
|
|
|
PySendResult
|
|
|
|
PyIter_Send(PyObject *iter, PyObject *arg, PyObject **result)
|
|
|
|
{
|
|
|
|
_Py_IDENTIFIER(send);
|
|
|
|
assert(arg != NULL);
|
|
|
|
assert(result != NULL);
|
|
|
|
if (PyType_HasFeature(Py_TYPE(iter), Py_TPFLAGS_HAVE_AM_SEND)) {
|
|
|
|
assert (Py_TYPE(iter)->tp_as_async != NULL);
|
|
|
|
assert (Py_TYPE(iter)->tp_as_async->am_send != NULL);
|
2021-01-29 23:53:03 +08:00
|
|
|
PySendResult res = Py_TYPE(iter)->tp_as_async->am_send(iter, arg, result);
|
|
|
|
assert(_Py_CheckSlotResult(iter, "am_send", res != PYGEN_ERROR));
|
|
|
|
return res;
|
2020-11-11 04:09:55 +08:00
|
|
|
}
|
|
|
|
if (arg == Py_None && PyIter_Check(iter)) {
|
|
|
|
*result = Py_TYPE(iter)->tp_iternext(iter);
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
*result = _PyObject_CallMethodIdOneArg(iter, &PyId_send, arg);
|
|
|
|
}
|
|
|
|
if (*result != NULL) {
|
|
|
|
return PYGEN_NEXT;
|
|
|
|
}
|
|
|
|
if (_PyGen_FetchStopIterationValue(result) == 0) {
|
|
|
|
return PYGEN_RETURN;
|
|
|
|
}
|
|
|
|
return PYGEN_ERROR;
|
|
|
|
}
|
|
|
|
|
2010-03-14 14:49:55 +08:00
|
|
|
/*
|
|
|
|
* Flatten a sequence of bytes() objects into a C array of
|
|
|
|
* NULL terminated string pointers with a NULL char* terminating the array.
|
|
|
|
* (ie: an argv or env list)
|
|
|
|
*
|
2013-07-07 23:22:41 +08:00
|
|
|
* Memory allocated for the returned list is allocated using PyMem_Malloc()
|
|
|
|
* and MUST be freed by _Py_FreeCharPArray().
|
2010-03-14 14:49:55 +08:00
|
|
|
*/
|
|
|
|
char *const *
|
|
|
|
_PySequence_BytesToCharpArray(PyObject* self)
|
|
|
|
{
|
2010-05-09 23:52:27 +08:00
|
|
|
char **array;
|
|
|
|
Py_ssize_t i, argc;
|
|
|
|
PyObject *item = NULL;
|
2013-07-07 23:22:41 +08:00
|
|
|
Py_ssize_t size;
|
2010-05-09 23:52:27 +08:00
|
|
|
|
|
|
|
argc = PySequence_Size(self);
|
|
|
|
if (argc == -1)
|
|
|
|
return NULL;
|
|
|
|
|
2012-08-21 14:16:09 +08:00
|
|
|
assert(argc >= 0);
|
|
|
|
|
|
|
|
if ((size_t)argc > (PY_SSIZE_T_MAX-sizeof(char *)) / sizeof(char *)) {
|
|
|
|
PyErr_NoMemory();
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
2013-07-07 23:22:41 +08:00
|
|
|
array = PyMem_Malloc((argc + 1) * sizeof(char *));
|
2010-05-09 23:52:27 +08:00
|
|
|
if (array == NULL) {
|
|
|
|
PyErr_NoMemory();
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
for (i = 0; i < argc; ++i) {
|
|
|
|
char *data;
|
|
|
|
item = PySequence_GetItem(self, i);
|
2012-08-20 17:04:24 +08:00
|
|
|
if (item == NULL) {
|
|
|
|
/* NULL terminate before freeing. */
|
|
|
|
array[i] = NULL;
|
|
|
|
goto fail;
|
|
|
|
}
|
2017-06-24 00:39:27 +08:00
|
|
|
/* check for embedded null bytes */
|
|
|
|
if (PyBytes_AsStringAndSize(item, &data, NULL) < 0) {
|
2010-05-09 23:52:27 +08:00
|
|
|
/* NULL terminate before freeing. */
|
|
|
|
array[i] = NULL;
|
|
|
|
goto fail;
|
|
|
|
}
|
2013-07-07 23:22:41 +08:00
|
|
|
size = PyBytes_GET_SIZE(item) + 1;
|
|
|
|
array[i] = PyMem_Malloc(size);
|
2010-05-09 23:52:27 +08:00
|
|
|
if (!array[i]) {
|
|
|
|
PyErr_NoMemory();
|
|
|
|
goto fail;
|
|
|
|
}
|
2013-07-07 23:22:41 +08:00
|
|
|
memcpy(array[i], data, size);
|
2010-05-09 23:52:27 +08:00
|
|
|
Py_DECREF(item);
|
|
|
|
}
|
|
|
|
array[argc] = NULL;
|
|
|
|
|
|
|
|
return array;
|
2010-03-14 14:49:55 +08:00
|
|
|
|
|
|
|
fail:
|
2010-05-09 23:52:27 +08:00
|
|
|
Py_XDECREF(item);
|
|
|
|
_Py_FreeCharPArray(array);
|
|
|
|
return NULL;
|
2010-03-14 14:49:55 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/* Free's a NULL terminated char** array of C strings. */
|
|
|
|
void
|
|
|
|
_Py_FreeCharPArray(char *const array[])
|
|
|
|
{
|
2010-05-09 23:52:27 +08:00
|
|
|
Py_ssize_t i;
|
|
|
|
for (i = 0; array[i] != NULL; ++i) {
|
2013-07-07 23:22:41 +08:00
|
|
|
PyMem_Free(array[i]);
|
2010-05-09 23:52:27 +08:00
|
|
|
}
|
2013-07-07 23:22:41 +08:00
|
|
|
PyMem_Free((void*)array);
|
2010-03-14 14:49:55 +08:00
|
|
|
}
|