Mailman 3 October 2011 - Python-checkins

cpython (3.2): document turtle done() function; thanks to Csaba Szepesvari from docs@
by sandro.tosi 31 Oct '11

31 Oct '11

http://hg.python.org/cpython/rev/e23baae539f7 changeset: 73240:e23baae539f7 branch: 3.2 parent: 73233:9fbf79d6be56 user: Sandro Tosi <sandro.tosi(a)gmail.com> date: Mon Oct 31 10:12:43 2011 +0100 summary: document turtle done() function; thanks to Csaba Szepesvari from docs@ files: Doc/library/turtle.rst | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/Doc/library/turtle.rst b/Doc/library/turtle.rst --- a/Doc/library/turtle.rst +++ b/Doc/library/turtle.rst @@ -204,7 +204,7 @@ | :func:`onkeypress` | :func:`onclick` | :func:`onscreenclick` | :func:`ontimer` - | :func:`mainloop` + | :func:`mainloop` | :func:`done` Settings and special methods | :func:`mode` @@ -1773,6 +1773,7 @@ .. function:: mainloop() + done() Starts event loop - calling Tkinter's mainloop function. Must be the last statement in a turtle graphics program. -- Repository URL: http://hg.python.org/cpython

1 0

cpython: Drop unused variable.
by martin.v.loewis 31 Oct '11

31 Oct '11

http://hg.python.org/cpython/rev/101919aba8d6 changeset: 73238:101919aba8d6 user: Martin v. Löwis <martin(a)v.loewis.de> date: Mon Oct 31 09:05:10 2011 +0100 summary: Drop unused variable. files: Modules/zipimport.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/Modules/zipimport.c b/Modules/zipimport.c --- a/Modules/zipimport.c +++ b/Modules/zipimport.c @@ -439,7 +439,6 @@ ZipImporter *self = (ZipImporter *)obj; PyObject *path, *key; #ifdef ALTSEP - PyObject *tmp; _Py_IDENTIFIER(replace); #endif PyObject *toc_entry; -- Repository URL: http://hg.python.org/cpython

1 0

cpython: Fix typo.
by martin.v.loewis 31 Oct '11

31 Oct '11

http://hg.python.org/cpython/rev/4df454a9753f changeset: 73237:4df454a9753f user: Martin v. Löwis <martin(a)v.loewis.de> date: Mon Oct 31 09:01:22 2011 +0100 summary: Fix typo. files: Modules/zipimport.c | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/Modules/zipimport.c b/Modules/zipimport.c --- a/Modules/zipimport.c +++ b/Modules/zipimport.c @@ -87,8 +87,7 @@ } #ifdef ALTSEP - tmp = PyObject_CallMethodId(path, &PyId_replace, "CC", - ALTSEP, SEP); + tmp = _PyObject_CallMethodId(path, &PyId_replace, "CC", ALTSEP, SEP); if (!tmp) goto error; Py_DECREF(path); @@ -450,7 +449,7 @@ return NULL; #ifdef ALTSEP - path = PyObject_CallMethodId(path, &PyId_replace, "CC", ALTSEP, SEP); + path = _PyObject_CallMethodId(path, &PyId_replace, "CC", ALTSEP, SEP); if (!path) return NULL; #else -- Repository URL: http://hg.python.org/cpython

1 0

cpython: Drop Py_UCS4_ functions. Closes #13246.
by martin.v.loewis 31 Oct '11

31 Oct '11

