Mailman 3 October 2007 - Python-checkins

r58358 - python/branches/alex-py3k/Modules/_picklemodule.c
by alexandre.vassalotti Oct. 8, 2007

Oct. 8, 2007

Author: alexandre.vassalotti Date: Mon Oct 8 03:58:06 2007 New Revision: 58358 Modified: python/branches/alex-py3k/Modules/_picklemodule.c Log: In save_string(), use PyUnicode API for handling object's repr. Modified: python/branches/alex-py3k/Modules/_picklemodule.c ============================================================================== --- python/branches/alex-py3k/Modules/_picklemodule.c (original) +++ python/branches/alex-py3k/Modules/_picklemodule.c Mon Oct 8 03:58:06 2007 @@ -948,9 +948,9 @@ if (!(repr = PyObject_Repr(args))) return -1; - if ((len = PyString_Size(repr)) < 0) + if ((len = PyUnicode_GetSize(repr)) < 0) goto error; - repr_str = PyString_AS_STRING((PyStringObject *)repr); + repr_str = PyUnicode_AsString(repr); if (self->write_func(self, &string, 1) < 0) goto error; @@ -988,7 +988,7 @@ return -1; if (self->write_func(self, - PyString_AS_STRING((PyStringObject *)args), + PyString_AS_STRING(args), size) < 0) return -1; }

1 0

r58357 - python/branches/alex-py3k/Modules/_picklemodule.c
by alexandre.vassalotti Oct. 8, 2007

Oct. 8, 2007

