1991-06-04 19:42:30 +00:00
|
|
|
|
|
|
|
/* Write Python objects to files and read them back.
|
|
|
|
This is intended for writing and reading compiled Python code only;
|
|
|
|
a true persistent storage facility would be much harder, since
|
|
|
|
it would have to take circular links and sharing into account. */
|
|
|
|
|
2006-03-01 23:49:13 +00:00
|
|
|
#define PY_SSIZE_T_CLEAN
|
|
|
|
|
1997-04-29 20:08:16 +00:00
|
|
|
#include "Python.h"
|
1991-06-04 19:42:30 +00:00
|
|
|
#include "longintrepr.h"
|
2005-10-20 19:59:25 +00:00
|
|
|
#include "code.h"
|
1991-06-04 19:42:30 +00:00
|
|
|
#include "marshal.h"
|
|
|
|
|
2000-06-28 18:47:56 +00:00
|
|
|
/* High water mark to determine when the marshalled object is dangerously deep
|
|
|
|
* and risks coring the interpreter. When the object stack gets this deep,
|
|
|
|
* raise an exception instead of continuing.
|
|
|
|
*/
|
|
|
|
#define MAX_MARSHAL_STACK_DEPTH 5000
|
|
|
|
|
2005-06-03 14:41:55 +00:00
|
|
|
#define TYPE_NULL '0'
|
|
|
|
#define TYPE_NONE 'N'
|
|
|
|
#define TYPE_FALSE 'F'
|
|
|
|
#define TYPE_TRUE 'T'
|
|
|
|
#define TYPE_STOPITER 'S'
|
|
|
|
#define TYPE_ELLIPSIS '.'
|
|
|
|
#define TYPE_INT 'i'
|
|
|
|
#define TYPE_INT64 'I'
|
|
|
|
#define TYPE_FLOAT 'f'
|
|
|
|
#define TYPE_BINARY_FLOAT 'g'
|
|
|
|
#define TYPE_COMPLEX 'x'
|
|
|
|
#define TYPE_BINARY_COMPLEX 'y'
|
|
|
|
#define TYPE_LONG 'l'
|
|
|
|
#define TYPE_STRING 's'
|
|
|
|
#define TYPE_INTERNED 't'
|
|
|
|
#define TYPE_STRINGREF 'R'
|
|
|
|
#define TYPE_TUPLE '('
|
|
|
|
#define TYPE_LIST '['
|
|
|
|
#define TYPE_DICT '{'
|
|
|
|
#define TYPE_CODE 'c'
|
|
|
|
#define TYPE_UNICODE 'u'
|
|
|
|
#define TYPE_UNKNOWN '?'
|
|
|
|
#define TYPE_SET '<'
|
|
|
|
#define TYPE_FROZENSET '>'
|
1991-06-04 19:42:30 +00:00
|
|
|
|
1993-01-21 16:07:51 +00:00
|
|
|
typedef struct {
|
|
|
|
FILE *fp;
|
1996-06-26 20:41:23 +00:00
|
|
|
int error;
|
2000-06-28 18:47:56 +00:00
|
|
|
int depth;
|
1993-01-21 16:07:51 +00:00
|
|
|
/* If fp == NULL, the following are valid: */
|
1997-04-29 20:08:16 +00:00
|
|
|
PyObject *str;
|
1993-01-21 16:07:51 +00:00
|
|
|
char *ptr;
|
|
|
|
char *end;
|
2004-06-27 16:51:46 +00:00
|
|
|
PyObject *strings; /* dict on marshal, list on unmarshal */
|
2005-06-03 14:41:55 +00:00
|
|
|
int version;
|
1993-01-21 16:07:51 +00:00
|
|
|
} WFILE;
|
1991-06-04 19:42:30 +00:00
|
|
|
|
1993-01-21 16:07:51 +00:00
|
|
|
#define w_byte(c, p) if (((p)->fp)) putc((c), (p)->fp); \
|
|
|
|
else if ((p)->ptr != (p)->end) *(p)->ptr++ = (c); \
|
|
|
|
else w_more(c, p)
|
|
|
|
|
|
|
|
static void
|
2000-07-23 18:24:06 +00:00
|
|
|
w_more(int c, WFILE *p)
|
1993-01-21 16:07:51 +00:00
|
|
|
{
|
2006-02-15 17:27:45 +00:00
|
|
|
Py_ssize_t size, newsize;
|
1993-01-21 16:07:51 +00:00
|
|
|
if (p->str == NULL)
|
|
|
|
return; /* An error already occurred */
|
1997-04-29 20:08:16 +00:00
|
|
|
size = PyString_Size(p->str);
|
1993-01-21 16:07:51 +00:00
|
|
|
newsize = size + 1024;
|
1997-04-29 20:08:16 +00:00
|
|
|
if (_PyString_Resize(&p->str, newsize) != 0) {
|
1993-01-21 16:07:51 +00:00
|
|
|
p->ptr = p->end = NULL;
|
|
|
|
}
|
|
|
|
else {
|
1997-04-29 20:08:16 +00:00
|
|
|
p->ptr = PyString_AS_STRING((PyStringObject *)p->str) + size;
|
|
|
|
p->end =
|
|
|
|
PyString_AS_STRING((PyStringObject *)p->str) + newsize;
|
2000-07-23 19:28:35 +00:00
|
|
|
*p->ptr++ = Py_SAFE_DOWNCAST(c, int, char);
|
1993-01-21 16:07:51 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
2000-07-22 18:47:25 +00:00
|
|
|
w_string(char *s, int n, WFILE *p)
|
1993-01-21 16:07:51 +00:00
|
|
|
{
|
|
|
|
if (p->fp != NULL) {
|
|
|
|
fwrite(s, 1, n, p->fp);
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
while (--n >= 0) {
|
|
|
|
w_byte(*s, p);
|
|
|
|
s++;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
2000-07-22 18:47:25 +00:00
|
|
|
w_short(int x, WFILE *p)
|
1991-06-04 19:42:30 +00:00
|
|
|
{
|
2002-07-30 11:40:57 +00:00
|
|
|
w_byte((char)( x & 0xff), p);
|
|
|
|
w_byte((char)((x>> 8) & 0xff), p);
|
1991-06-04 19:42:30 +00:00
|
|
|
}
|
|
|
|
|
1993-01-21 16:07:51 +00:00
|
|
|
static void
|
2000-07-22 18:47:25 +00:00
|
|
|
w_long(long x, WFILE *p)
|
1991-06-04 19:42:30 +00:00
|
|
|
{
|
2002-07-30 11:44:44 +00:00
|
|
|
w_byte((char)( x & 0xff), p);
|
|
|
|
w_byte((char)((x>> 8) & 0xff), p);
|
|
|
|
w_byte((char)((x>>16) & 0xff), p);
|
|
|
|
w_byte((char)((x>>24) & 0xff), p);
|
1991-06-04 19:42:30 +00:00
|
|
|
}
|
|
|
|
|
1996-12-10 15:39:04 +00:00
|
|
|
#if SIZEOF_LONG > 4
|
1996-12-05 23:15:02 +00:00
|
|
|
static void
|
2000-07-22 18:47:25 +00:00
|
|
|
w_long64(long x, WFILE *p)
|
1996-12-05 23:15:02 +00:00
|
|
|
{
|
|
|
|
w_long(x, p);
|
1996-12-10 15:39:04 +00:00
|
|
|
w_long(x>>32, p);
|
1996-12-05 23:15:02 +00:00
|
|
|
}
|
1996-12-10 15:39:04 +00:00
|
|
|
#endif
|
1996-12-05 23:15:02 +00:00
|
|
|
|
1993-01-21 16:07:51 +00:00
|
|
|
static void
|
2000-07-22 18:47:25 +00:00
|
|
|
w_object(PyObject *v, WFILE *p)
|
1991-06-04 19:42:30 +00:00
|
|
|
{
|
2006-02-15 17:27:45 +00:00
|
|
|
Py_ssize_t i, n;
|
2000-06-28 18:47:56 +00:00
|
|
|
|
|
|
|
p->depth++;
|
2001-01-28 00:27:39 +00:00
|
|
|
|
2000-06-28 18:47:56 +00:00
|
|
|
if (p->depth > MAX_MARSHAL_STACK_DEPTH) {
|
|
|
|
p->error = 2;
|
2001-01-28 00:27:39 +00:00
|
|
|
}
|
2000-06-28 18:47:56 +00:00
|
|
|
else if (v == NULL) {
|
1993-01-21 16:07:51 +00:00
|
|
|
w_byte(TYPE_NULL, p);
|
1998-04-10 22:27:42 +00:00
|
|
|
}
|
|
|
|
else if (v == Py_None) {
|
1993-01-21 16:07:51 +00:00
|
|
|
w_byte(TYPE_NONE, p);
|
1998-04-10 22:27:42 +00:00
|
|
|
}
|
2001-06-18 22:08:13 +00:00
|
|
|
else if (v == PyExc_StopIteration) {
|
|
|
|
w_byte(TYPE_STOPITER, p);
|
|
|
|
}
|
1998-04-10 22:27:42 +00:00
|
|
|
else if (v == Py_Ellipsis) {
|
|
|
|
w_byte(TYPE_ELLIPSIS, p);
|
|
|
|
}
|
2002-04-03 22:41:51 +00:00
|
|
|
else if (v == Py_False) {
|
|
|
|
w_byte(TYPE_FALSE, p);
|
|
|
|
}
|
|
|
|
else if (v == Py_True) {
|
|
|
|
w_byte(TYPE_TRUE, p);
|
|
|
|
}
|
1997-04-29 20:08:16 +00:00
|
|
|
else if (PyInt_Check(v)) {
|
|
|
|
long x = PyInt_AS_LONG((PyIntObject *)v);
|
1996-12-10 15:39:04 +00:00
|
|
|
#if SIZEOF_LONG > 4
|
2001-04-10 05:02:52 +00:00
|
|
|
long y = Py_ARITHMETIC_RIGHT_SHIFT(long, x, 31);
|
1996-12-05 23:15:02 +00:00
|
|
|
if (y && y != -1) {
|
|
|
|
w_byte(TYPE_INT64, p);
|
|
|
|
w_long64(x, p);
|
|
|
|
}
|
1996-12-10 15:39:04 +00:00
|
|
|
else
|
|
|
|
#endif
|
|
|
|
{
|
1996-12-05 23:15:02 +00:00
|
|
|
w_byte(TYPE_INT, p);
|
|
|
|
w_long(x, p);
|
|
|
|
}
|
1991-06-04 19:42:30 +00:00
|
|
|
}
|
1997-04-29 20:08:16 +00:00
|
|
|
else if (PyLong_Check(v)) {
|
|
|
|
PyLongObject *ob = (PyLongObject *)v;
|
1993-01-21 16:07:51 +00:00
|
|
|
w_byte(TYPE_LONG, p);
|
1991-06-04 19:42:30 +00:00
|
|
|
n = ob->ob_size;
|
1993-01-21 16:07:51 +00:00
|
|
|
w_long((long)n, p);
|
1991-06-04 19:42:30 +00:00
|
|
|
if (n < 0)
|
|
|
|
n = -n;
|
|
|
|
for (i = 0; i < n; i++)
|
1993-01-21 16:07:51 +00:00
|
|
|
w_short(ob->ob_digit[i], p);
|
1991-06-04 19:42:30 +00:00
|
|
|
}
|
1997-04-29 20:08:16 +00:00
|
|
|
else if (PyFloat_Check(v)) {
|
2005-06-03 14:41:55 +00:00
|
|
|
if (p->version > 1) {
|
2005-06-25 08:23:41 +00:00
|
|
|
unsigned char buf[8];
|
2005-06-03 14:41:55 +00:00
|
|
|
if (_PyFloat_Pack8(PyFloat_AsDouble(v),
|
|
|
|
buf, 1) < 0) {
|
|
|
|
p->error = 1;
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
w_byte(TYPE_BINARY_FLOAT, p);
|
2005-06-25 08:23:41 +00:00
|
|
|
w_string((char*)buf, 8, p);
|
2005-06-03 14:41:55 +00:00
|
|
|
}
|
|
|
|
else {
|
|
|
|
char buf[256]; /* Plenty to format any double */
|
|
|
|
PyFloat_AsReprString(buf, (PyFloatObject *)v);
|
2006-02-16 14:37:48 +00:00
|
|
|
n = strlen(buf);
|
2005-06-03 14:41:55 +00:00
|
|
|
w_byte(TYPE_FLOAT, p);
|
2006-02-16 14:37:48 +00:00
|
|
|
w_byte((int)n, p);
|
2006-03-07 12:08:51 +00:00
|
|
|
w_string(buf, (int)n, p);
|
2005-06-03 14:41:55 +00:00
|
|
|
}
|
1991-06-04 19:42:30 +00:00
|
|
|
}
|
1996-01-12 01:09:56 +00:00
|
|
|
#ifndef WITHOUT_COMPLEX
|
1997-04-29 20:08:16 +00:00
|
|
|
else if (PyComplex_Check(v)) {
|
2005-06-03 14:41:55 +00:00
|
|
|
if (p->version > 1) {
|
2005-06-25 08:23:41 +00:00
|
|
|
unsigned char buf[8];
|
2005-06-03 14:41:55 +00:00
|
|
|
if (_PyFloat_Pack8(PyComplex_RealAsDouble(v),
|
|
|
|
buf, 1) < 0) {
|
|
|
|
p->error = 1;
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
w_byte(TYPE_BINARY_COMPLEX, p);
|
2005-06-25 08:23:41 +00:00
|
|
|
w_string((char*)buf, 8, p);
|
2005-06-03 14:41:55 +00:00
|
|
|
if (_PyFloat_Pack8(PyComplex_ImagAsDouble(v),
|
|
|
|
buf, 1) < 0) {
|
|
|
|
p->error = 1;
|
|
|
|
return;
|
|
|
|
}
|
2005-06-25 08:23:41 +00:00
|
|
|
w_string((char*)buf, 8, p);
|
2005-06-03 14:41:55 +00:00
|
|
|
}
|
|
|
|
else {
|
|
|
|
char buf[256]; /* Plenty to format any double */
|
|
|
|
PyFloatObject *temp;
|
|
|
|
w_byte(TYPE_COMPLEX, p);
|
|
|
|
temp = (PyFloatObject*)PyFloat_FromDouble(
|
|
|
|
PyComplex_RealAsDouble(v));
|
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-21 19:07:27 +00:00
|
|
|
if (!temp) {
|
|
|
|
p->error = 1;
|
|
|
|
return;
|
|
|
|
}
|
2005-06-03 14:41:55 +00:00
|
|
|
PyFloat_AsReprString(buf, temp);
|
|
|
|
Py_DECREF(temp);
|
2006-03-07 12:08:51 +00:00
|
|
|
n = strlen(buf);
|
|
|
|
w_byte((int)n, p);
|
|
|
|
w_string(buf, (int)n, p);
|
2005-06-03 14:41:55 +00:00
|
|
|
temp = (PyFloatObject*)PyFloat_FromDouble(
|
|
|
|
PyComplex_ImagAsDouble(v));
|
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-21 19:07:27 +00:00
|
|
|
if (!temp) {
|
|
|
|
p->error = 1;
|
|
|
|
return;
|
|
|
|
}
|
2005-06-03 14:41:55 +00:00
|
|
|
PyFloat_AsReprString(buf, temp);
|
|
|
|
Py_DECREF(temp);
|
2006-03-07 12:08:51 +00:00
|
|
|
n = strlen(buf);
|
|
|
|
w_byte((int)n, p);
|
|
|
|
w_string(buf, (int)n, p);
|
2005-06-03 14:41:55 +00:00
|
|
|
}
|
1996-01-12 01:09:56 +00:00
|
|
|
}
|
|
|
|
#endif
|
1997-04-29 20:08:16 +00:00
|
|
|
else if (PyString_Check(v)) {
|
2004-06-27 16:51:46 +00:00
|
|
|
if (p->strings && PyString_CHECK_INTERNED(v)) {
|
|
|
|
PyObject *o = PyDict_GetItem(p->strings, v);
|
|
|
|
if (o) {
|
|
|
|
long w = PyInt_AsLong(o);
|
|
|
|
w_byte(TYPE_STRINGREF, p);
|
|
|
|
w_long(w, p);
|
|
|
|
goto exit;
|
|
|
|
}
|
|
|
|
else {
|
2006-02-15 17:27:45 +00:00
|
|
|
o = PyInt_FromSsize_t(PyDict_Size(p->strings));
|
2004-06-27 16:51:46 +00:00
|
|
|
PyDict_SetItem(p->strings, v, o);
|
|
|
|
Py_DECREF(o);
|
|
|
|
w_byte(TYPE_INTERNED, p);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
w_byte(TYPE_STRING, p);
|
|
|
|
}
|
2000-03-10 23:03:02 +00:00
|
|
|
n = PyString_GET_SIZE(v);
|
2006-03-07 12:08:51 +00:00
|
|
|
if (n > INT_MAX) {
|
|
|
|
/* huge strings are not supported */
|
|
|
|
p->depth--;
|
|
|
|
p->error = 1;
|
|
|
|
return;
|
|
|
|
}
|
1995-02-17 15:10:07 +00:00
|
|
|
w_long((long)n, p);
|
2006-03-07 12:08:51 +00:00
|
|
|
w_string(PyString_AS_STRING(v), (int)n, p);
|
2000-03-10 23:03:02 +00:00
|
|
|
}
|
2001-08-17 18:39:25 +00:00
|
|
|
#ifdef Py_USING_UNICODE
|
2000-03-10 23:03:02 +00:00
|
|
|
else if (PyUnicode_Check(v)) {
|
|
|
|
PyObject *utf8;
|
|
|
|
utf8 = PyUnicode_AsUTF8String(v);
|
|
|
|
if (utf8 == NULL) {
|
2000-06-28 23:24:19 +00:00
|
|
|
p->depth--;
|
|
|
|
p->error = 1;
|
|
|
|
return;
|
2000-03-10 23:03:02 +00:00
|
|
|
}
|
|
|
|
w_byte(TYPE_UNICODE, p);
|
|
|
|
n = PyString_GET_SIZE(utf8);
|
2006-03-07 12:08:51 +00:00
|
|
|
if (n > INT_MAX) {
|
|
|
|
p->depth--;
|
|
|
|
p->error = 1;
|
|
|
|
return;
|
|
|
|
}
|
2000-03-10 23:03:02 +00:00
|
|
|
w_long((long)n, p);
|
2006-03-07 12:08:51 +00:00
|
|
|
w_string(PyString_AS_STRING(utf8), (int)n, p);
|
2000-03-10 23:03:02 +00:00
|
|
|
Py_DECREF(utf8);
|
1991-06-04 19:42:30 +00:00
|
|
|
}
|
2001-08-17 18:39:25 +00:00
|
|
|
#endif
|
1997-04-29 20:08:16 +00:00
|
|
|
else if (PyTuple_Check(v)) {
|
1993-01-21 16:07:51 +00:00
|
|
|
w_byte(TYPE_TUPLE, p);
|
1997-04-29 20:08:16 +00:00
|
|
|
n = PyTuple_Size(v);
|
1995-02-17 15:10:07 +00:00
|
|
|
w_long((long)n, p);
|
1991-06-04 19:42:30 +00:00
|
|
|
for (i = 0; i < n; i++) {
|
1997-04-29 20:08:16 +00:00
|
|
|
w_object(PyTuple_GET_ITEM(v, i), p);
|
1991-06-04 19:42:30 +00:00
|
|
|
}
|
|
|
|
}
|
1997-04-29 20:08:16 +00:00
|
|
|
else if (PyList_Check(v)) {
|
1993-01-21 16:07:51 +00:00
|
|
|
w_byte(TYPE_LIST, p);
|
2000-03-10 23:03:02 +00:00
|
|
|
n = PyList_GET_SIZE(v);
|
1995-02-17 15:10:07 +00:00
|
|
|
w_long((long)n, p);
|
1991-06-04 19:42:30 +00:00
|
|
|
for (i = 0; i < n; i++) {
|
2000-03-10 23:03:02 +00:00
|
|
|
w_object(PyList_GET_ITEM(v, i), p);
|
1991-06-04 19:42:30 +00:00
|
|
|
}
|
|
|
|
}
|
1997-04-29 20:08:16 +00:00
|
|
|
else if (PyDict_Check(v)) {
|
2006-02-15 17:27:45 +00:00
|
|
|
Py_ssize_t pos;
|
1997-04-29 20:08:16 +00:00
|
|
|
PyObject *key, *value;
|
1993-01-21 16:07:51 +00:00
|
|
|
w_byte(TYPE_DICT, p);
|
1991-06-07 13:58:22 +00:00
|
|
|
/* This one is NULL object terminated! */
|
1993-05-19 14:50:45 +00:00
|
|
|
pos = 0;
|
1997-04-29 20:08:16 +00:00
|
|
|
while (PyDict_Next(v, &pos, &key, &value)) {
|
1993-05-19 14:50:45 +00:00
|
|
|
w_object(key, p);
|
|
|
|
w_object(value, p);
|
1991-06-07 13:58:22 +00:00
|
|
|
}
|
1997-04-29 20:08:16 +00:00
|
|
|
w_object((PyObject *)NULL, p);
|
1991-06-07 13:58:22 +00:00
|
|
|
}
|
2005-01-11 03:03:27 +00:00
|
|
|
else if (PyAnySet_Check(v)) {
|
|
|
|
PyObject *value, *it;
|
|
|
|
|
|
|
|
if (PyObject_TypeCheck(v, &PySet_Type))
|
|
|
|
w_byte(TYPE_SET, p);
|
|
|
|
else
|
|
|
|
w_byte(TYPE_FROZENSET, p);
|
|
|
|
n = PyObject_Size(v);
|
|
|
|
if (n == -1) {
|
|
|
|
p->depth--;
|
|
|
|
p->error = 1;
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
w_long((long)n, p);
|
|
|
|
it = PyObject_GetIter(v);
|
|
|
|
if (it == NULL) {
|
|
|
|
p->depth--;
|
|
|
|
p->error = 1;
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
while ((value = PyIter_Next(it)) != NULL) {
|
|
|
|
w_object(value, p);
|
|
|
|
Py_DECREF(value);
|
|
|
|
}
|
|
|
|
Py_DECREF(it);
|
|
|
|
if (PyErr_Occurred()) {
|
|
|
|
p->depth--;
|
|
|
|
p->error = 1;
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
}
|
1997-04-29 20:08:16 +00:00
|
|
|
else if (PyCode_Check(v)) {
|
|
|
|
PyCodeObject *co = (PyCodeObject *)v;
|
1993-01-21 16:07:51 +00:00
|
|
|
w_byte(TYPE_CODE, p);
|
2002-06-14 01:07:39 +00:00
|
|
|
w_long(co->co_argcount, p);
|
2006-10-27 23:31:49 +00:00
|
|
|
w_long(co->co_kwonlyargcount, p);
|
2002-06-14 01:07:39 +00:00
|
|
|
w_long(co->co_nlocals, p);
|
|
|
|
w_long(co->co_stacksize, p);
|
|
|
|
w_long(co->co_flags, p);
|
1998-10-07 19:42:25 +00:00
|
|
|
w_object(co->co_code, p);
|
1993-01-21 16:07:51 +00:00
|
|
|
w_object(co->co_consts, p);
|
|
|
|
w_object(co->co_names, p);
|
1995-07-18 14:51:37 +00:00
|
|
|
w_object(co->co_varnames, p);
|
PEP 227 implementation
The majority of the changes are in the compiler. The mainloop changes
primarily to implement the new opcodes and to pass a function's
closure to eval_code2(). Frames and functions got new slots to hold
the closure.
Include/compile.h
Add co_freevars and co_cellvars slots to code objects.
Update PyCode_New() to take freevars and cellvars as arguments
Include/funcobject.h
Add func_closure slot to function objects.
Add GetClosure()/SetClosure() functions (and corresponding
macros) for getting at the closure.
Include/frameobject.h
PyFrame_New() now takes a closure.
Include/opcode.h
Add four new opcodes: MAKE_CLOSURE, LOAD_CLOSURE, LOAD_DEREF,
STORE_DEREF.
Remove comment about old requirement for opcodes to fit in 7
bits.
compile.c
Implement changes to code objects for co_freevars and co_cellvars.
Modify symbol table to use st_cur_name (string object for the name
of the current scope) and st_cur_children (list of nested blocks).
Also define st_nested, which might more properly be called
st_cur_nested. Add several DEF_XXX flags to track def-use
information for free variables.
New or modified functions of note:
com_make_closure(struct compiling *, PyCodeObject *)
Emit LOAD_CLOSURE opcodes as needed to pass cells for free
variables into nested scope.
com_addop_varname(struct compiling *, int, char *)
Emits opcodes for LOAD_DEREF and STORE_DEREF.
get_ref_type(struct compiling *, char *name)
Return NAME_CLOSURE if ref type is FREE or CELL
symtable_load_symbols(struct compiling *)
Decides what variables are cell or free based on def-use info.
Can now raise SyntaxError if nested scopes are mixed with
exec or from blah import *.
make_scope_info(PyObject *, PyObject *, int, int)
Helper functions for symtable scope stack.
symtable_update_free_vars(struct symtable *)
After a code block has been analyzed, it must check each of
its children for free variables that are not defined in the
block. If a variable is free in a child and not defined in
the parent, then it is defined by block the enclosing the
current one or it is a global. This does the right logic.
symtable_add_use() is now a macro for symtable_add_def()
symtable_assign(struct symtable *, node *)
Use goto instead of for (;;)
Fixed bug in symtable where name of keyword argument in function
call was treated as assignment in the scope of the call site. Ex:
def f():
g(a=2) # a was considered a local of f
ceval.c
eval_code2() now take one more argument, a closure.
Implement LOAD_CLOSURE, LOAD_DEREF, STORE_DEREF, MAKE_CLOSURE>
Also: When name error occurs for global variable, report that the
name was global in the error mesage.
Objects/frameobject.c
Initialize f_closure to be a tuple containing space for cellvars
and freevars. f_closure is NULL if neither are present.
Objects/funcobject.c
Add support for func_closure.
Python/import.c
Change the magic number.
Python/marshal.c
Track changes to code objects.
2001-01-25 20:06:59 +00:00
|
|
|
w_object(co->co_freevars, p);
|
|
|
|
w_object(co->co_cellvars, p);
|
1993-01-21 16:07:51 +00:00
|
|
|
w_object(co->co_filename, p);
|
1993-03-29 10:43:31 +00:00
|
|
|
w_object(co->co_name, p);
|
2002-06-14 01:07:39 +00:00
|
|
|
w_long(co->co_firstlineno, p);
|
1997-01-24 03:44:17 +00:00
|
|
|
w_object(co->co_lnotab, p);
|
1991-06-04 19:42:30 +00:00
|
|
|
}
|
2001-11-09 22:02:48 +00:00
|
|
|
else if (PyObject_CheckReadBuffer(v)) {
|
1998-10-07 19:42:25 +00:00
|
|
|
/* Write unknown buffer-style objects as a string */
|
|
|
|
char *s;
|
2001-11-09 22:02:48 +00:00
|
|
|
PyBufferProcs *pb = v->ob_type->tp_as_buffer;
|
1998-10-07 19:42:25 +00:00
|
|
|
w_byte(TYPE_STRING, p);
|
|
|
|
n = (*pb->bf_getreadbuffer)(v, 0, (void **)&s);
|
2006-03-07 12:08:51 +00:00
|
|
|
if (n > INT_MAX) {
|
|
|
|
p->depth--;
|
|
|
|
p->error = 1;
|
|
|
|
return;
|
|
|
|
}
|
1998-10-07 19:42:25 +00:00
|
|
|
w_long((long)n, p);
|
2006-03-07 12:08:51 +00:00
|
|
|
w_string(s, (int)n, p);
|
1998-10-07 19:42:25 +00:00
|
|
|
}
|
1991-06-04 19:42:30 +00:00
|
|
|
else {
|
1993-01-21 16:07:51 +00:00
|
|
|
w_byte(TYPE_UNKNOWN, p);
|
1996-06-26 20:41:23 +00:00
|
|
|
p->error = 1;
|
1991-06-04 19:42:30 +00:00
|
|
|
}
|
2004-06-27 16:51:46 +00:00
|
|
|
exit:
|
2000-06-28 23:24:19 +00:00
|
|
|
p->depth--;
|
1991-06-04 19:42:30 +00:00
|
|
|
}
|
|
|
|
|
2004-06-27 16:51:46 +00:00
|
|
|
/* version currently has no effect for writing longs. */
|
1993-01-21 16:07:51 +00:00
|
|
|
void
|
2004-06-27 16:51:46 +00:00
|
|
|
PyMarshal_WriteLongToFile(long x, FILE *fp, int version)
|
1993-01-21 16:07:51 +00:00
|
|
|
{
|
|
|
|
WFILE wf;
|
|
|
|
wf.fp = fp;
|
1996-06-26 20:41:23 +00:00
|
|
|
wf.error = 0;
|
2000-06-28 18:47:56 +00:00
|
|
|
wf.depth = 0;
|
2004-06-27 16:51:46 +00:00
|
|
|
wf.strings = NULL;
|
2005-06-03 14:41:55 +00:00
|
|
|
wf.version = version;
|
1993-01-21 16:07:51 +00:00
|
|
|
w_long(x, &wf);
|
|
|
|
}
|
1991-06-04 19:42:30 +00:00
|
|
|
|
1993-01-21 16:07:51 +00:00
|
|
|
void
|
2004-06-27 16:51:46 +00:00
|
|
|
PyMarshal_WriteObjectToFile(PyObject *x, FILE *fp, int version)
|
1993-01-21 16:07:51 +00:00
|
|
|
{
|
|
|
|
WFILE wf;
|
|
|
|
wf.fp = fp;
|
1996-06-26 20:41:23 +00:00
|
|
|
wf.error = 0;
|
2000-06-28 23:24:19 +00:00
|
|
|
wf.depth = 0;
|
2004-06-27 16:51:46 +00:00
|
|
|
wf.strings = (version > 0) ? PyDict_New() : NULL;
|
2005-06-03 14:41:55 +00:00
|
|
|
wf.version = version;
|
1993-01-21 16:07:51 +00:00
|
|
|
w_object(x, &wf);
|
2004-06-27 16:51:46 +00:00
|
|
|
Py_XDECREF(wf.strings);
|
1993-01-21 16:07:51 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
typedef WFILE RFILE; /* Same struct with different invariants */
|
|
|
|
|
1995-03-09 12:12:11 +00:00
|
|
|
#define rs_byte(p) (((p)->ptr != (p)->end) ? (unsigned char)*(p)->ptr++ : EOF)
|
|
|
|
|
|
|
|
#define r_byte(p) ((p)->fp ? getc((p)->fp) : rs_byte(p))
|
1993-01-21 16:07:51 +00:00
|
|
|
|
|
|
|
static int
|
2000-07-22 18:47:25 +00:00
|
|
|
r_string(char *s, int n, RFILE *p)
|
1993-01-21 16:07:51 +00:00
|
|
|
{
|
|
|
|
if (p->fp != NULL)
|
2006-02-15 17:27:45 +00:00
|
|
|
/* The result fits into int because it must be <=n. */
|
|
|
|
return (int)fread(s, 1, n, p->fp);
|
1993-01-21 16:07:51 +00:00
|
|
|
if (p->end - p->ptr < n)
|
2006-02-15 17:27:45 +00:00
|
|
|
n = (int)(p->end - p->ptr);
|
1993-01-21 16:07:51 +00:00
|
|
|
memcpy(s, p->ptr, n);
|
|
|
|
p->ptr += n;
|
|
|
|
return n;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int
|
2000-07-22 18:47:25 +00:00
|
|
|
r_short(RFILE *p)
|
1991-06-04 19:42:30 +00:00
|
|
|
{
|
|
|
|
register short x;
|
1993-01-21 16:07:51 +00:00
|
|
|
x = r_byte(p);
|
|
|
|
x |= r_byte(p) << 8;
|
2000-09-19 08:54:13 +00:00
|
|
|
/* Sign-extension, in case short greater than 16 bits */
|
|
|
|
x |= -(x & 0x8000);
|
1991-06-04 19:42:30 +00:00
|
|
|
return x;
|
|
|
|
}
|
|
|
|
|
1993-01-21 16:07:51 +00:00
|
|
|
static long
|
2000-07-22 18:47:25 +00:00
|
|
|
r_long(RFILE *p)
|
1991-06-04 19:42:30 +00:00
|
|
|
{
|
|
|
|
register long x;
|
1995-03-09 12:12:11 +00:00
|
|
|
register FILE *fp = p->fp;
|
|
|
|
if (fp) {
|
|
|
|
x = getc(fp);
|
|
|
|
x |= (long)getc(fp) << 8;
|
|
|
|
x |= (long)getc(fp) << 16;
|
|
|
|
x |= (long)getc(fp) << 24;
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
x = rs_byte(p);
|
|
|
|
x |= (long)rs_byte(p) << 8;
|
|
|
|
x |= (long)rs_byte(p) << 16;
|
|
|
|
x |= (long)rs_byte(p) << 24;
|
|
|
|
}
|
1996-12-10 15:39:04 +00:00
|
|
|
#if SIZEOF_LONG > 4
|
1996-12-05 23:15:02 +00:00
|
|
|
/* Sign extension for 64-bit machines */
|
2000-09-19 08:54:13 +00:00
|
|
|
x |= -(x & 0x80000000L);
|
1996-12-10 15:39:04 +00:00
|
|
|
#endif
|
1996-12-05 23:15:02 +00:00
|
|
|
return x;
|
|
|
|
}
|
|
|
|
|
2001-08-29 02:28:42 +00:00
|
|
|
/* r_long64 deals with the TYPE_INT64 code. On a machine with
|
|
|
|
sizeof(long) > 4, it returns a Python int object, else a Python long
|
|
|
|
object. Note that w_long64 writes out TYPE_INT if 32 bits is enough,
|
|
|
|
so there's no inefficiency here in returning a PyLong on 32-bit boxes
|
|
|
|
for everything written via TYPE_INT64 (i.e., if an int is written via
|
|
|
|
TYPE_INT64, it *needs* more than 32 bits).
|
|
|
|
*/
|
|
|
|
static PyObject *
|
2000-07-22 18:47:25 +00:00
|
|
|
r_long64(RFILE *p)
|
1996-12-05 23:15:02 +00:00
|
|
|
{
|
2001-08-29 02:28:42 +00:00
|
|
|
long lo4 = r_long(p);
|
|
|
|
long hi4 = r_long(p);
|
1996-12-10 15:39:04 +00:00
|
|
|
#if SIZEOF_LONG > 4
|
2001-08-29 02:28:42 +00:00
|
|
|
long x = (hi4 << 32) | (lo4 & 0xFFFFFFFFL);
|
|
|
|
return PyInt_FromLong(x);
|
1996-12-10 15:39:04 +00:00
|
|
|
#else
|
2001-08-29 02:28:42 +00:00
|
|
|
unsigned char buf[8];
|
|
|
|
int one = 1;
|
|
|
|
int is_little_endian = (int)*(char*)&one;
|
|
|
|
if (is_little_endian) {
|
|
|
|
memcpy(buf, &lo4, 4);
|
|
|
|
memcpy(buf+4, &hi4, 4);
|
1996-12-05 23:15:02 +00:00
|
|
|
}
|
2001-08-29 02:28:42 +00:00
|
|
|
else {
|
|
|
|
memcpy(buf, &hi4, 4);
|
|
|
|
memcpy(buf+4, &lo4, 4);
|
|
|
|
}
|
|
|
|
return _PyLong_FromByteArray(buf, 8, is_little_endian, 1);
|
1996-12-10 15:39:04 +00:00
|
|
|
#endif
|
1991-06-04 19:42:30 +00:00
|
|
|
}
|
|
|
|
|
1997-04-29 20:08:16 +00:00
|
|
|
static PyObject *
|
2000-07-22 18:47:25 +00:00
|
|
|
r_object(RFILE *p)
|
1991-06-04 19:42:30 +00:00
|
|
|
{
|
2004-03-26 15:09:27 +00:00
|
|
|
/* NULL is a valid return value, it does not necessarily means that
|
|
|
|
an exception is set. */
|
2005-01-11 03:03:27 +00:00
|
|
|
PyObject *v, *v2, *v3;
|
1991-06-04 19:42:30 +00:00
|
|
|
long i, n;
|
1993-01-21 16:07:51 +00:00
|
|
|
int type = r_byte(p);
|
2001-01-28 00:27:39 +00:00
|
|
|
|
1991-06-04 19:42:30 +00:00
|
|
|
switch (type) {
|
2001-01-28 00:27:39 +00:00
|
|
|
|
1991-06-04 19:42:30 +00:00
|
|
|
case EOF:
|
1997-04-29 20:08:16 +00:00
|
|
|
PyErr_SetString(PyExc_EOFError,
|
|
|
|
"EOF read where object expected");
|
1991-06-04 19:42:30 +00:00
|
|
|
return NULL;
|
2001-01-28 00:27:39 +00:00
|
|
|
|
1991-06-04 19:42:30 +00:00
|
|
|
case TYPE_NULL:
|
|
|
|
return NULL;
|
2001-01-28 00:27:39 +00:00
|
|
|
|
1991-06-04 19:42:30 +00:00
|
|
|
case TYPE_NONE:
|
1997-04-29 20:08:16 +00:00
|
|
|
Py_INCREF(Py_None);
|
|
|
|
return Py_None;
|
2001-01-28 00:27:39 +00:00
|
|
|
|
2001-06-18 22:08:13 +00:00
|
|
|
case TYPE_STOPITER:
|
|
|
|
Py_INCREF(PyExc_StopIteration);
|
|
|
|
return PyExc_StopIteration;
|
|
|
|
|
1996-10-11 16:25:41 +00:00
|
|
|
case TYPE_ELLIPSIS:
|
1997-04-29 20:08:16 +00:00
|
|
|
Py_INCREF(Py_Ellipsis);
|
1996-10-11 16:25:41 +00:00
|
|
|
return Py_Ellipsis;
|
2001-01-28 00:27:39 +00:00
|
|
|
|
2002-04-03 22:41:51 +00:00
|
|
|
case TYPE_FALSE:
|
|
|
|
Py_INCREF(Py_False);
|
|
|
|
return Py_False;
|
|
|
|
|
|
|
|
case TYPE_TRUE:
|
|
|
|
Py_INCREF(Py_True);
|
|
|
|
return Py_True;
|
|
|
|
|
1991-06-04 19:42:30 +00:00
|
|
|
case TYPE_INT:
|
1997-04-29 20:08:16 +00:00
|
|
|
return PyInt_FromLong(r_long(p));
|
2001-01-28 00:27:39 +00:00
|
|
|
|
1996-12-05 23:15:02 +00:00
|
|
|
case TYPE_INT64:
|
2001-08-29 02:28:42 +00:00
|
|
|
return r_long64(p);
|
2001-01-28 00:27:39 +00:00
|
|
|
|
1991-06-04 19:42:30 +00:00
|
|
|
case TYPE_LONG:
|
|
|
|
{
|
|
|
|
int size;
|
1997-04-29 20:08:16 +00:00
|
|
|
PyLongObject *ob;
|
1993-01-21 16:07:51 +00:00
|
|
|
n = r_long(p);
|
1991-06-04 19:42:30 +00:00
|
|
|
size = n<0 ? -n : n;
|
1997-04-29 20:08:16 +00:00
|
|
|
ob = _PyLong_New(size);
|
1991-06-04 19:42:30 +00:00
|
|
|
if (ob == NULL)
|
|
|
|
return NULL;
|
|
|
|
ob->ob_size = n;
|
2004-03-26 15:09:27 +00:00
|
|
|
for (i = 0; i < size; i++) {
|
|
|
|
int digit = r_short(p);
|
|
|
|
if (digit < 0) {
|
|
|
|
Py_DECREF(ob);
|
|
|
|
PyErr_SetString(PyExc_ValueError,
|
|
|
|
"bad marshal data");
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
ob->ob_digit[i] = digit;
|
|
|
|
}
|
1997-04-29 20:08:16 +00:00
|
|
|
return (PyObject *)ob;
|
1991-06-04 19:42:30 +00:00
|
|
|
}
|
2001-01-28 00:27:39 +00:00
|
|
|
|
1991-06-04 19:42:30 +00:00
|
|
|
case TYPE_FLOAT:
|
|
|
|
{
|
|
|
|
char buf[256];
|
1997-02-14 22:58:07 +00:00
|
|
|
double dx;
|
1993-01-21 16:07:51 +00:00
|
|
|
n = r_byte(p);
|
2004-03-26 15:09:27 +00:00
|
|
|
if (n == EOF || r_string(buf, (int)n, p) != n) {
|
1997-04-29 20:08:16 +00:00
|
|
|
PyErr_SetString(PyExc_EOFError,
|
1991-06-04 19:42:30 +00:00
|
|
|
"EOF read where object expected");
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
buf[n] = '\0';
|
1997-02-14 22:58:07 +00:00
|
|
|
PyFPE_START_PROTECT("atof", return 0)
|
2004-06-08 18:52:54 +00:00
|
|
|
dx = PyOS_ascii_atof(buf);
|
1997-03-14 04:32:50 +00:00
|
|
|
PyFPE_END_PROTECT(dx)
|
1997-04-29 20:08:16 +00:00
|
|
|
return PyFloat_FromDouble(dx);
|
1991-06-04 19:42:30 +00:00
|
|
|
}
|
2001-01-28 00:27:39 +00:00
|
|
|
|
2005-06-03 14:41:55 +00:00
|
|
|
case TYPE_BINARY_FLOAT:
|
|
|
|
{
|
2005-06-25 08:23:41 +00:00
|
|
|
unsigned char buf[8];
|
2005-06-03 14:41:55 +00:00
|
|
|
double x;
|
2005-06-25 08:23:41 +00:00
|
|
|
if (r_string((char*)buf, 8, p) != 8) {
|
2005-06-03 14:41:55 +00:00
|
|
|
PyErr_SetString(PyExc_EOFError,
|
|
|
|
"EOF read where object expected");
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
x = _PyFloat_Unpack8(buf, 1);
|
|
|
|
if (x == -1.0 && PyErr_Occurred()) {
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
return PyFloat_FromDouble(x);
|
|
|
|
}
|
|
|
|
|
1996-01-12 01:09:56 +00:00
|
|
|
#ifndef WITHOUT_COMPLEX
|
|
|
|
case TYPE_COMPLEX:
|
|
|
|
{
|
|
|
|
char buf[256];
|
1996-07-21 02:27:43 +00:00
|
|
|
Py_complex c;
|
1996-01-12 01:09:56 +00:00
|
|
|
n = r_byte(p);
|
2004-03-26 15:09:27 +00:00
|
|
|
if (n == EOF || r_string(buf, (int)n, p) != n) {
|
1997-04-29 20:08:16 +00:00
|
|
|
PyErr_SetString(PyExc_EOFError,
|
1996-01-12 01:09:56 +00:00
|
|
|
"EOF read where object expected");
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
buf[n] = '\0';
|
1997-02-14 22:58:07 +00:00
|
|
|
PyFPE_START_PROTECT("atof", return 0)
|
2004-06-08 18:52:54 +00:00
|
|
|
c.real = PyOS_ascii_atof(buf);
|
1997-03-14 04:32:50 +00:00
|
|
|
PyFPE_END_PROTECT(c)
|
1996-01-12 01:09:56 +00:00
|
|
|
n = r_byte(p);
|
2004-03-26 15:09:27 +00:00
|
|
|
if (n == EOF || r_string(buf, (int)n, p) != n) {
|
1997-04-29 20:08:16 +00:00
|
|
|
PyErr_SetString(PyExc_EOFError,
|
1996-01-12 01:09:56 +00:00
|
|
|
"EOF read where object expected");
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
buf[n] = '\0';
|
1997-02-14 22:58:07 +00:00
|
|
|
PyFPE_START_PROTECT("atof", return 0)
|
2004-06-08 18:52:54 +00:00
|
|
|
c.imag = PyOS_ascii_atof(buf);
|
1997-03-14 04:32:50 +00:00
|
|
|
PyFPE_END_PROTECT(c)
|
1997-04-29 20:08:16 +00:00
|
|
|
return PyComplex_FromCComplex(c);
|
1996-01-12 01:09:56 +00:00
|
|
|
}
|
2005-06-03 14:41:55 +00:00
|
|
|
|
|
|
|
case TYPE_BINARY_COMPLEX:
|
|
|
|
{
|
2005-06-25 08:23:41 +00:00
|
|
|
unsigned char buf[8];
|
2005-06-03 14:41:55 +00:00
|
|
|
Py_complex c;
|
2005-06-25 08:23:41 +00:00
|
|
|
if (r_string((char*)buf, 8, p) != 8) {
|
2005-06-03 14:41:55 +00:00
|
|
|
PyErr_SetString(PyExc_EOFError,
|
|
|
|
"EOF read where object expected");
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
c.real = _PyFloat_Unpack8(buf, 1);
|
|
|
|
if (c.real == -1.0 && PyErr_Occurred()) {
|
|
|
|
return NULL;
|
|
|
|
}
|
2005-06-25 08:23:41 +00:00
|
|
|
if (r_string((char*)buf, 8, p) != 8) {
|
2005-06-03 14:41:55 +00:00
|
|
|
PyErr_SetString(PyExc_EOFError,
|
|
|
|
"EOF read where object expected");
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
c.imag = _PyFloat_Unpack8(buf, 1);
|
|
|
|
if (c.imag == -1.0 && PyErr_Occurred()) {
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
return PyComplex_FromCComplex(c);
|
|
|
|
}
|
1996-01-12 01:09:56 +00:00
|
|
|
#endif
|
2001-01-28 00:27:39 +00:00
|
|
|
|
2004-06-27 16:51:46 +00:00
|
|
|
case TYPE_INTERNED:
|
1991-06-04 19:42:30 +00:00
|
|
|
case TYPE_STRING:
|
1993-01-21 16:07:51 +00:00
|
|
|
n = r_long(p);
|
1998-06-08 20:27:29 +00:00
|
|
|
if (n < 0) {
|
|
|
|
PyErr_SetString(PyExc_ValueError, "bad marshal data");
|
|
|
|
return NULL;
|
|
|
|
}
|
1997-04-29 20:08:16 +00:00
|
|
|
v = PyString_FromStringAndSize((char *)NULL, n);
|
2005-06-03 15:17:16 +00:00
|
|
|
if (v == NULL)
|
|
|
|
return v;
|
|
|
|
if (r_string(PyString_AS_STRING(v), (int)n, p) != n) {
|
|
|
|
Py_DECREF(v);
|
|
|
|
PyErr_SetString(PyExc_EOFError,
|
1991-06-04 19:42:30 +00:00
|
|
|
"EOF read where object expected");
|
2005-06-03 15:17:16 +00:00
|
|
|
return NULL;
|
1991-06-04 19:42:30 +00:00
|
|
|
}
|
2004-06-27 16:51:46 +00:00
|
|
|
if (type == TYPE_INTERNED) {
|
|
|
|
PyString_InternInPlace(&v);
|
|
|
|
PyList_Append(p->strings, v);
|
|
|
|
}
|
|
|
|
return v;
|
|
|
|
|
|
|
|
case TYPE_STRINGREF:
|
|
|
|
n = r_long(p);
|
2005-06-13 18:28:46 +00:00
|
|
|
if (n < 0 || n >= PyList_GET_SIZE(p->strings)) {
|
|
|
|
PyErr_SetString(PyExc_ValueError, "bad marshal data");
|
|
|
|
return NULL;
|
|
|
|
}
|
2004-06-27 16:51:46 +00:00
|
|
|
v = PyList_GET_ITEM(p->strings, n);
|
|
|
|
Py_INCREF(v);
|
1991-06-04 19:42:30 +00:00
|
|
|
return v;
|
2001-01-28 00:27:39 +00:00
|
|
|
|
2001-08-17 18:39:25 +00:00
|
|
|
#ifdef Py_USING_UNICODE
|
2000-03-10 23:03:02 +00:00
|
|
|
case TYPE_UNICODE:
|
|
|
|
{
|
|
|
|
char *buffer;
|
|
|
|
|
|
|
|
n = r_long(p);
|
|
|
|
if (n < 0) {
|
|
|
|
PyErr_SetString(PyExc_ValueError, "bad marshal data");
|
|
|
|
return NULL;
|
|
|
|
}
|
2000-05-03 23:44:39 +00:00
|
|
|
buffer = PyMem_NEW(char, n);
|
2000-03-10 23:03:02 +00:00
|
|
|
if (buffer == NULL)
|
2000-05-03 23:44:39 +00:00
|
|
|
return PyErr_NoMemory();
|
2000-03-10 23:03:02 +00:00
|
|
|
if (r_string(buffer, (int)n, p) != n) {
|
2000-05-03 23:44:39 +00:00
|
|
|
PyMem_DEL(buffer);
|
2000-03-10 23:03:02 +00:00
|
|
|
PyErr_SetString(PyExc_EOFError,
|
|
|
|
"EOF read where object expected");
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
v = PyUnicode_DecodeUTF8(buffer, n, NULL);
|
2000-05-03 23:44:39 +00:00
|
|
|
PyMem_DEL(buffer);
|
2000-03-10 23:03:02 +00:00
|
|
|
return v;
|
|
|
|
}
|
2001-08-17 18:39:25 +00:00
|
|
|
#endif
|
2001-01-28 00:27:39 +00:00
|
|
|
|
1991-06-04 19:42:30 +00:00
|
|
|
case TYPE_TUPLE:
|
1993-01-21 16:07:51 +00:00
|
|
|
n = r_long(p);
|
1998-06-08 20:27:29 +00:00
|
|
|
if (n < 0) {
|
|
|
|
PyErr_SetString(PyExc_ValueError, "bad marshal data");
|
|
|
|
return NULL;
|
|
|
|
}
|
1997-04-29 20:08:16 +00:00
|
|
|
v = PyTuple_New((int)n);
|
1991-06-04 19:42:30 +00:00
|
|
|
if (v == NULL)
|
|
|
|
return v;
|
1995-10-27 13:21:28 +00:00
|
|
|
for (i = 0; i < n; i++) {
|
|
|
|
v2 = r_object(p);
|
|
|
|
if ( v2 == NULL ) {
|
2004-03-26 15:09:27 +00:00
|
|
|
if (!PyErr_Occurred())
|
|
|
|
PyErr_SetString(PyExc_TypeError,
|
|
|
|
"NULL object in marshal data");
|
1997-04-29 20:08:16 +00:00
|
|
|
Py_DECREF(v);
|
1995-10-27 13:21:28 +00:00
|
|
|
v = NULL;
|
|
|
|
break;
|
|
|
|
}
|
1997-04-29 20:08:16 +00:00
|
|
|
PyTuple_SET_ITEM(v, (int)i, v2);
|
1995-10-27 13:21:28 +00:00
|
|
|
}
|
1991-06-04 19:42:30 +00:00
|
|
|
return v;
|
2001-01-28 00:27:39 +00:00
|
|
|
|
1991-06-04 19:42:30 +00:00
|
|
|
case TYPE_LIST:
|
1993-01-21 16:07:51 +00:00
|
|
|
n = r_long(p);
|
1998-06-08 20:27:29 +00:00
|
|
|
if (n < 0) {
|
|
|
|
PyErr_SetString(PyExc_ValueError, "bad marshal data");
|
|
|
|
return NULL;
|
|
|
|
}
|
1997-04-29 20:08:16 +00:00
|
|
|
v = PyList_New((int)n);
|
1991-06-04 19:42:30 +00:00
|
|
|
if (v == NULL)
|
|
|
|
return v;
|
1995-10-27 13:21:28 +00:00
|
|
|
for (i = 0; i < n; i++) {
|
|
|
|
v2 = r_object(p);
|
|
|
|
if ( v2 == NULL ) {
|
2004-03-26 15:09:27 +00:00
|
|
|
if (!PyErr_Occurred())
|
|
|
|
PyErr_SetString(PyExc_TypeError,
|
|
|
|
"NULL object in marshal data");
|
1997-04-29 20:08:16 +00:00
|
|
|
Py_DECREF(v);
|
1995-10-27 13:21:28 +00:00
|
|
|
v = NULL;
|
|
|
|
break;
|
|
|
|
}
|
1997-04-29 20:08:16 +00:00
|
|
|
PyList_SetItem(v, (int)i, v2);
|
1995-10-27 13:21:28 +00:00
|
|
|
}
|
1991-06-04 19:42:30 +00:00
|
|
|
return v;
|
2001-01-28 00:27:39 +00:00
|
|
|
|
1991-06-07 13:58:22 +00:00
|
|
|
case TYPE_DICT:
|
1997-04-29 20:08:16 +00:00
|
|
|
v = PyDict_New();
|
1991-06-07 13:58:22 +00:00
|
|
|
if (v == NULL)
|
|
|
|
return NULL;
|
|
|
|
for (;;) {
|
1997-04-29 20:08:16 +00:00
|
|
|
PyObject *key, *val;
|
1993-01-21 16:07:51 +00:00
|
|
|
key = r_object(p);
|
1991-06-07 13:58:22 +00:00
|
|
|
if (key == NULL)
|
2004-03-26 15:09:27 +00:00
|
|
|
break;
|
1993-01-21 16:07:51 +00:00
|
|
|
val = r_object(p);
|
1996-06-26 20:41:23 +00:00
|
|
|
if (val != NULL)
|
1997-04-29 20:08:16 +00:00
|
|
|
PyDict_SetItem(v, key, val);
|
|
|
|
Py_DECREF(key);
|
|
|
|
Py_XDECREF(val);
|
1991-06-07 13:58:22 +00:00
|
|
|
}
|
2004-03-26 15:09:27 +00:00
|
|
|
if (PyErr_Occurred()) {
|
|
|
|
Py_DECREF(v);
|
|
|
|
v = NULL;
|
|
|
|
}
|
1991-06-07 13:58:22 +00:00
|
|
|
return v;
|
2001-01-28 00:27:39 +00:00
|
|
|
|
2005-01-11 03:03:27 +00:00
|
|
|
case TYPE_SET:
|
|
|
|
case TYPE_FROZENSET:
|
|
|
|
n = r_long(p);
|
|
|
|
if (n < 0) {
|
|
|
|
PyErr_SetString(PyExc_ValueError, "bad marshal data");
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
v = PyTuple_New((int)n);
|
|
|
|
if (v == NULL)
|
|
|
|
return v;
|
|
|
|
for (i = 0; i < n; i++) {
|
|
|
|
v2 = r_object(p);
|
|
|
|
if ( v2 == NULL ) {
|
|
|
|
if (!PyErr_Occurred())
|
|
|
|
PyErr_SetString(PyExc_TypeError,
|
|
|
|
"NULL object in marshal data");
|
|
|
|
Py_DECREF(v);
|
|
|
|
v = NULL;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
PyTuple_SET_ITEM(v, (int)i, v2);
|
|
|
|
}
|
2005-06-03 15:17:16 +00:00
|
|
|
if (v == NULL)
|
|
|
|
return v;
|
2005-01-11 03:03:27 +00:00
|
|
|
if (type == TYPE_SET)
|
2005-08-16 03:47:52 +00:00
|
|
|
v3 = PySet_New(v);
|
2005-01-11 03:03:27 +00:00
|
|
|
else
|
2005-08-16 03:47:52 +00:00
|
|
|
v3 = PyFrozenSet_New(v);
|
2005-01-11 03:03:27 +00:00
|
|
|
Py_DECREF(v);
|
|
|
|
return v3;
|
|
|
|
|
1991-06-04 19:42:30 +00:00
|
|
|
case TYPE_CODE:
|
2001-08-30 14:50:20 +00:00
|
|
|
if (PyEval_GetRestricted()) {
|
|
|
|
PyErr_SetString(PyExc_RuntimeError,
|
|
|
|
"cannot unmarshal code objects in "
|
|
|
|
"restricted execution mode");
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
else {
|
2005-06-03 14:41:55 +00:00
|
|
|
int argcount;
|
2006-10-27 23:31:49 +00:00
|
|
|
int kwonlyargcount;
|
2005-06-03 14:41:55 +00:00
|
|
|
int nlocals;
|
|
|
|
int stacksize;
|
|
|
|
int flags;
|
|
|
|
PyObject *code = NULL;
|
|
|
|
PyObject *consts = NULL;
|
|
|
|
PyObject *names = NULL;
|
|
|
|
PyObject *varnames = NULL;
|
|
|
|
PyObject *freevars = NULL;
|
|
|
|
PyObject *cellvars = NULL;
|
|
|
|
PyObject *filename = NULL;
|
|
|
|
PyObject *name = NULL;
|
|
|
|
int firstlineno;
|
|
|
|
PyObject *lnotab = NULL;
|
|
|
|
|
|
|
|
v = NULL;
|
|
|
|
|
|
|
|
argcount = r_long(p);
|
2006-10-27 23:31:49 +00:00
|
|
|
kwonlyargcount = r_long(p);
|
2005-06-03 14:41:55 +00:00
|
|
|
nlocals = r_long(p);
|
|
|
|
stacksize = r_long(p);
|
|
|
|
flags = r_long(p);
|
|
|
|
code = r_object(p);
|
|
|
|
if (code == NULL)
|
|
|
|
goto code_error;
|
|
|
|
consts = r_object(p);
|
|
|
|
if (consts == NULL)
|
|
|
|
goto code_error;
|
|
|
|
names = r_object(p);
|
|
|
|
if (names == NULL)
|
|
|
|
goto code_error;
|
|
|
|
varnames = r_object(p);
|
|
|
|
if (varnames == NULL)
|
|
|
|
goto code_error;
|
|
|
|
freevars = r_object(p);
|
|
|
|
if (freevars == NULL)
|
|
|
|
goto code_error;
|
|
|
|
cellvars = r_object(p);
|
|
|
|
if (cellvars == NULL)
|
|
|
|
goto code_error;
|
|
|
|
filename = r_object(p);
|
|
|
|
if (filename == NULL)
|
|
|
|
goto code_error;
|
|
|
|
name = r_object(p);
|
|
|
|
if (name == NULL)
|
|
|
|
goto code_error;
|
|
|
|
firstlineno = r_long(p);
|
|
|
|
lnotab = r_object(p);
|
|
|
|
if (lnotab == NULL)
|
|
|
|
goto code_error;
|
|
|
|
|
|
|
|
v = (PyObject *) PyCode_New(
|
2006-10-27 23:31:49 +00:00
|
|
|
argcount, kwonlyargcount,
|
|
|
|
nlocals, stacksize, flags,
|
1995-07-18 14:51:37 +00:00
|
|
|
code, consts, names, varnames,
|
2001-01-28 00:27:39 +00:00
|
|
|
freevars, cellvars, filename, name,
|
|
|
|
firstlineno, lnotab);
|
2005-06-03 14:41:55 +00:00
|
|
|
|
|
|
|
code_error:
|
1997-04-29 20:08:16 +00:00
|
|
|
Py_XDECREF(code);
|
|
|
|
Py_XDECREF(consts);
|
|
|
|
Py_XDECREF(names);
|
|
|
|
Py_XDECREF(varnames);
|
PEP 227 implementation
The majority of the changes are in the compiler. The mainloop changes
primarily to implement the new opcodes and to pass a function's
closure to eval_code2(). Frames and functions got new slots to hold
the closure.
Include/compile.h
Add co_freevars and co_cellvars slots to code objects.
Update PyCode_New() to take freevars and cellvars as arguments
Include/funcobject.h
Add func_closure slot to function objects.
Add GetClosure()/SetClosure() functions (and corresponding
macros) for getting at the closure.
Include/frameobject.h
PyFrame_New() now takes a closure.
Include/opcode.h
Add four new opcodes: MAKE_CLOSURE, LOAD_CLOSURE, LOAD_DEREF,
STORE_DEREF.
Remove comment about old requirement for opcodes to fit in 7
bits.
compile.c
Implement changes to code objects for co_freevars and co_cellvars.
Modify symbol table to use st_cur_name (string object for the name
of the current scope) and st_cur_children (list of nested blocks).
Also define st_nested, which might more properly be called
st_cur_nested. Add several DEF_XXX flags to track def-use
information for free variables.
New or modified functions of note:
com_make_closure(struct compiling *, PyCodeObject *)
Emit LOAD_CLOSURE opcodes as needed to pass cells for free
variables into nested scope.
com_addop_varname(struct compiling *, int, char *)
Emits opcodes for LOAD_DEREF and STORE_DEREF.
get_ref_type(struct compiling *, char *name)
Return NAME_CLOSURE if ref type is FREE or CELL
symtable_load_symbols(struct compiling *)
Decides what variables are cell or free based on def-use info.
Can now raise SyntaxError if nested scopes are mixed with
exec or from blah import *.
make_scope_info(PyObject *, PyObject *, int, int)
Helper functions for symtable scope stack.
symtable_update_free_vars(struct symtable *)
After a code block has been analyzed, it must check each of
its children for free variables that are not defined in the
block. If a variable is free in a child and not defined in
the parent, then it is defined by block the enclosing the
current one or it is a global. This does the right logic.
symtable_add_use() is now a macro for symtable_add_def()
symtable_assign(struct symtable *, node *)
Use goto instead of for (;;)
Fixed bug in symtable where name of keyword argument in function
call was treated as assignment in the scope of the call site. Ex:
def f():
g(a=2) # a was considered a local of f
ceval.c
eval_code2() now take one more argument, a closure.
Implement LOAD_CLOSURE, LOAD_DEREF, STORE_DEREF, MAKE_CLOSURE>
Also: When name error occurs for global variable, report that the
name was global in the error mesage.
Objects/frameobject.c
Initialize f_closure to be a tuple containing space for cellvars
and freevars. f_closure is NULL if neither are present.
Objects/funcobject.c
Add support for func_closure.
Python/import.c
Change the magic number.
Python/marshal.c
Track changes to code objects.
2001-01-25 20:06:59 +00:00
|
|
|
Py_XDECREF(freevars);
|
|
|
|
Py_XDECREF(cellvars);
|
1997-04-29 20:08:16 +00:00
|
|
|
Py_XDECREF(filename);
|
|
|
|
Py_XDECREF(name);
|
1997-07-26 23:30:18 +00:00
|
|
|
Py_XDECREF(lnotab);
|
1991-06-04 19:42:30 +00:00
|
|
|
|
|
|
|
}
|
|
|
|
return v;
|
2001-01-28 00:27:39 +00:00
|
|
|
|
1991-06-04 19:42:30 +00:00
|
|
|
default:
|
1996-06-26 20:41:23 +00:00
|
|
|
/* Bogus data got written, which isn't ideal.
|
|
|
|
This will let you keep working and recover. */
|
1998-06-08 20:27:29 +00:00
|
|
|
PyErr_SetString(PyExc_ValueError, "bad marshal data");
|
|
|
|
return NULL;
|
2001-01-28 00:27:39 +00:00
|
|
|
|
1991-06-04 19:42:30 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2004-06-13 20:31:49 +00:00
|
|
|
static PyObject *
|
2004-03-26 15:09:27 +00:00
|
|
|
read_object(RFILE *p)
|
|
|
|
{
|
|
|
|
PyObject *v;
|
|
|
|
if (PyErr_Occurred()) {
|
|
|
|
fprintf(stderr, "XXX readobject called with exception set\n");
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
v = r_object(p);
|
|
|
|
if (v == NULL && !PyErr_Occurred())
|
|
|
|
PyErr_SetString(PyExc_TypeError, "NULL object in marshal data");
|
|
|
|
return v;
|
|
|
|
}
|
|
|
|
|
2001-10-19 01:46:21 +00:00
|
|
|
int
|
|
|
|
PyMarshal_ReadShortFromFile(FILE *fp)
|
|
|
|
{
|
|
|
|
RFILE rf;
|
2006-03-01 22:30:47 +00:00
|
|
|
assert(fp);
|
2001-10-19 01:46:21 +00:00
|
|
|
rf.fp = fp;
|
2006-03-01 22:34:09 +00:00
|
|
|
rf.strings = NULL;
|
|
|
|
rf.end = rf.ptr = NULL;
|
2001-10-19 01:46:21 +00:00
|
|
|
return r_short(&rf);
|
|
|
|
}
|
|
|
|
|
1993-01-21 16:07:51 +00:00
|
|
|
long
|
2000-07-22 18:47:25 +00:00
|
|
|
PyMarshal_ReadLongFromFile(FILE *fp)
|
1993-01-21 16:07:51 +00:00
|
|
|
{
|
|
|
|
RFILE rf;
|
|
|
|
rf.fp = fp;
|
2004-06-27 16:51:46 +00:00
|
|
|
rf.strings = NULL;
|
1993-01-21 16:07:51 +00:00
|
|
|
return r_long(&rf);
|
|
|
|
}
|
|
|
|
|
2001-01-18 04:39:16 +00:00
|
|
|
#ifdef HAVE_FSTAT
|
|
|
|
/* Return size of file in bytes; < 0 if unknown. */
|
|
|
|
static off_t
|
|
|
|
getfilesize(FILE *fp)
|
|
|
|
{
|
|
|
|
struct stat st;
|
|
|
|
if (fstat(fileno(fp), &st) != 0)
|
|
|
|
return -1;
|
|
|
|
else
|
|
|
|
return st.st_size;
|
|
|
|
}
|
|
|
|
#endif
|
2001-01-28 00:27:39 +00:00
|
|
|
|
2001-01-18 04:39:16 +00:00
|
|
|
/* If we can get the size of the file up-front, and it's reasonably small,
|
|
|
|
* read it in one gulp and delegate to ...FromString() instead. Much quicker
|
|
|
|
* than reading a byte at a time from file; speeds .pyc imports.
|
2001-01-28 00:27:39 +00:00
|
|
|
* CAUTION: since this may read the entire remainder of the file, don't
|
|
|
|
* call it unless you know you're done with the file.
|
2001-01-18 04:39:16 +00:00
|
|
|
*/
|
1997-04-29 20:08:16 +00:00
|
|
|
PyObject *
|
2001-01-28 00:27:39 +00:00
|
|
|
PyMarshal_ReadLastObjectFromFile(FILE *fp)
|
1993-01-21 16:07:51 +00:00
|
|
|
{
|
2001-01-18 04:39:16 +00:00
|
|
|
/* 75% of 2.1's .pyc files can exploit SMALL_FILE_LIMIT.
|
|
|
|
* REASONABLE_FILE_LIMIT is by defn something big enough for Tkinter.pyc.
|
|
|
|
*/
|
|
|
|
#define SMALL_FILE_LIMIT (1L << 14)
|
|
|
|
#define REASONABLE_FILE_LIMIT (1L << 18)
|
|
|
|
#ifdef HAVE_FSTAT
|
|
|
|
off_t filesize;
|
|
|
|
#endif
|
|
|
|
#ifdef HAVE_FSTAT
|
|
|
|
filesize = getfilesize(fp);
|
|
|
|
if (filesize > 0) {
|
|
|
|
char buf[SMALL_FILE_LIMIT];
|
|
|
|
char* pBuf = NULL;
|
|
|
|
if (filesize <= SMALL_FILE_LIMIT)
|
|
|
|
pBuf = buf;
|
|
|
|
else if (filesize <= REASONABLE_FILE_LIMIT)
|
|
|
|
pBuf = (char *)PyMem_MALLOC(filesize);
|
|
|
|
if (pBuf != NULL) {
|
|
|
|
PyObject* v;
|
2006-02-15 17:27:45 +00:00
|
|
|
size_t n;
|
|
|
|
/* filesize must fit into an int, because it
|
|
|
|
is smaller than REASONABLE_FILE_LIMIT */
|
|
|
|
n = fread(pBuf, 1, (int)filesize, fp);
|
2001-01-18 04:39:16 +00:00
|
|
|
v = PyMarshal_ReadObjectFromString(pBuf, n);
|
|
|
|
if (pBuf != buf)
|
|
|
|
PyMem_FREE(pBuf);
|
|
|
|
return v;
|
|
|
|
}
|
2001-01-28 00:27:39 +00:00
|
|
|
|
2001-01-18 04:39:16 +00:00
|
|
|
}
|
|
|
|
#endif
|
2001-01-28 00:27:39 +00:00
|
|
|
/* We don't have fstat, or we do but the file is larger than
|
|
|
|
* REASONABLE_FILE_LIMIT or malloc failed -- read a byte at a time.
|
|
|
|
*/
|
|
|
|
return PyMarshal_ReadObjectFromFile(fp);
|
|
|
|
|
2001-01-18 04:39:16 +00:00
|
|
|
#undef SMALL_FILE_LIMIT
|
|
|
|
#undef REASONABLE_FILE_LIMIT
|
1993-01-21 16:07:51 +00:00
|
|
|
}
|
|
|
|
|
2001-01-28 00:27:39 +00:00
|
|
|
PyObject *
|
|
|
|
PyMarshal_ReadObjectFromFile(FILE *fp)
|
|
|
|
{
|
|
|
|
RFILE rf;
|
2004-06-27 16:51:46 +00:00
|
|
|
PyObject *result;
|
2001-01-28 00:27:39 +00:00
|
|
|
rf.fp = fp;
|
2004-06-27 16:51:46 +00:00
|
|
|
rf.strings = PyList_New(0);
|
|
|
|
result = r_object(&rf);
|
|
|
|
Py_DECREF(rf.strings);
|
|
|
|
return result;
|
2001-01-28 00:27:39 +00:00
|
|
|
}
|
|
|
|
|
1997-04-29 20:08:16 +00:00
|
|
|
PyObject *
|
2006-02-15 17:27:45 +00:00
|
|
|
PyMarshal_ReadObjectFromString(char *str, Py_ssize_t len)
|
1993-04-01 20:59:32 +00:00
|
|
|
{
|
|
|
|
RFILE rf;
|
2004-06-27 16:51:46 +00:00
|
|
|
PyObject *result;
|
1993-04-01 20:59:32 +00:00
|
|
|
rf.fp = NULL;
|
|
|
|
rf.ptr = str;
|
|
|
|
rf.end = str + len;
|
2004-06-27 16:51:46 +00:00
|
|
|
rf.strings = PyList_New(0);
|
|
|
|
result = r_object(&rf);
|
|
|
|
Py_DECREF(rf.strings);
|
|
|
|
return result;
|
1993-04-01 20:59:32 +00:00
|
|
|
}
|
|
|
|
|
1997-04-29 20:08:16 +00:00
|
|
|
PyObject *
|
2004-06-27 16:51:46 +00:00
|
|
|
PyMarshal_WriteObjectToString(PyObject *x, int version)
|
1996-08-19 22:07:17 +00:00
|
|
|
{
|
|
|
|
WFILE wf;
|
|
|
|
wf.fp = NULL;
|
1997-04-29 20:08:16 +00:00
|
|
|
wf.str = PyString_FromStringAndSize((char *)NULL, 50);
|
1996-08-19 22:07:17 +00:00
|
|
|
if (wf.str == NULL)
|
|
|
|
return NULL;
|
1997-04-29 20:08:16 +00:00
|
|
|
wf.ptr = PyString_AS_STRING((PyStringObject *)wf.str);
|
|
|
|
wf.end = wf.ptr + PyString_Size(wf.str);
|
1996-08-19 22:07:17 +00:00
|
|
|
wf.error = 0;
|
2000-06-28 18:47:56 +00:00
|
|
|
wf.depth = 0;
|
2005-06-03 14:41:55 +00:00
|
|
|
wf.version = version;
|
2004-06-27 16:51:46 +00:00
|
|
|
wf.strings = (version > 0) ? PyDict_New() : NULL;
|
1996-08-19 22:07:17 +00:00
|
|
|
w_object(x, &wf);
|
2004-06-27 16:51:46 +00:00
|
|
|
Py_XDECREF(wf.strings);
|
1996-08-19 22:07:17 +00:00
|
|
|
if (wf.str != NULL)
|
1997-04-29 20:08:16 +00:00
|
|
|
_PyString_Resize(&wf.str,
|
|
|
|
(int) (wf.ptr -
|
|
|
|
PyString_AS_STRING((PyStringObject *)wf.str)));
|
1996-08-19 22:07:17 +00:00
|
|
|
if (wf.error) {
|
1997-04-29 20:08:16 +00:00
|
|
|
Py_XDECREF(wf.str);
|
2001-01-28 00:27:39 +00:00
|
|
|
PyErr_SetString(PyExc_ValueError,
|
2000-06-28 18:47:56 +00:00
|
|
|
(wf.error==1)?"unmarshallable object"
|
|
|
|
:"object too deeply nested to marshal");
|
1996-08-19 22:07:17 +00:00
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
return wf.str;
|
|
|
|
}
|
|
|
|
|
1991-06-07 13:58:22 +00:00
|
|
|
/* And an interface for Python programs... */
|
1991-06-04 19:42:30 +00:00
|
|
|
|
1997-04-29 20:08:16 +00:00
|
|
|
static PyObject *
|
2000-07-22 18:47:25 +00:00
|
|
|
marshal_dump(PyObject *self, PyObject *args)
|
1991-06-04 19:42:30 +00:00
|
|
|
{
|
1993-01-21 16:07:51 +00:00
|
|
|
WFILE wf;
|
1997-04-29 20:08:16 +00:00
|
|
|
PyObject *x;
|
|
|
|
PyObject *f;
|
2004-06-27 16:51:46 +00:00
|
|
|
int version = Py_MARSHAL_VERSION;
|
|
|
|
if (!PyArg_ParseTuple(args, "OO|i:dump", &x, &f, &version))
|
1991-06-04 19:42:30 +00:00
|
|
|
return NULL;
|
1997-04-29 20:08:16 +00:00
|
|
|
if (!PyFile_Check(f)) {
|
|
|
|
PyErr_SetString(PyExc_TypeError,
|
|
|
|
"marshal.dump() 2nd arg must be file");
|
1991-06-04 19:42:30 +00:00
|
|
|
return NULL;
|
|
|
|
}
|
1997-04-29 20:08:16 +00:00
|
|
|
wf.fp = PyFile_AsFile(f);
|
1993-01-21 16:07:51 +00:00
|
|
|
wf.str = NULL;
|
|
|
|
wf.ptr = wf.end = NULL;
|
1996-06-26 20:41:23 +00:00
|
|
|
wf.error = 0;
|
2000-06-28 18:47:56 +00:00
|
|
|
wf.depth = 0;
|
2004-06-27 16:51:46 +00:00
|
|
|
wf.strings = (version > 0) ? PyDict_New() : 0;
|
2005-11-16 05:04:51 +00:00
|
|
|
wf.version = version;
|
1993-01-21 16:07:51 +00:00
|
|
|
w_object(x, &wf);
|
2004-06-27 16:51:46 +00:00
|
|
|
Py_XDECREF(wf.strings);
|
1996-06-26 20:41:23 +00:00
|
|
|
if (wf.error) {
|
2001-01-28 00:27:39 +00:00
|
|
|
PyErr_SetString(PyExc_ValueError,
|
2000-06-28 18:47:56 +00:00
|
|
|
(wf.error==1)?"unmarshallable object"
|
|
|
|
:"object too deeply nested to marshal");
|
1996-06-26 20:41:23 +00:00
|
|
|
return NULL;
|
|
|
|
}
|
1997-04-29 20:08:16 +00:00
|
|
|
Py_INCREF(Py_None);
|
|
|
|
return Py_None;
|
1991-06-04 19:42:30 +00:00
|
|
|
}
|
|
|
|
|
1997-04-29 20:08:16 +00:00
|
|
|
static PyObject *
|
Partially merge trunk into p3yk. The removal of Mac/Tools is confusing svn
merge in bad ways, so I'll have to merge that extra-carefully (probably manually.)
Merged revisions 46495-46605 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r46495 | tim.peters | 2006-05-28 03:52:38 +0200 (Sun, 28 May 2006) | 2 lines
Added missing svn:eol-style property to text files.
........
r46497 | tim.peters | 2006-05-28 12:41:29 +0200 (Sun, 28 May 2006) | 3 lines
PyErr_Display(), PyErr_WriteUnraisable(): Coverity found a cut-and-paste
bug in both: `className` was referenced before being checked for NULL.
........
r46499 | fredrik.lundh | 2006-05-28 14:06:46 +0200 (Sun, 28 May 2006) | 5 lines
needforspeed: added Py_MEMCPY macro (currently tuned for Visual C only),
and use it for string copy operations. this gives a 20% speedup on some
string benchmarks.
........
r46501 | michael.hudson | 2006-05-28 17:51:40 +0200 (Sun, 28 May 2006) | 26 lines
Quality control, meet exceptions.c.
Fix a number of problems with the need for speed code:
One is doing this sort of thing:
Py_DECREF(self->field);
self->field = newval;
Py_INCREF(self->field);
without being very sure that self->field doesn't start with a
value that has a __del__, because that almost certainly can lead
to segfaults.
As self->args is constrained to be an exact tuple we may as well
exploit this fact consistently. This leads to quite a lot of
simplification (and, hey, probably better performance).
Add some error checking in places lacking it.
Fix some rather strange indentation in the Unicode code.
Delete some trailing whitespace.
More to come, I haven't fixed all the reference leaks yet...
........
r46502 | george.yoshida | 2006-05-28 18:39:09 +0200 (Sun, 28 May 2006) | 3 lines
Patch #1080727: add "encoding" parameter to doctest.DocFileSuite
Contributed by Bjorn Tillenius.
........
r46503 | martin.v.loewis | 2006-05-28 18:57:38 +0200 (Sun, 28 May 2006) | 4 lines
Rest of patch #1490384: Commit icon source, remove
claim that Erik von Blokland is the author of the
installer picture.
........
r46504 | michael.hudson | 2006-05-28 19:40:29 +0200 (Sun, 28 May 2006) | 16 lines
Quality control, meet exceptions.c, round two.
Make some functions that should have been static static.
Fix a bunch of refleaks by fixing the definition of
MiddlingExtendsException.
Remove all the __new__ implementations apart from
BaseException_new. Rewrite most code that needs it to cope with
NULL fields (such code could get excercised anyway, the
__new__-removal just makes it more likely). This involved
editing the code for WindowsError, which I can't test.
This fixes all the refleaks in at least the start of a regrtest
-R :: run.
........
r46505 | marc-andre.lemburg | 2006-05-28 19:46:58 +0200 (Sun, 28 May 2006) | 10 lines
Initial version of systimes - a module to provide platform dependent
performance measurements.
The module is currently just a proof-of-concept implementation, but
will integrated into pybench once it is stable enough.
License: pybench license.
Author: Marc-Andre Lemburg.
........
r46507 | armin.rigo | 2006-05-28 21:13:17 +0200 (Sun, 28 May 2006) | 15 lines
("Forward-port" of r46506)
Remove various dependencies on dictionary order in the standard library
tests, and one (clearly an oversight, potentially critical) in the
standard library itself - base64.py.
Remaining open issues:
* test_extcall is an output test, messy to make robust
* tarfile.py has a potential bug here, but I'm not familiar
enough with this code. Filed in as SF bug #1496501.
* urllib2.HTTPPasswordMgr() returns a random result if there is more
than one matching root path. I'm asking python-dev for
clarification...
........
r46508 | georg.brandl | 2006-05-28 22:11:45 +0200 (Sun, 28 May 2006) | 4 lines
The empty string is a valid import path.
(fixes #1496539)
........
r46509 | georg.brandl | 2006-05-28 22:23:12 +0200 (Sun, 28 May 2006) | 3 lines
Patch #1496206: urllib2 PasswordMgr ./. default ports
........
r46510 | georg.brandl | 2006-05-28 22:57:09 +0200 (Sun, 28 May 2006) | 3 lines
Fix refleaks in UnicodeError get and set methods.
........
r46511 | michael.hudson | 2006-05-28 23:19:03 +0200 (Sun, 28 May 2006) | 3 lines
use the UnicodeError traversal and clearing functions in UnicodeError
subclasses.
........
r46512 | thomas.wouters | 2006-05-28 23:32:12 +0200 (Sun, 28 May 2006) | 4 lines
Make last patch valid C89 so Windows compilers can deal with it.
........
r46513 | georg.brandl | 2006-05-28 23:42:54 +0200 (Sun, 28 May 2006) | 3 lines
Fix ref-antileak in _struct.c which eventually lead to deallocating None.
........
r46514 | georg.brandl | 2006-05-28 23:57:35 +0200 (Sun, 28 May 2006) | 4 lines
Correct None refcount issue in Mac modules. (Are they
still used?)
........
r46515 | armin.rigo | 2006-05-29 00:07:08 +0200 (Mon, 29 May 2006) | 3 lines
A clearer error message when passing -R to regrtest.py with
release builds of Python.
........
r46516 | georg.brandl | 2006-05-29 00:14:04 +0200 (Mon, 29 May 2006) | 3 lines
Fix C function calling conventions in _sre module.
........
r46517 | georg.brandl | 2006-05-29 00:34:51 +0200 (Mon, 29 May 2006) | 3 lines
Convert audioop over to METH_VARARGS.
........
r46518 | georg.brandl | 2006-05-29 00:38:57 +0200 (Mon, 29 May 2006) | 3 lines
METH_NOARGS functions do get called with two args.
........
r46519 | georg.brandl | 2006-05-29 11:46:51 +0200 (Mon, 29 May 2006) | 4 lines
Fix refleak in socketmodule. Replace bogus Py_BuildValue calls.
Fix refleak in exceptions.
........
r46520 | nick.coghlan | 2006-05-29 14:43:05 +0200 (Mon, 29 May 2006) | 7 lines
Apply modified version of Collin Winter's patch #1478788
Renames functional extension module to _functools and adds a Python
functools module so that utility functions like update_wrapper can be
added easily.
........
r46522 | georg.brandl | 2006-05-29 15:53:16 +0200 (Mon, 29 May 2006) | 3 lines
Convert fmmodule to METH_VARARGS.
........
r46523 | georg.brandl | 2006-05-29 16:13:21 +0200 (Mon, 29 May 2006) | 3 lines
Fix #1494605.
........
r46524 | georg.brandl | 2006-05-29 16:28:05 +0200 (Mon, 29 May 2006) | 3 lines
Handle PyMem_Malloc failure in pystrtod.c. Closes #1494671.
........
r46525 | georg.brandl | 2006-05-29 16:33:55 +0200 (Mon, 29 May 2006) | 3 lines
Fix compiler warning.
........
r46526 | georg.brandl | 2006-05-29 16:39:00 +0200 (Mon, 29 May 2006) | 3 lines
Fix #1494787 (pyclbr counts whitespace as superclass name)
........
r46527 | bob.ippolito | 2006-05-29 17:47:29 +0200 (Mon, 29 May 2006) | 1 line
simplify the struct code a bit (no functional changes)
........
r46528 | armin.rigo | 2006-05-29 19:59:47 +0200 (Mon, 29 May 2006) | 2 lines
Silence a warning.
........
r46529 | georg.brandl | 2006-05-29 21:39:45 +0200 (Mon, 29 May 2006) | 3 lines
Correct some value converting strangenesses.
........
r46530 | nick.coghlan | 2006-05-29 22:27:44 +0200 (Mon, 29 May 2006) | 1 line
When adding a module like functools, it helps to let SVN know about the file.
........
r46531 | georg.brandl | 2006-05-29 22:52:54 +0200 (Mon, 29 May 2006) | 4 lines
Patches #1497027 and #972322: try HTTP digest auth first,
and watch out for handler name collisions.
........
r46532 | georg.brandl | 2006-05-29 22:57:01 +0200 (Mon, 29 May 2006) | 3 lines
Add News entry for last commit.
........
r46533 | georg.brandl | 2006-05-29 23:04:52 +0200 (Mon, 29 May 2006) | 4 lines
Make use of METH_O and METH_NOARGS where possible.
Use Py_UnpackTuple instead of PyArg_ParseTuple where possible.
........
r46534 | georg.brandl | 2006-05-29 23:58:42 +0200 (Mon, 29 May 2006) | 3 lines
Convert more modules to METH_VARARGS.
........
r46535 | georg.brandl | 2006-05-30 00:00:30 +0200 (Tue, 30 May 2006) | 3 lines
Whoops.
........
r46536 | fredrik.lundh | 2006-05-30 00:42:07 +0200 (Tue, 30 May 2006) | 4 lines
fixed "abc".count("", 100) == -96 error (hopefully, nobody's relying on
the current behaviour ;-)
........
r46537 | bob.ippolito | 2006-05-30 00:55:48 +0200 (Tue, 30 May 2006) | 1 line
struct: modulo math plus warning on all endian-explicit formats for compatibility with older struct usage (ugly)
........
r46539 | bob.ippolito | 2006-05-30 02:26:01 +0200 (Tue, 30 May 2006) | 1 line
Add a length check to aifc to ensure it doesn't write a bogus file
........
r46540 | tim.peters | 2006-05-30 04:25:25 +0200 (Tue, 30 May 2006) | 10 lines
deprecated_err(): Stop bizarre warning messages when the tests
are run in the order:
test_genexps (or any other doctest-based test)
test_struct
test_doctest
The `warnings` module needs an advertised way to save/restore
its internal filter list.
........
r46541 | tim.peters | 2006-05-30 04:26:46 +0200 (Tue, 30 May 2006) | 2 lines
Whitespace normalization.
........
r46542 | tim.peters | 2006-05-30 04:30:30 +0200 (Tue, 30 May 2006) | 2 lines
Set a binary svn:mime-type property on this UTF-8 encoded file.
........
r46543 | neal.norwitz | 2006-05-30 05:18:50 +0200 (Tue, 30 May 2006) | 1 line
Simplify further by using AddStringConstant
........
r46544 | tim.peters | 2006-05-30 06:16:25 +0200 (Tue, 30 May 2006) | 6 lines
Convert relevant dict internals to Py_ssize_t.
I don't have a box with nearly enough RAM, or an OS,
that could get close to tickling this, though (requires
a dict w/ at least 2**31 entries).
........
r46545 | neal.norwitz | 2006-05-30 06:19:21 +0200 (Tue, 30 May 2006) | 1 line
Remove stray | in comment
........
r46546 | neal.norwitz | 2006-05-30 06:25:05 +0200 (Tue, 30 May 2006) | 1 line
Use Py_SAFE_DOWNCAST for safety. Fix format strings. Remove 2 more stray | in comment
........
r46547 | neal.norwitz | 2006-05-30 06:43:23 +0200 (Tue, 30 May 2006) | 1 line
No DOWNCAST is required since sizeof(Py_ssize_t) >= sizeof(int) and Py_ReprEntr returns an int
........
r46548 | tim.peters | 2006-05-30 07:04:59 +0200 (Tue, 30 May 2006) | 3 lines
dict_print(): Explicitly narrow the return value
from a (possibly) wider variable.
........
r46549 | tim.peters | 2006-05-30 07:23:59 +0200 (Tue, 30 May 2006) | 5 lines
dict_print(): So that Neal & I don't spend the rest of
our lives taking turns rewriting code that works ;-),
get rid of casting illusions by declaring a new variable
with the obvious type.
........
r46550 | georg.brandl | 2006-05-30 09:04:55 +0200 (Tue, 30 May 2006) | 3 lines
Restore exception pickle support. #1497319.
........
r46551 | georg.brandl | 2006-05-30 09:13:29 +0200 (Tue, 30 May 2006) | 3 lines
Add a test case for exception pickling. args is never NULL.
........
r46552 | neal.norwitz | 2006-05-30 09:21:10 +0200 (Tue, 30 May 2006) | 1 line
Don't fail if the (sub)pkgname already exist.
........
r46553 | georg.brandl | 2006-05-30 09:34:45 +0200 (Tue, 30 May 2006) | 3 lines
Disallow keyword args for exceptions.
........
r46554 | neal.norwitz | 2006-05-30 09:36:54 +0200 (Tue, 30 May 2006) | 5 lines
I'm impatient. I think this will fix a few more problems with the buildbots.
I'm not sure this is the best approach, but I can't think of anything better.
If this creates problems, feel free to revert, but I think it's safe and
should make things a little better.
........
r46555 | georg.brandl | 2006-05-30 10:17:00 +0200 (Tue, 30 May 2006) | 4 lines
Do the check for no keyword arguments in __init__ so that
subclasses of Exception can be supplied keyword args
........
r46556 | georg.brandl | 2006-05-30 10:47:19 +0200 (Tue, 30 May 2006) | 3 lines
Convert test_exceptions to unittest.
........
r46557 | andrew.kuchling | 2006-05-30 14:52:01 +0200 (Tue, 30 May 2006) | 1 line
Add SoC name, and reorganize this section a bit
........
r46559 | tim.peters | 2006-05-30 17:53:34 +0200 (Tue, 30 May 2006) | 11 lines
PyLong_FromString(): Continued fraction analysis (explained in
a new comment) suggests there are almost certainly large input
integers in all non-binary input bases for which one Python digit
too few is initally allocated to hold the final result. Instead
of assert-failing when that happens, allocate more space. Alas,
I estimate it would take a few days to find a specific such case,
so this isn't backed up by a new test (not to mention that such
a case may take hours to run, since conversion time is quadratic
in the number of digits, and preliminary attempts suggested that
the smallest such inputs contain at least a million digits).
........
r46560 | fredrik.lundh | 2006-05-30 19:11:48 +0200 (Tue, 30 May 2006) | 3 lines
changed find/rfind to return -1 for matches outside the source string
........
r46561 | bob.ippolito | 2006-05-30 19:37:54 +0200 (Tue, 30 May 2006) | 1 line
Change wrapping terminology to overflow masking
........
r46562 | fredrik.lundh | 2006-05-30 19:39:58 +0200 (Tue, 30 May 2006) | 3 lines
changed count to return 0 for slices outside the source string
........
r46568 | tim.peters | 2006-05-31 01:28:02 +0200 (Wed, 31 May 2006) | 2 lines
Whitespace normalization.
........
r46569 | brett.cannon | 2006-05-31 04:19:54 +0200 (Wed, 31 May 2006) | 5 lines
Clarify wording on default values for strptime(); defaults are used when better
values cannot be inferred.
Closes bug #1496315.
........
r46572 | neal.norwitz | 2006-05-31 09:43:27 +0200 (Wed, 31 May 2006) | 1 line
Calculate smallest properly (it was off by one) and use proper ssize_t types for Win64
........
r46573 | neal.norwitz | 2006-05-31 10:01:08 +0200 (Wed, 31 May 2006) | 1 line
Revert last checkin, it is better to do make distclean
........
r46574 | neal.norwitz | 2006-05-31 11:02:44 +0200 (Wed, 31 May 2006) | 3 lines
On 64-bit platforms running test_struct after test_tarfile would fail
since the deprecation warning wouldn't be raised.
........
r46575 | thomas.heller | 2006-05-31 13:37:58 +0200 (Wed, 31 May 2006) | 3 lines
PyTuple_Pack is not available in Python 2.3, but ctypes must stay
compatible with that.
........
r46576 | andrew.kuchling | 2006-05-31 15:18:56 +0200 (Wed, 31 May 2006) | 1 line
'functional' module was renamed to 'functools'
........
r46577 | kristjan.jonsson | 2006-05-31 15:35:41 +0200 (Wed, 31 May 2006) | 1 line
Fixup the PCBuild8 project directory. exceptions.c have moved to Objects, and the functionalmodule.c has been replaced with _functoolsmodule.c. Other minor changes to .vcproj files and .sln to fix compilation
........
r46578 | andrew.kuchling | 2006-05-31 16:08:48 +0200 (Wed, 31 May 2006) | 15 lines
[Bug #1473048]
SimpleXMLRPCServer and DocXMLRPCServer don't look at
the path of the HTTP request at all; you can POST or
GET from / or /RPC2 or /blahblahblah with the same results.
Security scanners that look for /cgi-bin/phf will therefore report
lots of vulnerabilities.
Fix: add a .rpc_paths attribute to the SimpleXMLRPCServer class,
and report a 404 error if the path isn't on the allowed list.
Possibly-controversial aspect of this change: the default makes only
'/' and '/RPC2' legal. Maybe this will break people's applications
(though I doubt it). We could just set the default to an empty tuple,
which would exactly match the current behaviour.
........
r46579 | andrew.kuchling | 2006-05-31 16:12:47 +0200 (Wed, 31 May 2006) | 1 line
Mention SimpleXMLRPCServer change
........
r46580 | tim.peters | 2006-05-31 16:28:07 +0200 (Wed, 31 May 2006) | 2 lines
Trimmed trailing whitespace.
........
r46581 | tim.peters | 2006-05-31 17:33:22 +0200 (Wed, 31 May 2006) | 4 lines
_range_error(): Speed and simplify (there's no real need for
loops here). Assert that size_t is actually big enough, and
that f->size is at least one. Wrap a long line.
........
r46582 | tim.peters | 2006-05-31 17:34:37 +0200 (Wed, 31 May 2006) | 2 lines
Repaired error in new comment.
........
r46584 | neal.norwitz | 2006-06-01 07:32:49 +0200 (Thu, 01 Jun 2006) | 4 lines
Remove ; at end of macro. There was a compiler recently that warned
about extra semi-colons. It may have been the HP C compiler.
This file will trigger a bunch of those warnings now.
........
r46585 | georg.brandl | 2006-06-01 08:39:19 +0200 (Thu, 01 Jun 2006) | 3 lines
Correctly unpickle 2.4 exceptions via __setstate__ (patch #1498571)
........
r46586 | georg.brandl | 2006-06-01 10:27:32 +0200 (Thu, 01 Jun 2006) | 3 lines
Correctly allocate complex types with tp_alloc. (bug #1498638)
........
r46587 | georg.brandl | 2006-06-01 14:30:46 +0200 (Thu, 01 Jun 2006) | 2 lines
Correctly dispatch Faults in loads (patch #1498627)
........
r46588 | georg.brandl | 2006-06-01 15:00:49 +0200 (Thu, 01 Jun 2006) | 3 lines
Some code style tweaks, and remove apply.
........
r46589 | armin.rigo | 2006-06-01 15:19:12 +0200 (Thu, 01 Jun 2006) | 5 lines
[ 1497053 ] Let dicts propagate the exceptions in user __eq__().
[ 1456209 ] dictresize() vulnerability ( <- backport candidate ).
........
r46590 | tim.peters | 2006-06-01 15:41:46 +0200 (Thu, 01 Jun 2006) | 2 lines
Whitespace normalization.
........
r46591 | tim.peters | 2006-06-01 15:49:23 +0200 (Thu, 01 Jun 2006) | 2 lines
Record bugs 1275608 and 1456209 as being fixed.
........
r46592 | tim.peters | 2006-06-01 15:56:26 +0200 (Thu, 01 Jun 2006) | 5 lines
Re-enable a new empty-string test added during the NFS sprint,
but disabled then because str and unicode strings gave different
results. The implementations were repaired later during the
sprint, but the new test remained disabled.
........
r46594 | tim.peters | 2006-06-01 17:50:44 +0200 (Thu, 01 Jun 2006) | 7 lines
Armin committed his patch while I was reviewing it (I'm sure
he didn't know this), so merged in some changes I made during
review. Nothing material apart from changing a new `mask` local
from int to Py_ssize_t. Mostly this is repairing comments that
were made incorrect, and adding new comments. Also a few
minor code rewrites for clarity or helpful succinctness.
........
r46599 | neal.norwitz | 2006-06-02 06:45:53 +0200 (Fri, 02 Jun 2006) | 1 line
Convert docstrings to comments so regrtest -v prints method names
........
r46600 | neal.norwitz | 2006-06-02 06:50:49 +0200 (Fri, 02 Jun 2006) | 2 lines
Fix memory leak found by valgrind.
........
r46601 | neal.norwitz | 2006-06-02 06:54:52 +0200 (Fri, 02 Jun 2006) | 1 line
More memory leaks from valgrind
........
r46602 | neal.norwitz | 2006-06-02 08:23:00 +0200 (Fri, 02 Jun 2006) | 11 lines
Patch #1357836:
Prevent an invalid memory read from test_coding in case the done flag is set.
In that case, the loop isn't entered. I wonder if rather than setting
the done flag in the cases before the loop, if they should just exit early.
This code looks like it should be refactored.
Backport candidate (also the early break above if decoding_fgets fails)
........
r46603 | martin.blais | 2006-06-02 15:03:43 +0200 (Fri, 02 Jun 2006) | 1 line
Fixed struct test to not use unittest.
........
r46605 | tim.peters | 2006-06-03 01:22:51 +0200 (Sat, 03 Jun 2006) | 10 lines
pprint functions used to sort a dict (by key) if and only if
the output required more than one line. "Small" dicts got
displayed in seemingly random order (the hash-induced order
produced by dict.__repr__). None of this was documented.
Now pprint functions always sort dicts by key, and the docs
promise it.
This was proposed and agreed to during the PyCon 2006 core
sprint -- I just didn't have time for it before now.
........
2006-06-08 14:42:34 +00:00
|
|
|
marshal_load(PyObject *self, PyObject *f)
|
1991-06-04 19:42:30 +00:00
|
|
|
{
|
1993-01-21 16:07:51 +00:00
|
|
|
RFILE rf;
|
Partially merge trunk into p3yk. The removal of Mac/Tools is confusing svn
merge in bad ways, so I'll have to merge that extra-carefully (probably manually.)
Merged revisions 46495-46605 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r46495 | tim.peters | 2006-05-28 03:52:38 +0200 (Sun, 28 May 2006) | 2 lines
Added missing svn:eol-style property to text files.
........
r46497 | tim.peters | 2006-05-28 12:41:29 +0200 (Sun, 28 May 2006) | 3 lines
PyErr_Display(), PyErr_WriteUnraisable(): Coverity found a cut-and-paste
bug in both: `className` was referenced before being checked for NULL.
........
r46499 | fredrik.lundh | 2006-05-28 14:06:46 +0200 (Sun, 28 May 2006) | 5 lines
needforspeed: added Py_MEMCPY macro (currently tuned for Visual C only),
and use it for string copy operations. this gives a 20% speedup on some
string benchmarks.
........
r46501 | michael.hudson | 2006-05-28 17:51:40 +0200 (Sun, 28 May 2006) | 26 lines
Quality control, meet exceptions.c.
Fix a number of problems with the need for speed code:
One is doing this sort of thing:
Py_DECREF(self->field);
self->field = newval;
Py_INCREF(self->field);
without being very sure that self->field doesn't start with a
value that has a __del__, because that almost certainly can lead
to segfaults.
As self->args is constrained to be an exact tuple we may as well
exploit this fact consistently. This leads to quite a lot of
simplification (and, hey, probably better performance).
Add some error checking in places lacking it.
Fix some rather strange indentation in the Unicode code.
Delete some trailing whitespace.
More to come, I haven't fixed all the reference leaks yet...
........
r46502 | george.yoshida | 2006-05-28 18:39:09 +0200 (Sun, 28 May 2006) | 3 lines
Patch #1080727: add "encoding" parameter to doctest.DocFileSuite
Contributed by Bjorn Tillenius.
........
r46503 | martin.v.loewis | 2006-05-28 18:57:38 +0200 (Sun, 28 May 2006) | 4 lines
Rest of patch #1490384: Commit icon source, remove
claim that Erik von Blokland is the author of the
installer picture.
........
r46504 | michael.hudson | 2006-05-28 19:40:29 +0200 (Sun, 28 May 2006) | 16 lines
Quality control, meet exceptions.c, round two.
Make some functions that should have been static static.
Fix a bunch of refleaks by fixing the definition of
MiddlingExtendsException.
Remove all the __new__ implementations apart from
BaseException_new. Rewrite most code that needs it to cope with
NULL fields (such code could get excercised anyway, the
__new__-removal just makes it more likely). This involved
editing the code for WindowsError, which I can't test.
This fixes all the refleaks in at least the start of a regrtest
-R :: run.
........
r46505 | marc-andre.lemburg | 2006-05-28 19:46:58 +0200 (Sun, 28 May 2006) | 10 lines
Initial version of systimes - a module to provide platform dependent
performance measurements.
The module is currently just a proof-of-concept implementation, but
will integrated into pybench once it is stable enough.
License: pybench license.
Author: Marc-Andre Lemburg.
........
r46507 | armin.rigo | 2006-05-28 21:13:17 +0200 (Sun, 28 May 2006) | 15 lines
("Forward-port" of r46506)
Remove various dependencies on dictionary order in the standard library
tests, and one (clearly an oversight, potentially critical) in the
standard library itself - base64.py.
Remaining open issues:
* test_extcall is an output test, messy to make robust
* tarfile.py has a potential bug here, but I'm not familiar
enough with this code. Filed in as SF bug #1496501.
* urllib2.HTTPPasswordMgr() returns a random result if there is more
than one matching root path. I'm asking python-dev for
clarification...
........
r46508 | georg.brandl | 2006-05-28 22:11:45 +0200 (Sun, 28 May 2006) | 4 lines
The empty string is a valid import path.
(fixes #1496539)
........
r46509 | georg.brandl | 2006-05-28 22:23:12 +0200 (Sun, 28 May 2006) | 3 lines
Patch #1496206: urllib2 PasswordMgr ./. default ports
........
r46510 | georg.brandl | 2006-05-28 22:57:09 +0200 (Sun, 28 May 2006) | 3 lines
Fix refleaks in UnicodeError get and set methods.
........
r46511 | michael.hudson | 2006-05-28 23:19:03 +0200 (Sun, 28 May 2006) | 3 lines
use the UnicodeError traversal and clearing functions in UnicodeError
subclasses.
........
r46512 | thomas.wouters | 2006-05-28 23:32:12 +0200 (Sun, 28 May 2006) | 4 lines
Make last patch valid C89 so Windows compilers can deal with it.
........
r46513 | georg.brandl | 2006-05-28 23:42:54 +0200 (Sun, 28 May 2006) | 3 lines
Fix ref-antileak in _struct.c which eventually lead to deallocating None.
........
r46514 | georg.brandl | 2006-05-28 23:57:35 +0200 (Sun, 28 May 2006) | 4 lines
Correct None refcount issue in Mac modules. (Are they
still used?)
........
r46515 | armin.rigo | 2006-05-29 00:07:08 +0200 (Mon, 29 May 2006) | 3 lines
A clearer error message when passing -R to regrtest.py with
release builds of Python.
........
r46516 | georg.brandl | 2006-05-29 00:14:04 +0200 (Mon, 29 May 2006) | 3 lines
Fix C function calling conventions in _sre module.
........
r46517 | georg.brandl | 2006-05-29 00:34:51 +0200 (Mon, 29 May 2006) | 3 lines
Convert audioop over to METH_VARARGS.
........
r46518 | georg.brandl | 2006-05-29 00:38:57 +0200 (Mon, 29 May 2006) | 3 lines
METH_NOARGS functions do get called with two args.
........
r46519 | georg.brandl | 2006-05-29 11:46:51 +0200 (Mon, 29 May 2006) | 4 lines
Fix refleak in socketmodule. Replace bogus Py_BuildValue calls.
Fix refleak in exceptions.
........
r46520 | nick.coghlan | 2006-05-29 14:43:05 +0200 (Mon, 29 May 2006) | 7 lines
Apply modified version of Collin Winter's patch #1478788
Renames functional extension module to _functools and adds a Python
functools module so that utility functions like update_wrapper can be
added easily.
........
r46522 | georg.brandl | 2006-05-29 15:53:16 +0200 (Mon, 29 May 2006) | 3 lines
Convert fmmodule to METH_VARARGS.
........
r46523 | georg.brandl | 2006-05-29 16:13:21 +0200 (Mon, 29 May 2006) | 3 lines
Fix #1494605.
........
r46524 | georg.brandl | 2006-05-29 16:28:05 +0200 (Mon, 29 May 2006) | 3 lines
Handle PyMem_Malloc failure in pystrtod.c. Closes #1494671.
........
r46525 | georg.brandl | 2006-05-29 16:33:55 +0200 (Mon, 29 May 2006) | 3 lines
Fix compiler warning.
........
r46526 | georg.brandl | 2006-05-29 16:39:00 +0200 (Mon, 29 May 2006) | 3 lines
Fix #1494787 (pyclbr counts whitespace as superclass name)
........
r46527 | bob.ippolito | 2006-05-29 17:47:29 +0200 (Mon, 29 May 2006) | 1 line
simplify the struct code a bit (no functional changes)
........
r46528 | armin.rigo | 2006-05-29 19:59:47 +0200 (Mon, 29 May 2006) | 2 lines
Silence a warning.
........
r46529 | georg.brandl | 2006-05-29 21:39:45 +0200 (Mon, 29 May 2006) | 3 lines
Correct some value converting strangenesses.
........
r46530 | nick.coghlan | 2006-05-29 22:27:44 +0200 (Mon, 29 May 2006) | 1 line
When adding a module like functools, it helps to let SVN know about the file.
........
r46531 | georg.brandl | 2006-05-29 22:52:54 +0200 (Mon, 29 May 2006) | 4 lines
Patches #1497027 and #972322: try HTTP digest auth first,
and watch out for handler name collisions.
........
r46532 | georg.brandl | 2006-05-29 22:57:01 +0200 (Mon, 29 May 2006) | 3 lines
Add News entry for last commit.
........
r46533 | georg.brandl | 2006-05-29 23:04:52 +0200 (Mon, 29 May 2006) | 4 lines
Make use of METH_O and METH_NOARGS where possible.
Use Py_UnpackTuple instead of PyArg_ParseTuple where possible.
........
r46534 | georg.brandl | 2006-05-29 23:58:42 +0200 (Mon, 29 May 2006) | 3 lines
Convert more modules to METH_VARARGS.
........
r46535 | georg.brandl | 2006-05-30 00:00:30 +0200 (Tue, 30 May 2006) | 3 lines
Whoops.
........
r46536 | fredrik.lundh | 2006-05-30 00:42:07 +0200 (Tue, 30 May 2006) | 4 lines
fixed "abc".count("", 100) == -96 error (hopefully, nobody's relying on
the current behaviour ;-)
........
r46537 | bob.ippolito | 2006-05-30 00:55:48 +0200 (Tue, 30 May 2006) | 1 line
struct: modulo math plus warning on all endian-explicit formats for compatibility with older struct usage (ugly)
........
r46539 | bob.ippolito | 2006-05-30 02:26:01 +0200 (Tue, 30 May 2006) | 1 line
Add a length check to aifc to ensure it doesn't write a bogus file
........
r46540 | tim.peters | 2006-05-30 04:25:25 +0200 (Tue, 30 May 2006) | 10 lines
deprecated_err(): Stop bizarre warning messages when the tests
are run in the order:
test_genexps (or any other doctest-based test)
test_struct
test_doctest
The `warnings` module needs an advertised way to save/restore
its internal filter list.
........
r46541 | tim.peters | 2006-05-30 04:26:46 +0200 (Tue, 30 May 2006) | 2 lines
Whitespace normalization.
........
r46542 | tim.peters | 2006-05-30 04:30:30 +0200 (Tue, 30 May 2006) | 2 lines
Set a binary svn:mime-type property on this UTF-8 encoded file.
........
r46543 | neal.norwitz | 2006-05-30 05:18:50 +0200 (Tue, 30 May 2006) | 1 line
Simplify further by using AddStringConstant
........
r46544 | tim.peters | 2006-05-30 06:16:25 +0200 (Tue, 30 May 2006) | 6 lines
Convert relevant dict internals to Py_ssize_t.
I don't have a box with nearly enough RAM, or an OS,
that could get close to tickling this, though (requires
a dict w/ at least 2**31 entries).
........
r46545 | neal.norwitz | 2006-05-30 06:19:21 +0200 (Tue, 30 May 2006) | 1 line
Remove stray | in comment
........
r46546 | neal.norwitz | 2006-05-30 06:25:05 +0200 (Tue, 30 May 2006) | 1 line
Use Py_SAFE_DOWNCAST for safety. Fix format strings. Remove 2 more stray | in comment
........
r46547 | neal.norwitz | 2006-05-30 06:43:23 +0200 (Tue, 30 May 2006) | 1 line
No DOWNCAST is required since sizeof(Py_ssize_t) >= sizeof(int) and Py_ReprEntr returns an int
........
r46548 | tim.peters | 2006-05-30 07:04:59 +0200 (Tue, 30 May 2006) | 3 lines
dict_print(): Explicitly narrow the return value
from a (possibly) wider variable.
........
r46549 | tim.peters | 2006-05-30 07:23:59 +0200 (Tue, 30 May 2006) | 5 lines
dict_print(): So that Neal & I don't spend the rest of
our lives taking turns rewriting code that works ;-),
get rid of casting illusions by declaring a new variable
with the obvious type.
........
r46550 | georg.brandl | 2006-05-30 09:04:55 +0200 (Tue, 30 May 2006) | 3 lines
Restore exception pickle support. #1497319.
........
r46551 | georg.brandl | 2006-05-30 09:13:29 +0200 (Tue, 30 May 2006) | 3 lines
Add a test case for exception pickling. args is never NULL.
........
r46552 | neal.norwitz | 2006-05-30 09:21:10 +0200 (Tue, 30 May 2006) | 1 line
Don't fail if the (sub)pkgname already exist.
........
r46553 | georg.brandl | 2006-05-30 09:34:45 +0200 (Tue, 30 May 2006) | 3 lines
Disallow keyword args for exceptions.
........
r46554 | neal.norwitz | 2006-05-30 09:36:54 +0200 (Tue, 30 May 2006) | 5 lines
I'm impatient. I think this will fix a few more problems with the buildbots.
I'm not sure this is the best approach, but I can't think of anything better.
If this creates problems, feel free to revert, but I think it's safe and
should make things a little better.
........
r46555 | georg.brandl | 2006-05-30 10:17:00 +0200 (Tue, 30 May 2006) | 4 lines
Do the check for no keyword arguments in __init__ so that
subclasses of Exception can be supplied keyword args
........
r46556 | georg.brandl | 2006-05-30 10:47:19 +0200 (Tue, 30 May 2006) | 3 lines
Convert test_exceptions to unittest.
........
r46557 | andrew.kuchling | 2006-05-30 14:52:01 +0200 (Tue, 30 May 2006) | 1 line
Add SoC name, and reorganize this section a bit
........
r46559 | tim.peters | 2006-05-30 17:53:34 +0200 (Tue, 30 May 2006) | 11 lines
PyLong_FromString(): Continued fraction analysis (explained in
a new comment) suggests there are almost certainly large input
integers in all non-binary input bases for which one Python digit
too few is initally allocated to hold the final result. Instead
of assert-failing when that happens, allocate more space. Alas,
I estimate it would take a few days to find a specific such case,
so this isn't backed up by a new test (not to mention that such
a case may take hours to run, since conversion time is quadratic
in the number of digits, and preliminary attempts suggested that
the smallest such inputs contain at least a million digits).
........
r46560 | fredrik.lundh | 2006-05-30 19:11:48 +0200 (Tue, 30 May 2006) | 3 lines
changed find/rfind to return -1 for matches outside the source string
........
r46561 | bob.ippolito | 2006-05-30 19:37:54 +0200 (Tue, 30 May 2006) | 1 line
Change wrapping terminology to overflow masking
........
r46562 | fredrik.lundh | 2006-05-30 19:39:58 +0200 (Tue, 30 May 2006) | 3 lines
changed count to return 0 for slices outside the source string
........
r46568 | tim.peters | 2006-05-31 01:28:02 +0200 (Wed, 31 May 2006) | 2 lines
Whitespace normalization.
........
r46569 | brett.cannon | 2006-05-31 04:19:54 +0200 (Wed, 31 May 2006) | 5 lines
Clarify wording on default values for strptime(); defaults are used when better
values cannot be inferred.
Closes bug #1496315.
........
r46572 | neal.norwitz | 2006-05-31 09:43:27 +0200 (Wed, 31 May 2006) | 1 line
Calculate smallest properly (it was off by one) and use proper ssize_t types for Win64
........
r46573 | neal.norwitz | 2006-05-31 10:01:08 +0200 (Wed, 31 May 2006) | 1 line
Revert last checkin, it is better to do make distclean
........
r46574 | neal.norwitz | 2006-05-31 11:02:44 +0200 (Wed, 31 May 2006) | 3 lines
On 64-bit platforms running test_struct after test_tarfile would fail
since the deprecation warning wouldn't be raised.
........
r46575 | thomas.heller | 2006-05-31 13:37:58 +0200 (Wed, 31 May 2006) | 3 lines
PyTuple_Pack is not available in Python 2.3, but ctypes must stay
compatible with that.
........
r46576 | andrew.kuchling | 2006-05-31 15:18:56 +0200 (Wed, 31 May 2006) | 1 line
'functional' module was renamed to 'functools'
........
r46577 | kristjan.jonsson | 2006-05-31 15:35:41 +0200 (Wed, 31 May 2006) | 1 line
Fixup the PCBuild8 project directory. exceptions.c have moved to Objects, and the functionalmodule.c has been replaced with _functoolsmodule.c. Other minor changes to .vcproj files and .sln to fix compilation
........
r46578 | andrew.kuchling | 2006-05-31 16:08:48 +0200 (Wed, 31 May 2006) | 15 lines
[Bug #1473048]
SimpleXMLRPCServer and DocXMLRPCServer don't look at
the path of the HTTP request at all; you can POST or
GET from / or /RPC2 or /blahblahblah with the same results.
Security scanners that look for /cgi-bin/phf will therefore report
lots of vulnerabilities.
Fix: add a .rpc_paths attribute to the SimpleXMLRPCServer class,
and report a 404 error if the path isn't on the allowed list.
Possibly-controversial aspect of this change: the default makes only
'/' and '/RPC2' legal. Maybe this will break people's applications
(though I doubt it). We could just set the default to an empty tuple,
which would exactly match the current behaviour.
........
r46579 | andrew.kuchling | 2006-05-31 16:12:47 +0200 (Wed, 31 May 2006) | 1 line
Mention SimpleXMLRPCServer change
........
r46580 | tim.peters | 2006-05-31 16:28:07 +0200 (Wed, 31 May 2006) | 2 lines
Trimmed trailing whitespace.
........
r46581 | tim.peters | 2006-05-31 17:33:22 +0200 (Wed, 31 May 2006) | 4 lines
_range_error(): Speed and simplify (there's no real need for
loops here). Assert that size_t is actually big enough, and
that f->size is at least one. Wrap a long line.
........
r46582 | tim.peters | 2006-05-31 17:34:37 +0200 (Wed, 31 May 2006) | 2 lines
Repaired error in new comment.
........
r46584 | neal.norwitz | 2006-06-01 07:32:49 +0200 (Thu, 01 Jun 2006) | 4 lines
Remove ; at end of macro. There was a compiler recently that warned
about extra semi-colons. It may have been the HP C compiler.
This file will trigger a bunch of those warnings now.
........
r46585 | georg.brandl | 2006-06-01 08:39:19 +0200 (Thu, 01 Jun 2006) | 3 lines
Correctly unpickle 2.4 exceptions via __setstate__ (patch #1498571)
........
r46586 | georg.brandl | 2006-06-01 10:27:32 +0200 (Thu, 01 Jun 2006) | 3 lines
Correctly allocate complex types with tp_alloc. (bug #1498638)
........
r46587 | georg.brandl | 2006-06-01 14:30:46 +0200 (Thu, 01 Jun 2006) | 2 lines
Correctly dispatch Faults in loads (patch #1498627)
........
r46588 | georg.brandl | 2006-06-01 15:00:49 +0200 (Thu, 01 Jun 2006) | 3 lines
Some code style tweaks, and remove apply.
........
r46589 | armin.rigo | 2006-06-01 15:19:12 +0200 (Thu, 01 Jun 2006) | 5 lines
[ 1497053 ] Let dicts propagate the exceptions in user __eq__().
[ 1456209 ] dictresize() vulnerability ( <- backport candidate ).
........
r46590 | tim.peters | 2006-06-01 15:41:46 +0200 (Thu, 01 Jun 2006) | 2 lines
Whitespace normalization.
........
r46591 | tim.peters | 2006-06-01 15:49:23 +0200 (Thu, 01 Jun 2006) | 2 lines
Record bugs 1275608 and 1456209 as being fixed.
........
r46592 | tim.peters | 2006-06-01 15:56:26 +0200 (Thu, 01 Jun 2006) | 5 lines
Re-enable a new empty-string test added during the NFS sprint,
but disabled then because str and unicode strings gave different
results. The implementations were repaired later during the
sprint, but the new test remained disabled.
........
r46594 | tim.peters | 2006-06-01 17:50:44 +0200 (Thu, 01 Jun 2006) | 7 lines
Armin committed his patch while I was reviewing it (I'm sure
he didn't know this), so merged in some changes I made during
review. Nothing material apart from changing a new `mask` local
from int to Py_ssize_t. Mostly this is repairing comments that
were made incorrect, and adding new comments. Also a few
minor code rewrites for clarity or helpful succinctness.
........
r46599 | neal.norwitz | 2006-06-02 06:45:53 +0200 (Fri, 02 Jun 2006) | 1 line
Convert docstrings to comments so regrtest -v prints method names
........
r46600 | neal.norwitz | 2006-06-02 06:50:49 +0200 (Fri, 02 Jun 2006) | 2 lines
Fix memory leak found by valgrind.
........
r46601 | neal.norwitz | 2006-06-02 06:54:52 +0200 (Fri, 02 Jun 2006) | 1 line
More memory leaks from valgrind
........
r46602 | neal.norwitz | 2006-06-02 08:23:00 +0200 (Fri, 02 Jun 2006) | 11 lines
Patch #1357836:
Prevent an invalid memory read from test_coding in case the done flag is set.
In that case, the loop isn't entered. I wonder if rather than setting
the done flag in the cases before the loop, if they should just exit early.
This code looks like it should be refactored.
Backport candidate (also the early break above if decoding_fgets fails)
........
r46603 | martin.blais | 2006-06-02 15:03:43 +0200 (Fri, 02 Jun 2006) | 1 line
Fixed struct test to not use unittest.
........
r46605 | tim.peters | 2006-06-03 01:22:51 +0200 (Sat, 03 Jun 2006) | 10 lines
pprint functions used to sort a dict (by key) if and only if
the output required more than one line. "Small" dicts got
displayed in seemingly random order (the hash-induced order
produced by dict.__repr__). None of this was documented.
Now pprint functions always sort dicts by key, and the docs
promise it.
This was proposed and agreed to during the PyCon 2006 core
sprint -- I just didn't have time for it before now.
........
2006-06-08 14:42:34 +00:00
|
|
|
PyObject *result;
|
1997-04-29 20:08:16 +00:00
|
|
|
if (!PyFile_Check(f)) {
|
|
|
|
PyErr_SetString(PyExc_TypeError,
|
|
|
|
"marshal.load() arg must be file");
|
1991-06-04 19:42:30 +00:00
|
|
|
return NULL;
|
|
|
|
}
|
1997-04-29 20:08:16 +00:00
|
|
|
rf.fp = PyFile_AsFile(f);
|
2004-06-27 16:51:46 +00:00
|
|
|
rf.strings = PyList_New(0);
|
|
|
|
result = read_object(&rf);
|
|
|
|
Py_DECREF(rf.strings);
|
|
|
|
return result;
|
1993-01-21 16:07:51 +00:00
|
|
|
}
|
|
|
|
|
1997-04-29 20:08:16 +00:00
|
|
|
static PyObject *
|
2000-07-22 18:47:25 +00:00
|
|
|
marshal_dumps(PyObject *self, PyObject *args)
|
1993-01-21 16:07:51 +00:00
|
|
|
{
|
1997-04-29 20:08:16 +00:00
|
|
|
PyObject *x;
|
2004-06-27 16:51:46 +00:00
|
|
|
int version = Py_MARSHAL_VERSION;
|
2004-12-20 12:25:57 +00:00
|
|
|
if (!PyArg_ParseTuple(args, "O|i:dumps", &x, &version))
|
1993-01-21 16:07:51 +00:00
|
|
|
return NULL;
|
2004-06-27 16:51:46 +00:00
|
|
|
return PyMarshal_WriteObjectToString(x, version);
|
1993-01-21 16:07:51 +00:00
|
|
|
}
|
|
|
|
|
1997-04-29 20:08:16 +00:00
|
|
|
static PyObject *
|
2000-07-22 18:47:25 +00:00
|
|
|
marshal_loads(PyObject *self, PyObject *args)
|
1993-01-21 16:07:51 +00:00
|
|
|
{
|
|
|
|
RFILE rf;
|
|
|
|
char *s;
|
2006-03-01 23:49:13 +00:00
|
|
|
Py_ssize_t n;
|
2004-06-27 16:51:46 +00:00
|
|
|
PyObject* result;
|
2005-06-13 17:50:18 +00:00
|
|
|
if (!PyArg_ParseTuple(args, "s#:loads", &s, &n))
|
1993-01-21 16:07:51 +00:00
|
|
|
return NULL;
|
|
|
|
rf.fp = NULL;
|
|
|
|
rf.ptr = s;
|
|
|
|
rf.end = s + n;
|
2004-06-27 16:51:46 +00:00
|
|
|
rf.strings = PyList_New(0);
|
|
|
|
result = read_object(&rf);
|
|
|
|
Py_DECREF(rf.strings);
|
|
|
|
return result;
|
1991-06-04 19:42:30 +00:00
|
|
|
}
|
|
|
|
|
1997-04-29 20:08:16 +00:00
|
|
|
static PyMethodDef marshal_methods[] = {
|
2002-03-31 14:37:44 +00:00
|
|
|
{"dump", marshal_dump, METH_VARARGS},
|
Partially merge trunk into p3yk. The removal of Mac/Tools is confusing svn
merge in bad ways, so I'll have to merge that extra-carefully (probably manually.)
Merged revisions 46495-46605 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r46495 | tim.peters | 2006-05-28 03:52:38 +0200 (Sun, 28 May 2006) | 2 lines
Added missing svn:eol-style property to text files.
........
r46497 | tim.peters | 2006-05-28 12:41:29 +0200 (Sun, 28 May 2006) | 3 lines
PyErr_Display(), PyErr_WriteUnraisable(): Coverity found a cut-and-paste
bug in both: `className` was referenced before being checked for NULL.
........
r46499 | fredrik.lundh | 2006-05-28 14:06:46 +0200 (Sun, 28 May 2006) | 5 lines
needforspeed: added Py_MEMCPY macro (currently tuned for Visual C only),
and use it for string copy operations. this gives a 20% speedup on some
string benchmarks.
........
r46501 | michael.hudson | 2006-05-28 17:51:40 +0200 (Sun, 28 May 2006) | 26 lines
Quality control, meet exceptions.c.
Fix a number of problems with the need for speed code:
One is doing this sort of thing:
Py_DECREF(self->field);
self->field = newval;
Py_INCREF(self->field);
without being very sure that self->field doesn't start with a
value that has a __del__, because that almost certainly can lead
to segfaults.
As self->args is constrained to be an exact tuple we may as well
exploit this fact consistently. This leads to quite a lot of
simplification (and, hey, probably better performance).
Add some error checking in places lacking it.
Fix some rather strange indentation in the Unicode code.
Delete some trailing whitespace.
More to come, I haven't fixed all the reference leaks yet...
........
r46502 | george.yoshida | 2006-05-28 18:39:09 +0200 (Sun, 28 May 2006) | 3 lines
Patch #1080727: add "encoding" parameter to doctest.DocFileSuite
Contributed by Bjorn Tillenius.
........
r46503 | martin.v.loewis | 2006-05-28 18:57:38 +0200 (Sun, 28 May 2006) | 4 lines
Rest of patch #1490384: Commit icon source, remove
claim that Erik von Blokland is the author of the
installer picture.
........
r46504 | michael.hudson | 2006-05-28 19:40:29 +0200 (Sun, 28 May 2006) | 16 lines
Quality control, meet exceptions.c, round two.
Make some functions that should have been static static.
Fix a bunch of refleaks by fixing the definition of
MiddlingExtendsException.
Remove all the __new__ implementations apart from
BaseException_new. Rewrite most code that needs it to cope with
NULL fields (such code could get excercised anyway, the
__new__-removal just makes it more likely). This involved
editing the code for WindowsError, which I can't test.
This fixes all the refleaks in at least the start of a regrtest
-R :: run.
........
r46505 | marc-andre.lemburg | 2006-05-28 19:46:58 +0200 (Sun, 28 May 2006) | 10 lines
Initial version of systimes - a module to provide platform dependent
performance measurements.
The module is currently just a proof-of-concept implementation, but
will integrated into pybench once it is stable enough.
License: pybench license.
Author: Marc-Andre Lemburg.
........
r46507 | armin.rigo | 2006-05-28 21:13:17 +0200 (Sun, 28 May 2006) | 15 lines
("Forward-port" of r46506)
Remove various dependencies on dictionary order in the standard library
tests, and one (clearly an oversight, potentially critical) in the
standard library itself - base64.py.
Remaining open issues:
* test_extcall is an output test, messy to make robust
* tarfile.py has a potential bug here, but I'm not familiar
enough with this code. Filed in as SF bug #1496501.
* urllib2.HTTPPasswordMgr() returns a random result if there is more
than one matching root path. I'm asking python-dev for
clarification...
........
r46508 | georg.brandl | 2006-05-28 22:11:45 +0200 (Sun, 28 May 2006) | 4 lines
The empty string is a valid import path.
(fixes #1496539)
........
r46509 | georg.brandl | 2006-05-28 22:23:12 +0200 (Sun, 28 May 2006) | 3 lines
Patch #1496206: urllib2 PasswordMgr ./. default ports
........
r46510 | georg.brandl | 2006-05-28 22:57:09 +0200 (Sun, 28 May 2006) | 3 lines
Fix refleaks in UnicodeError get and set methods.
........
r46511 | michael.hudson | 2006-05-28 23:19:03 +0200 (Sun, 28 May 2006) | 3 lines
use the UnicodeError traversal and clearing functions in UnicodeError
subclasses.
........
r46512 | thomas.wouters | 2006-05-28 23:32:12 +0200 (Sun, 28 May 2006) | 4 lines
Make last patch valid C89 so Windows compilers can deal with it.
........
r46513 | georg.brandl | 2006-05-28 23:42:54 +0200 (Sun, 28 May 2006) | 3 lines
Fix ref-antileak in _struct.c which eventually lead to deallocating None.
........
r46514 | georg.brandl | 2006-05-28 23:57:35 +0200 (Sun, 28 May 2006) | 4 lines
Correct None refcount issue in Mac modules. (Are they
still used?)
........
r46515 | armin.rigo | 2006-05-29 00:07:08 +0200 (Mon, 29 May 2006) | 3 lines
A clearer error message when passing -R to regrtest.py with
release builds of Python.
........
r46516 | georg.brandl | 2006-05-29 00:14:04 +0200 (Mon, 29 May 2006) | 3 lines
Fix C function calling conventions in _sre module.
........
r46517 | georg.brandl | 2006-05-29 00:34:51 +0200 (Mon, 29 May 2006) | 3 lines
Convert audioop over to METH_VARARGS.
........
r46518 | georg.brandl | 2006-05-29 00:38:57 +0200 (Mon, 29 May 2006) | 3 lines
METH_NOARGS functions do get called with two args.
........
r46519 | georg.brandl | 2006-05-29 11:46:51 +0200 (Mon, 29 May 2006) | 4 lines
Fix refleak in socketmodule. Replace bogus Py_BuildValue calls.
Fix refleak in exceptions.
........
r46520 | nick.coghlan | 2006-05-29 14:43:05 +0200 (Mon, 29 May 2006) | 7 lines
Apply modified version of Collin Winter's patch #1478788
Renames functional extension module to _functools and adds a Python
functools module so that utility functions like update_wrapper can be
added easily.
........
r46522 | georg.brandl | 2006-05-29 15:53:16 +0200 (Mon, 29 May 2006) | 3 lines
Convert fmmodule to METH_VARARGS.
........
r46523 | georg.brandl | 2006-05-29 16:13:21 +0200 (Mon, 29 May 2006) | 3 lines
Fix #1494605.
........
r46524 | georg.brandl | 2006-05-29 16:28:05 +0200 (Mon, 29 May 2006) | 3 lines
Handle PyMem_Malloc failure in pystrtod.c. Closes #1494671.
........
r46525 | georg.brandl | 2006-05-29 16:33:55 +0200 (Mon, 29 May 2006) | 3 lines
Fix compiler warning.
........
r46526 | georg.brandl | 2006-05-29 16:39:00 +0200 (Mon, 29 May 2006) | 3 lines
Fix #1494787 (pyclbr counts whitespace as superclass name)
........
r46527 | bob.ippolito | 2006-05-29 17:47:29 +0200 (Mon, 29 May 2006) | 1 line
simplify the struct code a bit (no functional changes)
........
r46528 | armin.rigo | 2006-05-29 19:59:47 +0200 (Mon, 29 May 2006) | 2 lines
Silence a warning.
........
r46529 | georg.brandl | 2006-05-29 21:39:45 +0200 (Mon, 29 May 2006) | 3 lines
Correct some value converting strangenesses.
........
r46530 | nick.coghlan | 2006-05-29 22:27:44 +0200 (Mon, 29 May 2006) | 1 line
When adding a module like functools, it helps to let SVN know about the file.
........
r46531 | georg.brandl | 2006-05-29 22:52:54 +0200 (Mon, 29 May 2006) | 4 lines
Patches #1497027 and #972322: try HTTP digest auth first,
and watch out for handler name collisions.
........
r46532 | georg.brandl | 2006-05-29 22:57:01 +0200 (Mon, 29 May 2006) | 3 lines
Add News entry for last commit.
........
r46533 | georg.brandl | 2006-05-29 23:04:52 +0200 (Mon, 29 May 2006) | 4 lines
Make use of METH_O and METH_NOARGS where possible.
Use Py_UnpackTuple instead of PyArg_ParseTuple where possible.
........
r46534 | georg.brandl | 2006-05-29 23:58:42 +0200 (Mon, 29 May 2006) | 3 lines
Convert more modules to METH_VARARGS.
........
r46535 | georg.brandl | 2006-05-30 00:00:30 +0200 (Tue, 30 May 2006) | 3 lines
Whoops.
........
r46536 | fredrik.lundh | 2006-05-30 00:42:07 +0200 (Tue, 30 May 2006) | 4 lines
fixed "abc".count("", 100) == -96 error (hopefully, nobody's relying on
the current behaviour ;-)
........
r46537 | bob.ippolito | 2006-05-30 00:55:48 +0200 (Tue, 30 May 2006) | 1 line
struct: modulo math plus warning on all endian-explicit formats for compatibility with older struct usage (ugly)
........
r46539 | bob.ippolito | 2006-05-30 02:26:01 +0200 (Tue, 30 May 2006) | 1 line
Add a length check to aifc to ensure it doesn't write a bogus file
........
r46540 | tim.peters | 2006-05-30 04:25:25 +0200 (Tue, 30 May 2006) | 10 lines
deprecated_err(): Stop bizarre warning messages when the tests
are run in the order:
test_genexps (or any other doctest-based test)
test_struct
test_doctest
The `warnings` module needs an advertised way to save/restore
its internal filter list.
........
r46541 | tim.peters | 2006-05-30 04:26:46 +0200 (Tue, 30 May 2006) | 2 lines
Whitespace normalization.
........
r46542 | tim.peters | 2006-05-30 04:30:30 +0200 (Tue, 30 May 2006) | 2 lines
Set a binary svn:mime-type property on this UTF-8 encoded file.
........
r46543 | neal.norwitz | 2006-05-30 05:18:50 +0200 (Tue, 30 May 2006) | 1 line
Simplify further by using AddStringConstant
........
r46544 | tim.peters | 2006-05-30 06:16:25 +0200 (Tue, 30 May 2006) | 6 lines
Convert relevant dict internals to Py_ssize_t.
I don't have a box with nearly enough RAM, or an OS,
that could get close to tickling this, though (requires
a dict w/ at least 2**31 entries).
........
r46545 | neal.norwitz | 2006-05-30 06:19:21 +0200 (Tue, 30 May 2006) | 1 line
Remove stray | in comment
........
r46546 | neal.norwitz | 2006-05-30 06:25:05 +0200 (Tue, 30 May 2006) | 1 line
Use Py_SAFE_DOWNCAST for safety. Fix format strings. Remove 2 more stray | in comment
........
r46547 | neal.norwitz | 2006-05-30 06:43:23 +0200 (Tue, 30 May 2006) | 1 line
No DOWNCAST is required since sizeof(Py_ssize_t) >= sizeof(int) and Py_ReprEntr returns an int
........
r46548 | tim.peters | 2006-05-30 07:04:59 +0200 (Tue, 30 May 2006) | 3 lines
dict_print(): Explicitly narrow the return value
from a (possibly) wider variable.
........
r46549 | tim.peters | 2006-05-30 07:23:59 +0200 (Tue, 30 May 2006) | 5 lines
dict_print(): So that Neal & I don't spend the rest of
our lives taking turns rewriting code that works ;-),
get rid of casting illusions by declaring a new variable
with the obvious type.
........
r46550 | georg.brandl | 2006-05-30 09:04:55 +0200 (Tue, 30 May 2006) | 3 lines
Restore exception pickle support. #1497319.
........
r46551 | georg.brandl | 2006-05-30 09:13:29 +0200 (Tue, 30 May 2006) | 3 lines
Add a test case for exception pickling. args is never NULL.
........
r46552 | neal.norwitz | 2006-05-30 09:21:10 +0200 (Tue, 30 May 2006) | 1 line
Don't fail if the (sub)pkgname already exist.
........
r46553 | georg.brandl | 2006-05-30 09:34:45 +0200 (Tue, 30 May 2006) | 3 lines
Disallow keyword args for exceptions.
........
r46554 | neal.norwitz | 2006-05-30 09:36:54 +0200 (Tue, 30 May 2006) | 5 lines
I'm impatient. I think this will fix a few more problems with the buildbots.
I'm not sure this is the best approach, but I can't think of anything better.
If this creates problems, feel free to revert, but I think it's safe and
should make things a little better.
........
r46555 | georg.brandl | 2006-05-30 10:17:00 +0200 (Tue, 30 May 2006) | 4 lines
Do the check for no keyword arguments in __init__ so that
subclasses of Exception can be supplied keyword args
........
r46556 | georg.brandl | 2006-05-30 10:47:19 +0200 (Tue, 30 May 2006) | 3 lines
Convert test_exceptions to unittest.
........
r46557 | andrew.kuchling | 2006-05-30 14:52:01 +0200 (Tue, 30 May 2006) | 1 line
Add SoC name, and reorganize this section a bit
........
r46559 | tim.peters | 2006-05-30 17:53:34 +0200 (Tue, 30 May 2006) | 11 lines
PyLong_FromString(): Continued fraction analysis (explained in
a new comment) suggests there are almost certainly large input
integers in all non-binary input bases for which one Python digit
too few is initally allocated to hold the final result. Instead
of assert-failing when that happens, allocate more space. Alas,
I estimate it would take a few days to find a specific such case,
so this isn't backed up by a new test (not to mention that such
a case may take hours to run, since conversion time is quadratic
in the number of digits, and preliminary attempts suggested that
the smallest such inputs contain at least a million digits).
........
r46560 | fredrik.lundh | 2006-05-30 19:11:48 +0200 (Tue, 30 May 2006) | 3 lines
changed find/rfind to return -1 for matches outside the source string
........
r46561 | bob.ippolito | 2006-05-30 19:37:54 +0200 (Tue, 30 May 2006) | 1 line
Change wrapping terminology to overflow masking
........
r46562 | fredrik.lundh | 2006-05-30 19:39:58 +0200 (Tue, 30 May 2006) | 3 lines
changed count to return 0 for slices outside the source string
........
r46568 | tim.peters | 2006-05-31 01:28:02 +0200 (Wed, 31 May 2006) | 2 lines
Whitespace normalization.
........
r46569 | brett.cannon | 2006-05-31 04:19:54 +0200 (Wed, 31 May 2006) | 5 lines
Clarify wording on default values for strptime(); defaults are used when better
values cannot be inferred.
Closes bug #1496315.
........
r46572 | neal.norwitz | 2006-05-31 09:43:27 +0200 (Wed, 31 May 2006) | 1 line
Calculate smallest properly (it was off by one) and use proper ssize_t types for Win64
........
r46573 | neal.norwitz | 2006-05-31 10:01:08 +0200 (Wed, 31 May 2006) | 1 line
Revert last checkin, it is better to do make distclean
........
r46574 | neal.norwitz | 2006-05-31 11:02:44 +0200 (Wed, 31 May 2006) | 3 lines
On 64-bit platforms running test_struct after test_tarfile would fail
since the deprecation warning wouldn't be raised.
........
r46575 | thomas.heller | 2006-05-31 13:37:58 +0200 (Wed, 31 May 2006) | 3 lines
PyTuple_Pack is not available in Python 2.3, but ctypes must stay
compatible with that.
........
r46576 | andrew.kuchling | 2006-05-31 15:18:56 +0200 (Wed, 31 May 2006) | 1 line
'functional' module was renamed to 'functools'
........
r46577 | kristjan.jonsson | 2006-05-31 15:35:41 +0200 (Wed, 31 May 2006) | 1 line
Fixup the PCBuild8 project directory. exceptions.c have moved to Objects, and the functionalmodule.c has been replaced with _functoolsmodule.c. Other minor changes to .vcproj files and .sln to fix compilation
........
r46578 | andrew.kuchling | 2006-05-31 16:08:48 +0200 (Wed, 31 May 2006) | 15 lines
[Bug #1473048]
SimpleXMLRPCServer and DocXMLRPCServer don't look at
the path of the HTTP request at all; you can POST or
GET from / or /RPC2 or /blahblahblah with the same results.
Security scanners that look for /cgi-bin/phf will therefore report
lots of vulnerabilities.
Fix: add a .rpc_paths attribute to the SimpleXMLRPCServer class,
and report a 404 error if the path isn't on the allowed list.
Possibly-controversial aspect of this change: the default makes only
'/' and '/RPC2' legal. Maybe this will break people's applications
(though I doubt it). We could just set the default to an empty tuple,
which would exactly match the current behaviour.
........
r46579 | andrew.kuchling | 2006-05-31 16:12:47 +0200 (Wed, 31 May 2006) | 1 line
Mention SimpleXMLRPCServer change
........
r46580 | tim.peters | 2006-05-31 16:28:07 +0200 (Wed, 31 May 2006) | 2 lines
Trimmed trailing whitespace.
........
r46581 | tim.peters | 2006-05-31 17:33:22 +0200 (Wed, 31 May 2006) | 4 lines
_range_error(): Speed and simplify (there's no real need for
loops here). Assert that size_t is actually big enough, and
that f->size is at least one. Wrap a long line.
........
r46582 | tim.peters | 2006-05-31 17:34:37 +0200 (Wed, 31 May 2006) | 2 lines
Repaired error in new comment.
........
r46584 | neal.norwitz | 2006-06-01 07:32:49 +0200 (Thu, 01 Jun 2006) | 4 lines
Remove ; at end of macro. There was a compiler recently that warned
about extra semi-colons. It may have been the HP C compiler.
This file will trigger a bunch of those warnings now.
........
r46585 | georg.brandl | 2006-06-01 08:39:19 +0200 (Thu, 01 Jun 2006) | 3 lines
Correctly unpickle 2.4 exceptions via __setstate__ (patch #1498571)
........
r46586 | georg.brandl | 2006-06-01 10:27:32 +0200 (Thu, 01 Jun 2006) | 3 lines
Correctly allocate complex types with tp_alloc. (bug #1498638)
........
r46587 | georg.brandl | 2006-06-01 14:30:46 +0200 (Thu, 01 Jun 2006) | 2 lines
Correctly dispatch Faults in loads (patch #1498627)
........
r46588 | georg.brandl | 2006-06-01 15:00:49 +0200 (Thu, 01 Jun 2006) | 3 lines
Some code style tweaks, and remove apply.
........
r46589 | armin.rigo | 2006-06-01 15:19:12 +0200 (Thu, 01 Jun 2006) | 5 lines
[ 1497053 ] Let dicts propagate the exceptions in user __eq__().
[ 1456209 ] dictresize() vulnerability ( <- backport candidate ).
........
r46590 | tim.peters | 2006-06-01 15:41:46 +0200 (Thu, 01 Jun 2006) | 2 lines
Whitespace normalization.
........
r46591 | tim.peters | 2006-06-01 15:49:23 +0200 (Thu, 01 Jun 2006) | 2 lines
Record bugs 1275608 and 1456209 as being fixed.
........
r46592 | tim.peters | 2006-06-01 15:56:26 +0200 (Thu, 01 Jun 2006) | 5 lines
Re-enable a new empty-string test added during the NFS sprint,
but disabled then because str and unicode strings gave different
results. The implementations were repaired later during the
sprint, but the new test remained disabled.
........
r46594 | tim.peters | 2006-06-01 17:50:44 +0200 (Thu, 01 Jun 2006) | 7 lines
Armin committed his patch while I was reviewing it (I'm sure
he didn't know this), so merged in some changes I made during
review. Nothing material apart from changing a new `mask` local
from int to Py_ssize_t. Mostly this is repairing comments that
were made incorrect, and adding new comments. Also a few
minor code rewrites for clarity or helpful succinctness.
........
r46599 | neal.norwitz | 2006-06-02 06:45:53 +0200 (Fri, 02 Jun 2006) | 1 line
Convert docstrings to comments so regrtest -v prints method names
........
r46600 | neal.norwitz | 2006-06-02 06:50:49 +0200 (Fri, 02 Jun 2006) | 2 lines
Fix memory leak found by valgrind.
........
r46601 | neal.norwitz | 2006-06-02 06:54:52 +0200 (Fri, 02 Jun 2006) | 1 line
More memory leaks from valgrind
........
r46602 | neal.norwitz | 2006-06-02 08:23:00 +0200 (Fri, 02 Jun 2006) | 11 lines
Patch #1357836:
Prevent an invalid memory read from test_coding in case the done flag is set.
In that case, the loop isn't entered. I wonder if rather than setting
the done flag in the cases before the loop, if they should just exit early.
This code looks like it should be refactored.
Backport candidate (also the early break above if decoding_fgets fails)
........
r46603 | martin.blais | 2006-06-02 15:03:43 +0200 (Fri, 02 Jun 2006) | 1 line
Fixed struct test to not use unittest.
........
r46605 | tim.peters | 2006-06-03 01:22:51 +0200 (Sat, 03 Jun 2006) | 10 lines
pprint functions used to sort a dict (by key) if and only if
the output required more than one line. "Small" dicts got
displayed in seemingly random order (the hash-induced order
produced by dict.__repr__). None of this was documented.
Now pprint functions always sort dicts by key, and the docs
promise it.
This was proposed and agreed to during the PyCon 2006 core
sprint -- I just didn't have time for it before now.
........
2006-06-08 14:42:34 +00:00
|
|
|
{"load", marshal_load, METH_O},
|
2002-03-31 14:37:44 +00:00
|
|
|
{"dumps", marshal_dumps, METH_VARARGS},
|
|
|
|
{"loads", marshal_loads, METH_VARARGS},
|
1991-06-04 19:42:30 +00:00
|
|
|
{NULL, NULL} /* sentinel */
|
|
|
|
};
|
|
|
|
|
2003-09-04 11:59:50 +00:00
|
|
|
PyMODINIT_FUNC
|
2000-07-22 18:47:25 +00:00
|
|
|
PyMarshal_Init(void)
|
1991-06-04 19:42:30 +00:00
|
|
|
{
|
2004-06-27 16:51:46 +00:00
|
|
|
PyObject *mod = Py_InitModule("marshal", marshal_methods);
|
2006-01-19 06:09:39 +00:00
|
|
|
if (mod == NULL)
|
|
|
|
return;
|
2004-06-27 16:51:46 +00:00
|
|
|
PyModule_AddIntConstant(mod, "version", Py_MARSHAL_VERSION);
|
1991-06-04 19:42:30 +00:00
|
|
|
}
|