http://hg.python.org/cpython/rev/80a7ab9ac29f changeset: 73236:80a7ab9ac29f user: Martin v. Löwis <martin(a)v.loewis.de> date: Mon Oct 31 08:40:56 2011 +0100 summary: Drop Py_UCS4_ functions. Closes #13246. files: Include/unicodeobject.h | 37 ---------- Objects/unicodeobject.c | 100 +++++++++++++++++++++++++-- Objects/uniops.h | 91 ------------------------- 3 files changed, 90 insertions(+), 138 deletions(-) diff --git a/Include/unicodeobject.h b/Include/unicodeobject.h --- a/Include/unicodeobject.h +++ b/Include/unicodeobject.h @@ -1984,43 +1984,6 @@ Py_UNICODE c ); -PyAPI_FUNC(size_t) Py_UCS4_strlen( - const Py_UCS4 *u - ); - -PyAPI_FUNC(Py_UCS4*) Py_UCS4_strcpy( - Py_UCS4 *s1, - const Py_UCS4 *s2); - -PyAPI_FUNC(Py_UCS4*) Py_UCS4_strcat( - Py_UCS4 *s1, const Py_UCS4 *s2); - -PyAPI_FUNC(Py_UCS4*) Py_UCS4_strncpy( - Py_UCS4 *s1, - const Py_UCS4 *s2, - size_t n); - -PyAPI_FUNC(int) Py_UCS4_strcmp( - const Py_UCS4 *s1, - const Py_UCS4 *s2 - ); - -PyAPI_FUNC(int) Py_UCS4_strncmp( - const Py_UCS4 *s1, - const Py_UCS4 *s2, - size_t n - ); - -PyAPI_FUNC(Py_UCS4*) Py_UCS4_strchr( - const Py_UCS4 *s, - Py_UCS4 c - ); - -PyAPI_FUNC(Py_UCS4*) Py_UCS4_strrchr( - const Py_UCS4 *s, - Py_UCS4 c - ); - /* Create a copy of a unicode string ending with a nul character. Return NULL and raise a MemoryError exception on memory allocation failure, otherwise return a new allocated buffer (use PyMem_Free() to free the buffer). */ diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c --- a/Objects/unicodeobject.c +++ b/Objects/unicodeobject.c @@ -14195,16 +14195,96 @@ return (PyObject *)it; } -#define UNIOP(x) Py_UNICODE_##x -#define UNIOP_t Py_UNICODE -#include "uniops.h" -#undef UNIOP -#undef UNIOP_t -#define UNIOP(x) Py_UCS4_##x -#define UNIOP_t Py_UCS4 -#include "uniops.h" -#undef UNIOP -#undef UNIOP_t + +size_t +Py_UNICODE_strlen(const Py_UNICODE *u) +{ + int res = 0; + while(*u++) + res++; + return res; +} + +Py_UNICODE* +Py_UNICODE_strcpy(Py_UNICODE *s1, const Py_UNICODE *s2) +{ + Py_UNICODE *u = s1; + while ((*u++ = *s2++)); + return s1; +} + +Py_UNICODE* +Py_UNICODE_strncpy(Py_UNICODE *s1, const Py_UNICODE *s2, size_t n) +{ + Py_UNICODE *u = s1; + while ((*u++ = *s2++)) + if (n-- == 0) + break; + return s1; +} + +Py_UNICODE* +Py_UNICODE_strcat(Py_UNICODE *s1, const Py_UNICODE *s2) +{ + Py_UNICODE *u1 = s1; + u1 += Py_UNICODE_strlen(u1); + Py_UNICODE_strcpy(u1, s2); + return s1; +} + +int +Py_UNICODE_strcmp(const Py_UNICODE *s1, const Py_UNICODE *s2) +{ + while (*s1 && *s2 && *s1 == *s2) + s1++, s2++; + if (*s1 && *s2) + return (*s1 < *s2) ? -1 : +1; + if (*s1) + return 1; + if (*s2) + return -1; + return 0; +} + +int +Py_UNICODE_strncmp(const Py_UNICODE *s1, const Py_UNICODE *s2, size_t n) +{ + register Py_UNICODE u1, u2; + for (; n != 0; n--) { + u1 = *s1; + u2 = *s2; + if (u1 != u2) + return (u1 < u2) ? -1 : +1; + if (u1 == '\0') + return 0; + s1++; + s2++; + } + return 0; +} + +Py_UNICODE* +Py_UNICODE_strchr(const Py_UNICODE *s, Py_UNICODE c) +{ + const Py_UNICODE *p; + for (p = s; *p; p++) + if (*p == c) + return (Py_UNICODE*)p; + return NULL; +} + +Py_UNICODE* +Py_UNICODE_strrchr(const Py_UNICODE *s, Py_UNICODE c) +{ + const Py_UNICODE *p; + p = s + Py_UNICODE_strlen(s); + while (p != s) { + p--; + if (*p == c) + return (Py_UNICODE*)p; + } + return NULL; +} Py_UNICODE* PyUnicode_AsUnicodeCopy(PyObject *unicode) diff --git a/Objects/uniops.h b/Objects/uniops.h deleted file mode 100644 --- a/Objects/uniops.h +++ /dev/null @@ -1,91 +0,0 @@ - -size_t -UNIOP(strlen)(const UNIOP_t *u) -{ - int res = 0; - while(*u++) - res++; - return res; -} - -UNIOP_t* -UNIOP(strcpy)(UNIOP_t *s1, const UNIOP_t *s2) -{ - UNIOP_t *u = s1; - while ((*u++ = *s2++)); - return s1; -} - -UNIOP_t* -UNIOP(strncpy)(UNIOP_t *s1, const UNIOP_t *s2, size_t n) -{ - UNIOP_t *u = s1; - while ((*u++ = *s2++)) - if (n-- == 0) - break; - return s1; -} - -UNIOP_t* -UNIOP(strcat)(UNIOP_t *s1, const UNIOP_t *s2) -{ - UNIOP_t *u1 = s1; - u1 += UNIOP(strlen(u1)); - UNIOP(strcpy(u1, s2)); - return s1; -} - -int -UNIOP(strcmp)(const UNIOP_t *s1, const UNIOP_t *s2) -{ - while (*s1 && *s2 && *s1 == *s2) - s1++, s2++; - if (*s1 && *s2) - return (*s1 < *s2) ? -1 : +1; - if (*s1) - return 1; - if (*s2) - return -1; - return 0; -} - -int -UNIOP(strncmp)(const UNIOP_t *s1, const UNIOP_t *s2, size_t n) -{ - register UNIOP_t u1, u2; - for (; n != 0; n--) { - u1 = *s1; - u2 = *s2; - if (u1 != u2) - return (u1 < u2) ? -1 : +1; - if (u1 == '\0') - return 0; - s1++; - s2++; - } - return 0; -} - -UNIOP_t* -UNIOP(strchr)(const UNIOP_t *s, UNIOP_t c) -{ - const UNIOP_t *p; - for (p = s; *p; p++) - if (*p == c) - return (UNIOP_t*)p; - return NULL; -} - -UNIOP_t* -UNIOP(strrchr)(const UNIOP_t *s, UNIOP_t c) -{ - const UNIOP_t *p; - p = s + UNIOP(strlen)(s); - while (p != s) { - p--; - if (*p == c) - return (UNIOP_t*)p; - } - return NULL; -} - -- Repository URL: http://hg.python.org/cpython