Author: alexandre.vassalotti Date: Mon Oct 8 03:28:05 2007 New Revision: 58357 Modified: python/branches/alex-py3k/Modules/_picklemodule.c Log: Always use save_long() for pickling integers. Delete save_int(). Modified: python/branches/alex-py3k/Modules/_picklemodule.c ============================================================================== --- python/branches/alex-py3k/Modules/_picklemodule.c (original) +++ python/branches/alex-py3k/Modules/_picklemodule.c Mon Oct 8 03:28:05 2007 @@ -787,69 +787,13 @@ } static int -save_int(PicklerObject *self, long l) -{ - char c_str[32]; - int len = 0; - - if (!self->bin -#if SIZEOF_LONG > 4 - || l > 0x7fffffffL || l < -0x80000000L -#endif - ) { - /* Text-mode pickle, or long too big to fit in the 4-byte - * signed BININT format: store as a string. - */ - c_str[0] = INT; - PyOS_snprintf(c_str + 1, sizeof(c_str) - 1, "%ld\n", l); - if (self->write_func(self, c_str, strlen(c_str)) < 0) - return -1; - } - else { - /* Binary pickle and l fits in a signed 4-byte int. */ - c_str[1] = (int)(l & 0xff); - c_str[2] = (int)((l >> 8) & 0xff); - c_str[3] = (int)((l >> 16) & 0xff); - c_str[4] = (int)((l >> 24) & 0xff); - - if ((c_str[4] == 0) && (c_str[3] == 0)) { - if (c_str[2] == 0) { - c_str[0] = BININT1; - len = 2; - } - else { - c_str[0] = BININT2; - len = 3; - } - } - else { - c_str[0] = BININT; - len = 5; - } - - if (self->write_func(self, c_str, len) < 0) - return -1; - } - - return 0; -} - -static int save_long(PicklerObject *self, PyObject *args) { Py_ssize_t size; int res = -1; PyObject *repr = NULL; - long val = PyInt_AsLong(args); static char l = LONG; - if (val == -1 && PyErr_Occurred()) { - /* out of range for int pickling */ - PyErr_Clear(); - } - else - return save_int(self, val); - if (self->proto >= 2) { /* Linear-time pickling. */ size_t nbits;

1 0

r58356 - python/branches/alex-py3k/Modules/_picklemodule.c
by alexandre.vassalotti Oct. 8, 2007

Oct. 8, 2007

Author: alexandre.vassalotti Date: Mon Oct 8 03:24:45 2007 New Revision: 58356 Modified: python/branches/alex-py3k/Modules/_picklemodule.c Log: Load string, from pickle streams produced by older Python versions, as Unicode instead of str8. Clean up variable names and useless goto-statements in load_binstring(), load_short_binstring(), and load_unicode(). Remove #ifdef Py_USING_UNICODE. Modified: python/branches/alex-py3k/Modules/_picklemodule.c ============================================================================== --- python/branches/alex-py3k/Modules/_picklemodule.c (original) +++ python/branches/alex-py3k/Modules/_picklemodule.c Mon Oct 8 03:24:45 2007 @@ -1060,7 +1060,6 @@ return -1; } -#ifdef Py_USING_UNICODE /* A copy of PyUnicode_EncodeRawUnicodeEscape() that also translates backslash and newline characters to \uXXXX escapes. */ static PyObject * @@ -1168,7 +1167,6 @@ Py_XDECREF(repr); return -1; } -#endif /* A helper for save_tuple. Push the len elements in tuple t on the stack. */ static int @@ -1925,7 +1923,6 @@ return -1; } - if (listitems && batch_list(self, listitems) < 0) return -1; @@ -2763,8 +2760,8 @@ static int load_string(UnpicklerObject *self) { - PyObject *str = 0; - int len, res = -1; + PyObject *str = NULL, *ustr = NULL; + int len; char *s, *p; if ((len = self->readline_func(self, &s)) < 0) @@ -2774,7 +2771,6 @@ if (!(s = pystrndup(s, len))) return -1; - /* Strip outermost quotes */ while (s[len - 1] <= ' ') len--; @@ -2788,27 +2784,32 @@ p = s + 1; len -= 2; } - else - goto insecure; + else { + free(s); + PyErr_SetString(PyExc_ValueError, "insecure string pickle"); + return -1; + } + /* Use the PyString API to decode the string, since that is what is used + to encode, and then coerce the result to Unicode. */ str = PyString_DecodeEscape(p, len, NULL, 0, NULL); free(s); - if (str) { - PDATA_PUSH(self->stack, str, -1); - res = 0; - } - return res; + if (str == NULL) + return -1; - insecure: - free(s); - PyErr_SetString(PyExc_ValueError, "insecure string pickle"); - return -1; + ustr = PyObject_Unicode(str); + Py_DECREF(str); + if (ustr == NULL) + return -1; + + PDATA_PUSH(self->stack, ustr, -1); + return 0; } static int load_binstring(UnpicklerObject *self) { - PyObject *py_string = 0; + PyObject *str; long l; char *s; @@ -2820,41 +2821,42 @@ if (self->read_func(self, &s, l) < 0) return -1; - if (!(py_string = PyString_FromStringAndSize(s, l))) + str = PyUnicode_FromStringAndSize(s, l); + if (str == NULL) return -1; - PDATA_PUSH(self->stack, py_string, -1); + PDATA_PUSH(self->stack, str, -1); return 0; } static int load_short_binstring(UnpicklerObject *self) { - PyObject *py_string = 0; + PyObject *str; unsigned char l; char *s; if (self->read_func(self, &s, 1) < 0) return -1; - l = (unsigned char) s[0]; + l = (unsigned char)s[0]; if (self->read_func(self, &s, l) < 0) return -1; - if (!(py_string = PyString_FromStringAndSize(s, l))) + str = PyUnicode_FromStringAndSize(s, l); + if (str == NULL) return -1; - PDATA_PUSH(self->stack, py_string, -1); + PDATA_PUSH(self->stack, str, -1); return 0; } -#ifdef Py_USING_UNICODE static int load_unicode(UnpicklerObject *self) { - PyObject *str = 0; - int len, res = -1; + PyObject *str; + int len; char *s; if ((len = self->readline_func(self, &s)) < 0) @@ -2862,19 +2864,14 @@ if (len < 1) return bad_readline(); - if (!(str = PyUnicode_DecodeRawUnicodeEscape(s, len - 1, NULL))) - goto finally; + str = PyUnicode_DecodeRawUnicodeEscape(s, len - 1, NULL); + if (str == NULL) + return -1; PDATA_PUSH(self->stack, str, -1); return 0; - - finally: - return res; } -#endif - -#ifdef Py_USING_UNICODE static int load_binunicode(UnpicklerObject *self) { @@ -2896,8 +2893,6 @@ PDATA_PUSH(self->stack, unicode, -1); return 0; } -#endif - static int load_tuple(UnpicklerObject *self)

1 0

r58354 - python/branches/pep302_phase2
by brett.cannon Oct. 7, 2007

Oct. 7, 2007

Author: brett.cannon Date: Mon Oct 8 01:47:50 2007 New Revision: 58354 Removed: python/branches/pep302_phase2/ Log: Never went anywhere with this work, thus this branch was never really touched. Besides, attempts to integrate importlib are happening for Py3K in py3k-importlib.

1 0

Python Regression Test Failures doc (1)
by Neal Norwitz Oct. 7, 2007

Oct. 7, 2007

svn update tools/sphinx svn: PROPFIND request failed on '/projects/doctools/trunk/sphinx' svn: PROPFIND of '/projects/doctools/trunk/sphinx': could not connect to server (http://svn.python.org) make: *** [update] Error 1

1 0

buildbot failure in 3.0.msi
by buildbot＠python.org Oct. 7, 2007

Oct. 7, 2007

The Buildbot has detected a new failure of 3.0.msi. Full details are available at: http://www.python.org/dev/buildbot/all/3.0.msi/builds/37 Buildbot URL: http://www.python.org/dev/buildbot/all/ Buildslave for this Build: bolen-windows Build Reason: The Nightly scheduler named '3.0.msi' triggered this build Build Source Stamp: HEAD Blamelist: BUILD FAILED: failed svn sincerely, -The Buildbot

1 0

buildbot failure in 2.6.msi
by buildbot＠python.org Oct. 7, 2007

Oct. 7, 2007

The Buildbot has detected a new failure of 2.6.msi. Full details are available at: http://www.python.org/dev/buildbot/all/2.6.msi/builds/33 Buildbot URL: http://www.python.org/dev/buildbot/all/ Buildslave for this Build: bolen-windows Build Reason: The Nightly scheduler named '2.6.msi' triggered this build Build Source Stamp: HEAD Blamelist: BUILD FAILED: failed svn sincerely, -The Buildbot

1 0

buildbot failure in 2.5.msi
by buildbot＠python.org Oct. 7, 2007

Oct. 7, 2007

The Buildbot has detected a new failure of 2.5.msi. Full details are available at: http://www.python.org/dev/buildbot/all/2.5.msi/builds/30 Buildbot URL: http://www.python.org/dev/buildbot/all/ Buildslave for this Build: bolen-windows Build Reason: The Nightly scheduler named '2.5.msi' triggered this build Build Source Stamp: HEAD Blamelist: BUILD FAILED: failed svn sincerely, -The Buildbot

1 0

Python Regression Test Failures doc (1)
by Neal Norwitz Oct. 7, 2007

Oct. 7, 2007

svn update tools/sphinx svn: PROPFIND request failed on '/projects/doctools/trunk/sphinx' svn: PROPFIND of '/projects/doctools/trunk/sphinx': could not connect to server (http://svn.python.org) make: *** [update] Error 1

1 0

buildbot failure in x86 FreeBSD trunk
by buildbot＠python.org Oct. 6, 2007

Oct. 6, 2007

The Buildbot has detected a new failure of x86 FreeBSD trunk. Full details are available at: http://www.python.org/dev/buildbot/all/x86%20FreeBSD%20trunk/builds/91 Buildbot URL: http://www.python.org/dev/buildbot/all/ Buildslave for this Build: bolen-freebsd Build Reason: Build Source Stamp: [branch trunk] HEAD Blamelist: neal.norwitz BUILD FAILED: failed test Excerpt from the test logfile: Traceback (most recent call last): File "/usr/home/db3l/buildarea/trunk.bolen-freebsd/build/Lib/SocketServer.py", line 222, in handle_request self.process_request(request, client_address) File "/usr/home/db3l/buildarea/trunk.bolen-freebsd/build/Lib/SocketServer.py", line 241, in process_request self.finish_request(request, client_address) File "/usr/home/db3l/buildarea/trunk.bolen-freebsd/build/Lib/SocketServer.py", line 254, in finish_request self.RequestHandlerClass(request, client_address, self) File "/usr/home/db3l/buildarea/trunk.bolen-freebsd/build/Lib/SocketServer.py", line 523, in __init__ self.handle() File "/usr/home/db3l/buildarea/trunk.bolen-freebsd/build/Lib/BaseHTTPServer.py", line 316, in handle self.handle_one_request() File "/usr/home/db3l/buildarea/trunk.bolen-freebsd/build/Lib/BaseHTTPServer.py", line 299, in handle_one_request self.raw_requestline = self.rfile.readline() File "/usr/home/db3l/buildarea/trunk.bolen-freebsd/build/Lib/socket.py", line 366, in readline data = self._sock.recv(self._rbufsize) error: [Errno 35] Resource temporarily unavailable Traceback (most recent call last): File "/usr/home/db3l/buildarea/trunk.bolen-freebsd/build/Lib/SocketServer.py", line 222, in handle_request self.process_request(request, client_address) File "/usr/home/db3l/buildarea/trunk.bolen-freebsd/build/Lib/SocketServer.py", line 241, in process_request self.finish_request(request, client_address) File "/usr/home/db3l/buildarea/trunk.bolen-freebsd/build/Lib/SocketServer.py", line 254, in finish_request self.RequestHandlerClass(request, client_address, self) File "/usr/home/db3l/buildarea/trunk.bolen-freebsd/build/Lib/SocketServer.py", line 523, in __init__ self.handle() File "/usr/home/db3l/buildarea/trunk.bolen-freebsd/build/Lib/BaseHTTPServer.py", line 316, in handle self.handle_one_request() File "/usr/home/db3l/buildarea/trunk.bolen-freebsd/build/Lib/BaseHTTPServer.py", line 299, in handle_one_request self.raw_requestline = self.rfile.readline() File "/usr/home/db3l/buildarea/trunk.bolen-freebsd/build/Lib/socket.py", line 366, in readline data = self._sock.recv(self._rbufsize) error: [Errno 35] Resource temporarily unavailable Traceback (most recent call last): File "/usr/home/db3l/buildarea/trunk.bolen-freebsd/build/Lib/SocketServer.py", line 222, in handle_request self.process_request(request, client_address) File "/usr/home/db3l/buildarea/trunk.bolen-freebsd/build/Lib/SocketServer.py", line 241, in process_request self.finish_request(request, client_address) File "/usr/home/db3l/buildarea/trunk.bolen-freebsd/build/Lib/SocketServer.py", line 254, in finish_request self.RequestHandlerClass(request, client_address, self) File "/usr/home/db3l/buildarea/trunk.bolen-freebsd/build/Lib/SocketServer.py", line 523, in __init__ self.handle() File "/usr/home/db3l/buildarea/trunk.bolen-freebsd/build/Lib/BaseHTTPServer.py", line 316, in handle self.handle_one_request() File "/usr/home/db3l/buildarea/trunk.bolen-freebsd/build/Lib/BaseHTTPServer.py", line 299, in handle_one_request self.raw_requestline = self.rfile.readline() File "/usr/home/db3l/buildarea/trunk.bolen-freebsd/build/Lib/socket.py", line 366, in readline data = self._sock.recv(self._rbufsize) error: [Errno 35] Resource temporarily unavailable 2 tests failed: test_queue test_xmlrpc sincerely, -The Buildbot

1 0