1 0

cpython: Replace Py_UCS4_ API with Unicode API.
by martin.v.loewis 31 Oct '11

31 Oct '11

http://hg.python.org/cpython/rev/6d19a7c713a8 changeset: 73235:6d19a7c713a8 user: Martin v. Löwis <martin(a)v.loewis.de> date: Mon Oct 31 08:33:37 2011 +0100 summary: Replace Py_UCS4_ API with Unicode API. files: Modules/zipimport.c | 220 +++++++++++++------------------ 1 files changed, 90 insertions(+), 130 deletions(-) diff --git a/Modules/zipimport.c b/Modules/zipimport.c --- a/Modules/zipimport.c +++ b/Modules/zipimport.c @@ -63,115 +63,110 @@ static int zipimporter_init(ZipImporter *self, PyObject *args, PyObject *kwds) { - PyObject *pathobj, *files; - Py_UCS4 *path, *p, *prefix, buf[MAXPATHLEN+2]; - Py_ssize_t len; + PyObject *path, *files, *tmp; + PyObject *filename = NULL; + Py_ssize_t len, flen; +#ifdef ALTSEP + _Py_IDENTIFIER(replace); +#endif if (!_PyArg_NoKeywords("zipimporter()", kwds)) return -1; if (!PyArg_ParseTuple(args, "O&:zipimporter", - PyUnicode_FSDecoder, &pathobj)) + PyUnicode_FSDecoder, &path)) return -1; - if (PyUnicode_READY(pathobj) == -1) + if (PyUnicode_READY(path) == -1) return -1; - /* copy path to buf */ - len = PyUnicode_GET_LENGTH(pathobj); + len = PyUnicode_GET_LENGTH(path); if (len == 0) { PyErr_SetString(ZipImportError, "archive path is empty"); goto error; } - if (len >= MAXPATHLEN) { - PyErr_SetString(ZipImportError, - "archive path too long"); - goto error; - } - if (!PyUnicode_AsUCS4(pathobj, buf, Py_ARRAY_LENGTH(buf), 1)) - goto error; #ifdef ALTSEP - for (p = buf; *p; p++) { - if (*p == ALTSEP) - *p = SEP; - } + tmp = PyObject_CallMethodId(path, &PyId_replace, "CC", + ALTSEP, SEP); + if (!tmp) + goto error; + Py_DECREF(path); + path = tmp; #endif - path = NULL; - prefix = NULL; + filename = path; + Py_INCREF(filename); + flen = len; for (;;) { struct stat statbuf; int rv; - if (pathobj == NULL) { - pathobj = PyUnicode_FromKindAndData(PyUnicode_4BYTE_KIND, - buf, len); - if (pathobj == NULL) - goto error; - } - rv = _Py_stat(pathobj, &statbuf); + rv = _Py_stat(filename, &statbuf); if (rv == 0) { /* it exists */ - if (S_ISREG(statbuf.st_mode)) - /* it's a file */ - path = buf; + if (!S_ISREG(statbuf.st_mode)) + /* it's a not file */ + Py_CLEAR(filename); break; } else if (PyErr_Occurred()) goto error; + Py_CLEAR(filename); /* back up one path element */ - p = Py_UCS4_strrchr(buf, SEP); - if (prefix != NULL) - *prefix = SEP; - if (p == NULL) + flen = PyUnicode_FindChar(path, SEP, 0, flen, -1); + if (flen == -1) break; - *p = '\0'; - len = p - buf; - prefix = p; - Py_CLEAR(pathobj); + filename = PyUnicode_Substring(path, 0, flen); } - if (path == NULL) { + if (filename == NULL) { PyErr_SetString(ZipImportError, "not a Zip file"); goto error; } - files = PyDict_GetItem(zip_directory_cache, pathobj); + if (PyUnicode_READY(filename) < 0) + goto error; + + files = PyDict_GetItem(zip_directory_cache, filename); if (files == NULL) { - files = read_directory(pathobj); + files = read_directory(filename); if (files == NULL) goto error; - if (PyDict_SetItem(zip_directory_cache, pathobj, files) != 0) + if (PyDict_SetItem(zip_directory_cache, filename, files) != 0) goto error; } else Py_INCREF(files); self->files = files; - self->archive = pathobj; - pathobj = NULL; + /* Transfer reference */ + self->archive = filename; + filename = NULL; - if (prefix != NULL) { - prefix++; - len = Py_UCS4_strlen(prefix); - if (prefix[len-1] != SEP) { + /* Check if there is a prefix directory following the filename. */ + if (flen != len) { + tmp = PyUnicode_Substring(path, flen+1, + PyUnicode_GET_LENGTH(path)); + if (tmp == NULL) + goto error; + self->prefix = tmp; + if (PyUnicode_READ_CHAR(path, len-1) != SEP) { /* add trailing SEP */ - prefix[len] = SEP; - prefix[len + 1] = '\0'; - len++; + tmp = PyUnicode_FromFormat("%U%c", self->prefix, SEP); + if (tmp == NULL) + goto error; + Py_DECREF(self->prefix); + self->prefix = tmp; } } else - len = 0; - self->prefix = PyUnicode_FromKindAndData(PyUnicode_4BYTE_KIND, - prefix, len); - if (self->prefix == NULL) - goto error; - + self->prefix = PyUnicode_New(0, 0); + Py_DECREF(path); return 0; error: - Py_XDECREF(pathobj); + Py_DECREF(path); + Py_XDECREF(filename); return -1; } @@ -211,26 +206,16 @@ static PyObject * get_subname(PyObject *fullname) { - Py_ssize_t len; - Py_UCS4 *subname, *fullname_ucs4; - fullname_ucs4 = PyUnicode_AsUCS4Copy(fullname); - if (!fullname_ucs4) + Py_ssize_t len, dot; + if (PyUnicode_READY(fullname) < 0) return NULL; - subname = Py_UCS4_strrchr(fullname_ucs4, '.'); - if (subname == NULL) { - PyMem_Free(fullname_ucs4); + len = PyUnicode_GET_LENGTH(fullname); + dot = PyUnicode_FindChar(fullname, '.', 0, len, -1); + if (dot == -1) { Py_INCREF(fullname); return fullname; - } else { - PyObject *result; - subname++; - len = PyUnicode_GET_LENGTH(fullname); - len -= subname - fullname_ucs4; - result = PyUnicode_FromKindAndData(PyUnicode_4BYTE_KIND, - subname, len); - PyMem_Free(fullname_ucs4); - return result; - } + } else + return PyUnicode_Substring(fullname, dot+1, len); } /* Given a (sub)modulename, write the potential file path in the @@ -453,58 +438,51 @@ zipimporter_get_data(PyObject *obj, PyObject *args) { ZipImporter *self = (ZipImporter *)obj; - PyObject *pathobj, *key; - const Py_UCS4 *path; + PyObject *path, *key; #ifdef ALTSEP - Py_UCS4 *p; + PyObject *tmp; + _Py_IDENTIFIER(replace); #endif PyObject *toc_entry; - Py_ssize_t path_len, len; - Py_UCS4 buf[MAXPATHLEN + 1], archive[MAXPATHLEN + 1]; + Py_ssize_t path_start, path_len, len; - if (!PyArg_ParseTuple(args, "U:zipimporter.get_data", &pathobj)) + if (!PyArg_ParseTuple(args, "U:zipimporter.get_data", &path)) return NULL; - if (PyUnicode_READY(pathobj) == -1) +#ifdef ALTSEP + path = PyObject_CallMethodId(path, &PyId_replace, "CC", ALTSEP, SEP); + if (!path) return NULL; +#else + Py_INCREF(path); +#endif + if (PyUnicode_READY(path) == -1) + goto error; - path_len = PyUnicode_GET_LENGTH(pathobj); - if (path_len >= MAXPATHLEN) { - PyErr_SetString(ZipImportError, "path too long"); - return NULL; - } - if (!PyUnicode_AsUCS4(pathobj, buf, Py_ARRAY_LENGTH(buf), 1)) - return NULL; - path = buf; -#ifdef ALTSEP - for (p = buf; *p; p++) { - if (*p == ALTSEP) - *p = SEP; - } -#endif + path_len = PyUnicode_GET_LENGTH(path); + len = PyUnicode_GET_LENGTH(self->archive); - if ((size_t)len < Py_UCS4_strlen(path)) { - if (!PyUnicode_AsUCS4(self->archive, archive, Py_ARRAY_LENGTH(archive), 1)) - return NULL; - if (Py_UCS4_strncmp(path, archive, len) == 0 && - path[len] == SEP) { - path += len + 1; - path_len -= len + 1; - } + path_start = 0; + if (PyUnicode_Tailmatch(path, self->archive, 0, len, -1) + && PyUnicode_READ_CHAR(path, len) == SEP) { + path_start = len + 1; } - key = PyUnicode_FromKindAndData(PyUnicode_4BYTE_KIND, - path, path_len); + key = PyUnicode_Substring(path, path_start, path_len); if (key == NULL) - return NULL; + goto error; toc_entry = PyDict_GetItem(self->files, key); if (toc_entry == NULL) { PyErr_SetFromErrnoWithFilenameObject(PyExc_IOError, key); Py_DECREF(key); - return NULL; + goto error; } Py_DECREF(key); + Py_DECREF(path); return get_data(self->archive, toc_entry); + error: + Py_DECREF(path); + return NULL; } static PyObject * @@ -756,24 +734,14 @@ long header_offset, name_size, header_size, header_position; long l, count; Py_ssize_t i; - size_t length; - Py_UCS4 path[MAXPATHLEN + 5]; char name[MAXPATHLEN + 5]; PyObject *nameobj = NULL; char *p, endof_central_dir[22]; long arc_offset; /* offset from beginning of file to start of zip-archive */ - PyObject *pathobj; + PyObject *path; const char *charset; int bootstrap; - if (PyUnicode_GET_LENGTH(archive) > MAXPATHLEN) { - PyErr_SetString(PyExc_OverflowError, - "Zip path name is too long"); - return NULL; - } - if (!PyUnicode_AsUCS4(archive, path, Py_ARRAY_LENGTH(path), 1)) - return NULL; - fp = _Py_fopen(archive, "rb"); if (fp == NULL) { PyErr_Format(ZipImportError, "can't open Zip file: %R", archive); @@ -802,9 +770,6 @@ if (files == NULL) goto error; - length = Py_UCS4_strlen(path); - path[length] = SEP; - /* Start of Central Directory */ count = 0; for (;;) { @@ -868,15 +833,10 @@ PY_MAJOR_VERSION, PY_MINOR_VERSION); goto error; } - for (i = 0; (i < (MAXPATHLEN - (Py_ssize_t)length - 1)) && - (i < PyUnicode_GET_LENGTH(nameobj)); i++) - path[length + 1 + i] = PyUnicode_READ_CHAR(nameobj, i); - path[length + 1 + i] = 0; - pathobj = PyUnicode_FromKindAndData(PyUnicode_4BYTE_KIND, - path, Py_UCS4_strlen(path)); - if (pathobj == NULL) + path = PyUnicode_FromFormat("%U%c%U", archive, SEP, nameobj); + if (path == NULL) goto error; - t = Py_BuildValue("Niiiiiii", pathobj, compress, data_size, + t = Py_BuildValue("Niiiiiii", path, compress, data_size, file_size, file_offset, time, date, crc); if (t == NULL) goto error; -- Repository URL: http://hg.python.org/cpython

1 0

Daily reference leaks (66c16de4ab9d): sum=0
by solipsis＠pitrou.net 30 Oct '11

30 Oct '11

results for 66c16de4ab9d on branch "default" -------------------------------------------- Command line was: ['./python', '-m', 'test.regrtest', '-uall', '-R', '3:3:/home/antoine/cpython/refleaks/reflog7A0Fr2', '-x']

1 0

cpython (merge 3.2 -> default): Issue 13296: Fix IDLE to clear compile __future__ flags on shell restart.
by ned.deily 30 Oct '11

30 Oct '11

http://hg.python.org/cpython/rev/d8acd4344ce9 changeset: 73234:d8acd4344ce9 parent: 73231:66c16de4ab9d parent: 73233:9fbf79d6be56 user: Ned Deily <nad(a)acm.org> date: Sun Oct 30 20:05:30 2011 -0700 summary: Issue 13296: Fix IDLE to clear compile __future__ flags on shell restart. (Patch by Roger Serwy) files: Lib/idlelib/PyShell.py | 2 ++ Misc/NEWS | 3 +++ 2 files changed, 5 insertions(+), 0 deletions(-) diff --git a/Lib/idlelib/PyShell.py b/Lib/idlelib/PyShell.py --- a/Lib/idlelib/PyShell.py +++ b/Lib/idlelib/PyShell.py @@ -340,6 +340,7 @@ self.restarting = False self.subprocess_arglist = None self.port = PORT + self.original_compiler_flags = self.compile.compiler.flags rpcclt = None rpcsubproc = None @@ -447,6 +448,7 @@ gui = RemoteDebugger.restart_subprocess_debugger(self.rpcclt) # reload remote debugger breakpoints for all PyShellEditWindows debug.load_breakpoints() + self.compile.compiler.flags = self.original_compiler_flags self.restarting = False return self.rpcclt diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -347,6 +347,9 @@ Library ------- +- Issue 13296: Fix IDLE to clear compile __future__ flags on shell restart. + (Patch by Roger Serwy) + - Fix the xmlrpc.client user agent to return something similar to urllib.request user agent: "Python-xmlrpc/3.3". -- Repository URL: http://hg.python.org/cpython

1 0

cpython (2.7): Issue 13296: Fix IDLE to clear compile __future__ flags on shell restart.
by ned.deily 30 Oct '11

30 Oct '11

http://hg.python.org/cpython/rev/87251608cb64 changeset: 73232:87251608cb64 branch: 2.7 parent: 73229:b7e966b7c880 user: Ned Deily <nad(a)acm.org> date: Sun Oct 30 19:58:04 2011 -0700 summary: Issue 13296: Fix IDLE to clear compile __future__ flags on shell restart. (Patch by Roger Serwy) files: Lib/idlelib/PyShell.py | 2 ++ Misc/NEWS | 3 +++ 2 files changed, 5 insertions(+), 0 deletions(-) diff --git a/Lib/idlelib/PyShell.py b/Lib/idlelib/PyShell.py --- a/Lib/idlelib/PyShell.py +++ b/Lib/idlelib/PyShell.py @@ -344,6 +344,7 @@ self.restarting = False self.subprocess_arglist = None self.port = PORT + self.original_compiler_flags = self.compile.compiler.flags rpcclt = None rpcpid = None @@ -459,6 +460,7 @@ gui = RemoteDebugger.restart_subprocess_debugger(self.rpcclt) # reload remote debugger breakpoints for all PyShellEditWindows debug.load_breakpoints() + self.compile.compiler.flags = self.original_compiler_flags self.restarting = False return self.rpcclt diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -74,6 +74,9 @@ Library ------- +- Issue 13296: Fix IDLE to clear compile __future__ flags on shell restart. + (Patch by Roger Serwy) + - Issue #7334: close source files on ElementTree.parse and iterparse. - Issue #13232: logging: Improved logging of exceptions in the presence of -- Repository URL: http://hg.python.org/cpython

1 0

cpython (3.2): Issue 13296: Fix IDLE to clear compile __future__ flags on shell restart.
by ned.deily 30 Oct '11

30 Oct '11

http://hg.python.org/cpython/rev/9fbf79d6be56 changeset: 73233:9fbf79d6be56 branch: 3.2 parent: 73230:bc16d1300ee1 user: Ned Deily <nad(a)acm.org> date: Sun Oct 30 20:01:35 2011 -0700 summary: Issue 13296: Fix IDLE to clear compile __future__ flags on shell restart. (Patch by Roger Serwy) files: Lib/idlelib/PyShell.py | 2 ++ Misc/NEWS | 3 +++ 2 files changed, 5 insertions(+), 0 deletions(-) diff --git a/Lib/idlelib/PyShell.py b/Lib/idlelib/PyShell.py --- a/Lib/idlelib/PyShell.py +++ b/Lib/idlelib/PyShell.py @@ -340,6 +340,7 @@ self.restarting = False self.subprocess_arglist = None self.port = PORT + self.original_compiler_flags = self.compile.compiler.flags rpcclt = None rpcsubproc = None @@ -447,6 +448,7 @@ gui = RemoteDebugger.restart_subprocess_debugger(self.rpcclt) # reload remote debugger breakpoints for all PyShellEditWindows debug.load_breakpoints() + self.compile.compiler.flags = self.original_compiler_flags self.restarting = False return self.rpcclt diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -66,6 +66,9 @@ Library ------- +- Issue 13296: Fix IDLE to clear compile __future__ flags on shell restart. + (Patch by Roger Serwy) + - Issue #13293: Better error message when trying to marshal bytes using xmlrpc.client. -- Repository URL: http://hg.python.org/cpython

1 0

cpython (3.2): caught is the right pp of catch; thanks to Don Bennett from docs@
by sandro.tosi 30 Oct '11

30 Oct '11

http://hg.python.org/cpython/rev/bc16d1300ee1 changeset: 73230:bc16d1300ee1 branch: 3.2 parent: 73225:0effb28d52e2 user: Sandro Tosi <sandro.tosi(a)gmail.com> date: Mon Oct 31 02:41:06 2011 +0100 summary: caught is the right pp of catch; thanks to Don Bennett from docs@ files: Doc/includes/sqlite3/ctx_manager.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Doc/includes/sqlite3/ctx_manager.py b/Doc/includes/sqlite3/ctx_manager.py --- a/Doc/includes/sqlite3/ctx_manager.py +++ b/Doc/includes/sqlite3/ctx_manager.py @@ -8,7 +8,7 @@ con.execute("insert into person(firstname) values (?)", ("Joe",)) # con.rollback() is called after the with block finishes with an exception, the -# exception is still raised and must be catched +# exception is still raised and must be caught try: with con: con.execute("insert into person(firstname) values (?)", ("Joe",)) -- Repository URL: http://hg.python.org/cpython

1 0