Mailman 3 June 2011 - Python-checkins

cpython (merge 3.2 -> default): (merge 3.2) Issue #12451: doctest.debug_script() doesn't create a temporary
by victor.stinner 30 Jun '11

30 Jun '11

http://hg.python.org/cpython/rev/77c589b27e90 changeset: 71094:77c589b27e90 parent: 71092:3e627877b5a9 parent: 71093:bafc5c7d24b2 user: Victor Stinner <victor.stinner(a)haypocalc.com> date: Thu Jun 30 17:39:17 2011 +0200 summary: (merge 3.2) Issue #12451: doctest.debug_script() doesn't create a temporary file anymore to avoid encoding issues (it used the locale encoding, whereas UTF-8 should be). Remove also an unused import (warnings). files: Lib/doctest.py | 61 ++++++++++++++----------------------- Misc/NEWS | 3 + 2 files changed, 27 insertions(+), 37 deletions(-) diff --git a/Lib/doctest.py b/Lib/doctest.py --- a/Lib/doctest.py +++ b/Lib/doctest.py @@ -92,10 +92,15 @@ ] import __future__ - -import sys, traceback, inspect, linecache, os, re -import unittest, difflib, pdb, tempfile -import warnings +import difflib +import inspect +import linecache +import os +import pdb +import re +import sys +import traceback +import unittest from io import StringIO from collections import namedtuple @@ -2511,39 +2516,21 @@ "Debug a test script. `src` is the script, as a string." import pdb - # Note that tempfile.NameTemporaryFile() cannot be used. As the - # docs say, a file so created cannot be opened by name a second time - # on modern Windows boxes, and exec() needs to open and read it. - srcfilename = tempfile.mktemp(".py", "doctestdebug") - f = open(srcfilename, 'w') - f.write(src) - f.close() - - try: - if globs: - globs = globs.copy() - else: - globs = {} - - if pm: - try: - with open(srcfilename) as f: - exec(f.read(), globs, globs) - except: - print(sys.exc_info()[1]) - p = pdb.Pdb(nosigint=True) - p.reset() - p.interaction(None, sys.exc_info()[2]) - else: - fp = open(srcfilename) - try: - script = fp.read() - finally: - fp.close() - pdb.Pdb(nosigint=True).run("exec(%r)" % script, globs, globs) - - finally: - os.remove(srcfilename) + if globs: + globs = globs.copy() + else: + globs = {} + + if pm: + try: + exec(src, globs, globs) + except: + print(sys.exc_info()[1]) + p = pdb.Pdb(nosigint=True) + p.reset() + p.interaction(None, sys.exc_info()[2]) + else: + pdb.Pdb(nosigint=True).run("exec(%r)" % src, globs, globs) def debug(module, name, pm=False): """Debug a single doctest docstring. diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -200,6 +200,9 @@ Library ------- +- Issue #12451: doctest.debug_script() doesn't create a temporary file + anymore to avoid encoding issues. + - Issue #12451: pydoc.synopsis() now reads the encoding cookie if available, to read the Python script from the right encoding. -- Repository URL: http://hg.python.org/cpython

1 0

cpython (3.2): Issue #12451: doctest.debug_script() doesn't create a temporary file anymore to
by victor.stinner 30 Jun '11

30 Jun '11

http://hg.python.org/cpython/rev/bafc5c7d24b2 changeset: 71093:bafc5c7d24b2 branch: 3.2 parent: 71091:1942f7c8f51c user: Victor Stinner <victor.stinner(a)haypocalc.com> date: Thu Jun 30 17:35:55 2011 +0200 summary: Issue #12451: doctest.debug_script() doesn't create a temporary file anymore to avoid encoding issues (it used the locale encoding, whereas UTF-8 should be). Remove also an unused import (warnings). files: Lib/doctest.py | 61 ++++++++++++++----------------------- Misc/NEWS | 3 + 2 files changed, 27 insertions(+), 37 deletions(-) diff --git a/Lib/doctest.py b/Lib/doctest.py --- a/Lib/doctest.py +++ b/Lib/doctest.py @@ -92,10 +92,15 @@ ] import __future__ - -import sys, traceback, inspect, linecache, os, re -import unittest, difflib, pdb, tempfile -import warnings +import difflib +import inspect +import linecache +import os +import pdb +import re +import sys +import traceback +import unittest from io import StringIO from collections import namedtuple @@ -2509,39 +2514,21 @@ "Debug a test script. `src` is the script, as a string." import pdb - # Note that tempfile.NameTemporaryFile() cannot be used. As the - # docs say, a file so created cannot be opened by name a second time - # on modern Windows boxes, and exec() needs to open and read it. - srcfilename = tempfile.mktemp(".py", "doctestdebug") - f = open(srcfilename, 'w') - f.write(src) - f.close() - - try: - if globs: - globs = globs.copy() - else: - globs = {} - - if pm: - try: - with open(srcfilename) as f: - exec(f.read(), globs, globs) - except: - print(sys.exc_info()[1]) - p = pdb.Pdb(nosigint=True) - p.reset() - p.interaction(None, sys.exc_info()[2]) - else: - fp = open(srcfilename) - try: - script = fp.read() - finally: - fp.close() - pdb.Pdb(nosigint=True).run("exec(%r)" % script, globs, globs) - - finally: - os.remove(srcfilename) + if globs: + globs = globs.copy() + else: + globs = {} + + if pm: + try: + exec(src, globs, globs) + except: + print(sys.exc_info()[1]) + p = pdb.Pdb(nosigint=True) + p.reset() + p.interaction(None, sys.exc_info()[2]) + else: + pdb.Pdb(nosigint=True).run("exec(%r)" % src, globs, globs) def debug(module, name, pm=False): """Debug a single doctest docstring. diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -25,6 +25,9 @@ Library ------- +- Issue #12451: doctest.debug_script() doesn't create a temporary file + anymore to avoid encoding issues. + - Issue #12451: pydoc.synopsis() now reads the encoding cookie if available, to read the Python script from the right encoding. -- Repository URL: http://hg.python.org/cpython

1 0

cpython (merge 3.2 -> default): (merge 3.2) Issue #12451: pydoc.synopsis() now reads the encoding cookie if
by victor.stinner 30 Jun '11

30 Jun '11

http://hg.python.org/cpython/rev/3e627877b5a9 changeset: 71092:3e627877b5a9 parent: 71090:8a7fd54cba01 parent: 71091:1942f7c8f51c user: Victor Stinner <victor.stinner(a)haypocalc.com> date: Thu Jun 30 15:58:29 2011 +0200 summary: (merge 3.2) Issue #12451: pydoc.synopsis() now reads the encoding cookie if available, to read the Python script from the right encoding. files: Lib/pydoc.py | 9 +++++---- Lib/test/test_pydoc.py | 13 ++++++++++++- Misc/NEWS | 3 +++ 3 files changed, 20 insertions(+), 5 deletions(-) diff --git a/Lib/pydoc.py b/Lib/pydoc.py --- a/Lib/pydoc.py +++ b/Lib/pydoc.py @@ -51,16 +51,17 @@ # the current directory is changed with os.chdir(), an incorrect # path will be displayed. -import os -import sys import builtins import imp +import inspect import io -import inspect +import os import pkgutil import platform import re +import sys import time +import tokenize import warnings from collections import deque from reprlib import Repr @@ -221,7 +222,7 @@ if lastupdate < mtime: info = inspect.getmoduleinfo(filename) try: - file = open(filename) + file = tokenize.open(filename) except IOError: # module can't be opened, so skip it return None diff --git a/Lib/test/test_pydoc.py b/Lib/test/test_pydoc.py --- a/Lib/test/test_pydoc.py +++ b/Lib/test/test_pydoc.py @@ -16,7 +16,7 @@ from collections import namedtuple from contextlib import contextmanager from test.support import TESTFN, forget, rmtree, EnvironmentVarGuard, \ - reap_children, captured_output, captured_stdout + reap_children, captured_output, captured_stdout, unlink from test import pydoc_mod @@ -395,6 +395,17 @@ self.assertIn('_replace', helptext) self.assertIn('_asdict', helptext) + def test_synopsis(self): + self.addCleanup(unlink, TESTFN) + for encoding in ('ISO-8859-1', 'UTF-8'): + with open(TESTFN, 'w', encoding=encoding) as script: + if encoding != 'UTF-8': + print('#coding: {}'.format(encoding), file=script) + print('"""line 1: h\xe9', file=script) + print('line 2: hi"""', file=script) + synopsis = pydoc.synopsis(TESTFN, {}) + self.assertEqual(synopsis, 'line 1: h\xe9') + class TestDescriptions(unittest.TestCase): diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -200,6 +200,9 @@ Library ------- +- Issue #12451: pydoc.synopsis() now reads the encoding cookie if available, + to read the Python script from the right encoding. + - Issue #12451: distutils now opens the setup script in binary mode to read the encoding cookie, instead of opening it in UTF-8. -- Repository URL: http://hg.python.org/cpython

1 0

cpython (3.2): Issue #12451: pydoc.synopsis() now reads the encoding cookie if available, to
by victor.stinner 30 Jun '11

30 Jun '11

http://hg.python.org/cpython/rev/1942f7c8f51c changeset: 71091:1942f7c8f51c branch: 3.2 parent: 71089:bd73edea78dc user: Victor Stinner <victor.stinner(a)haypocalc.com> date: Thu Jun 30 15:55:43 2011 +0200 summary: Issue #12451: pydoc.synopsis() now reads the encoding cookie if available, to read the Python script from the right encoding. files: Lib/pydoc.py | 9 +++++---- Lib/test/test_pydoc.py | 13 ++++++++++++- Misc/NEWS | 3 +++ 3 files changed, 20 insertions(+), 5 deletions(-) diff --git a/Lib/pydoc.py b/Lib/pydoc.py --- a/Lib/pydoc.py +++ b/Lib/pydoc.py @@ -57,16 +57,17 @@ # the current directory is changed with os.chdir(), an incorrect # path will be displayed. -import os -import sys import builtins import imp +import inspect import io -import inspect +import os import pkgutil import platform import re +import sys import time +import tokenize import warnings from collections import deque from reprlib import Repr @@ -227,7 +228,7 @@ if lastupdate < mtime: info = inspect.getmoduleinfo(filename) try: - file = open(filename) + file = tokenize.open(filename) except IOError: # module can't be opened, so skip it return None diff --git a/Lib/test/test_pydoc.py b/Lib/test/test_pydoc.py --- a/Lib/test/test_pydoc.py +++ b/Lib/test/test_pydoc.py @@ -16,7 +16,7 @@ from collections import namedtuple from contextlib import contextmanager from test.support import TESTFN, forget, rmtree, EnvironmentVarGuard, \ - reap_children, captured_output, captured_stdout + reap_children, captured_output, captured_stdout, unlink from test import pydoc_mod @@ -389,6 +389,17 @@ self.assertIn('_replace', helptext) self.assertIn('_asdict', helptext) + def test_synopsis(self): + self.addCleanup(unlink, TESTFN) + for encoding in ('ISO-8859-1', 'UTF-8'): + with open(TESTFN, 'w', encoding=encoding) as script: + if encoding != 'UTF-8': + print('#coding: {}'.format(encoding), file=script) + print('"""line 1: h\xe9', file=script) + print('line 2: hi"""', file=script) + synopsis = pydoc.synopsis(TESTFN, {}) + self.assertEqual(synopsis, 'line 1: h\xe9') + class TestDescriptions(unittest.TestCase): diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -25,6 +25,9 @@ Library ------- +- Issue #12451: pydoc.synopsis() now reads the encoding cookie if available, + to read the Python script from the right encoding. + - Issue #12451: distutils now opens the setup script in binary mode to read the encoding cookie, instead of opening it in UTF-8. -- Repository URL: http://hg.python.org/cpython

1 0

cpython (3.2): Issue #12451: distutils now opens the setup script in binary mode to read the
by victor.stinner 30 Jun '11

30 Jun '11

http://hg.python.org/cpython/rev/bd73edea78dc changeset: 71089:bd73edea78dc branch: 3.2 parent: 71080:450209efe272 user: Victor Stinner <victor.stinner(a)haypocalc.com> date: Thu Jun 30 15:40:22 2011 +0200 summary: Issue #12451: distutils now opens the setup script in binary mode to read the encoding cookie, instead of opening it in UTF-8. files: Lib/distutils/core.py | 8 +++----- Misc/NEWS | 3 +++ 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/Lib/distutils/core.py b/Lib/distutils/core.py --- a/Lib/distutils/core.py +++ b/Lib/distutils/core.py @@ -8,7 +8,8 @@ __revision__ = "$Id$" -import sys, os +import os +import sys from distutils.debug import DEBUG from distutils.errors import * @@ -215,11 +216,8 @@ sys.argv[0] = script_name if script_args is not None: sys.argv[1:] = script_args - f = open(script_name) - try: + with open(script_name, 'rb') as f: exec(f.read(), g, l) - finally: - f.close() finally: sys.argv = save_argv _setup_stop_after = None diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -25,6 +25,9 @@ Library ------- +- Issue #12451: distutils now opens the setup script in binary mode to read the + encoding cookie, instead of opening it in UTF-8. + - Issue #9516: On Mac OS X, change Distutils to no longer globally attempt to check or set the MACOSX_DEPLOYMENT_TARGET environment variable for the interpreter process. This could cause failures in non-Distutils subprocesses -- Repository URL: http://hg.python.org/cpython

1 0

cpython (merge 3.2 -> default): (merge 3.2) Issue #12451: distutils now opens the setup script in binary mode
by victor.stinner 30 Jun '11

30 Jun '11

http://hg.python.org/cpython/rev/8a7fd54cba01 changeset: 71090:8a7fd54cba01 parent: 71088:c3b487048a0f parent: 71089:bd73edea78dc user: Victor Stinner <victor.stinner(a)haypocalc.com> date: Thu Jun 30 15:41:56 2011 +0200 summary: (merge 3.2) Issue #12451: distutils now opens the setup script in binary mode to read the encoding cookie, instead of opening it in UTF-8. files: Lib/distutils/core.py | 8 +++----- Misc/NEWS | 3 +++ 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/Lib/distutils/core.py b/Lib/distutils/core.py --- a/Lib/distutils/core.py +++ b/Lib/distutils/core.py @@ -8,7 +8,8 @@ __revision__ = "$Id$" -import sys, os +import os +import sys from distutils.debug import DEBUG from distutils.errors import * @@ -215,11 +216,8 @@ sys.argv[0] = script_name if script_args is not None: sys.argv[1:] = script_args - f = open(script_name) - try: + with open(script_name, 'rb') as f: exec(f.read(), g, l) - finally: - f.close() finally: sys.argv = save_argv _setup_stop_after = None diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -200,6 +200,9 @@ Library ------- +- Issue #12451: distutils now opens the setup script in binary mode to read the + encoding cookie, instead of opening it in UTF-8. + - Issue #9516: On Mac OS X, change Distutils to no longer globally attempt to check or set the MACOSX_DEPLOYMENT_TARGET environment variable for the interpreter process. This could cause failures in non-Distutils subprocesses -- Repository URL: http://hg.python.org/cpython

1 0

cpython: store the current scope on the stack right away
by benjamin.peterson 30 Jun '11

30 Jun '11

http://hg.python.org/cpython/rev/151142c0c5b1 changeset: 71087:151142c0c5b1 parent: 71084:9aa3fcab76f0 user: Benjamin Peterson <benjamin(a)python.org> date: Wed Jun 29 22:52:39 2011 -0500 summary: store the current scope on the stack right away files: Python/symtable.c | 39 ++++++++++++++++------------------ 1 files changed, 18 insertions(+), 21 deletions(-) diff --git a/Python/symtable.c b/Python/symtable.c --- a/Python/symtable.c +++ b/Python/symtable.c @@ -899,17 +899,14 @@ static int symtable_exit_block(struct symtable *st, void *ast) { - Py_ssize_t end; + Py_ssize_t size; - Py_CLEAR(st->st_cur); - end = PyList_GET_SIZE(st->st_stack) - 1; - if (end >= 0) { + st->st_cur = NULL; + size = PyList_GET_SIZE(st->st_stack); + if (size) { st->st_cur = (PySTEntryObject *)PyList_GET_ITEM(st->st_stack, - end); - if (st->st_cur == NULL) - return 0; - Py_INCREF(st->st_cur); - if (PySequence_DelItem(st->st_stack, end) < 0) + size - 2); + if (PyList_SetSlice(st->st_stack, size - 1, size, NULL) < 0) return 0; } return 1; @@ -919,23 +916,23 @@ symtable_enter_block(struct symtable *st, identifier name, _Py_block_ty block, void *ast, int lineno, int col_offset) { - PySTEntryObject *prev = NULL; + PySTEntryObject *prev = NULL, *ste; - if (st->st_cur) { - prev = st->st_cur; - if (PyList_Append(st->st_stack, (PyObject *)st->st_cur) < 0) { - return 0; - } - Py_DECREF(st->st_cur); + ste = ste_new(st, name, block, ast, lineno, col_offset); + if (ste == NULL) + return 0; + if (PyList_Append(st->st_stack, (PyObject *)ste) < 0) { + Py_DECREF(ste); + return 0; } - st->st_cur = ste_new(st, name, block, ast, lineno, col_offset); - if (st->st_cur == NULL) - return 0; + prev = st->st_cur; + /* The entry is owned by the stack. Borrow it for st_cur. */ + Py_DECREF(ste); + st->st_cur = ste; if (block == ModuleBlock) st->st_global = st->st_cur->ste_symbols; if (prev) { - if (PyList_Append(prev->ste_children, - (PyObject *)st->st_cur) < 0) { + if (PyList_Append(prev->ste_children, (PyObject *)ste) < 0) { return 0; } } -- Repository URL: http://hg.python.org/cpython

2 1

cpython (merge default -> default): merge heads
by benjamin.peterson 29 Jun '11

29 Jun '11

http://hg.python.org/cpython/rev/c3b487048a0f changeset: 71088:c3b487048a0f parent: 71087:151142c0c5b1 parent: 71085:6edb7c153105 user: Benjamin Peterson <benjamin(a)python.org> date: Wed Jun 29 22:53:19 2011 -0500 summary: merge heads files: Lib/test/test_cprofile.py | 23 +++++++++++++---------- 1 files changed, 13 insertions(+), 10 deletions(-) diff --git a/Lib/test/test_cprofile.py b/Lib/test/test_cprofile.py --- a/Lib/test/test_cprofile.py +++ b/Lib/test/test_cprofile.py @@ -18,16 +18,19 @@ def test_bad_counter_during_dealloc(self): import _lsprof # Must use a file as StringIO doesn't trigger the bug. - with open(TESTFN, 'w') as file: - sys.stderr = file - try: - obj = _lsprof.Profiler(lambda: int) - obj.enable() - obj = _lsprof.Profiler(1) - obj.disable() - finally: - sys.stderr = sys.__stderr__ - unlink(TESTFN) + orig_stderr = sys.stderr + try: + with open(TESTFN, 'w') as file: + sys.stderr = file + try: + obj = _lsprof.Profiler(lambda: int) + obj.enable() + obj = _lsprof.Profiler(1) + obj.disable() + finally: + sys.stderr = orig_stderr + finally: + unlink(TESTFN) def test_main(): -- Repository URL: http://hg.python.org/cpython

1 0

Daily reference leaks (6edb7c153105): sum=1363
by solipsis＠pitrou.net 29 Jun '11

29 Jun '11

results for 6edb7c153105 on branch "default" -------------------------------------------- test_compile leaked [79, 79, 79] references, sum=237 test_generators leaked [101, 101, 101] references, sum=303 test_global leaked [54, 54, 54] references, sum=162 test_keywordonlyarg leaked [77, 77, 77] references, sum=231 test_packaging leaked [100, 100, 100] references, sum=300 test_pydoc leaked [0, -323, 323] references, sum=0 test_pyexpat leaked [0, 0, -56] references, sum=-56 test_scope leaked [62, 62, 62] references, sum=186 Command line was: ['./python', '-m', 'test.regrtest', '-uall', '-R', '3:3:/home/antoine/cpython/refleaks/reflog2kBbnu', '-x']

1 0

cpython (2.7): Fixup repr for dict_proxy objects.
by raymond.hettinger 29 Jun '11

29 Jun '11

http://hg.python.org/cpython/rev/9a0b6c07b488 changeset: 71086:9a0b6c07b488 branch: 2.7 parent: 71055:cdfcd00873cd user: Raymond Hettinger <python(a)rcn.com> date: Thu Jun 30 00:44:36 2011 +0100 summary: Fixup repr for dict_proxy objects. files: Lib/test/test_descr.py | 4 ++++ Misc/NEWS | 2 ++ Objects/descrobject.c | 16 +++++++++++++++- 3 files changed, 21 insertions(+), 1 deletions(-) diff --git a/Lib/test/test_descr.py b/Lib/test/test_descr.py --- a/Lib/test/test_descr.py +++ b/Lib/test/test_descr.py @@ -4589,6 +4589,10 @@ pass self.C = C + def test_repr(self): + self.assertIn('dict_proxy({', repr(vars(self.C))) + self.assertIn("'meth':", repr(vars(self.C))) + def test_iter_keys(self): # Testing dict-proxy iterkeys... keys = [ key for key in self.C.__dict__.iterkeys() ] diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -13,6 +13,8 @@ the following case: sys.stdin.read() stopped with CTRL+d (end of file), raw_input() interrupted by CTRL+c. +- dict_proxy objects now display their contents rather than just the class name. + Library ------- diff --git a/Objects/descrobject.c b/Objects/descrobject.c --- a/Objects/descrobject.c +++ b/Objects/descrobject.c @@ -801,6 +801,20 @@ return PyObject_Str(pp->dict); } +static PyObject * +proxy_repr(proxyobject *pp) +{ + PyObject *dictrepr; + PyObject *result; + + dictrepr = PyObject_Repr(pp->dict); + if (dictrepr == NULL) + return NULL; + result = PyString_FromFormat("dict_proxy(%s)", PyString_AS_STRING(dictrepr)); + Py_DECREF(dictrepr); + return result; +} + static int proxy_traverse(PyObject *self, visitproc visit, void *arg) { @@ -832,7 +846,7 @@ 0, /* tp_getattr */ 0, /* tp_setattr */ (cmpfunc)proxy_compare, /* tp_compare */ - 0, /* tp_repr */ + (reprfunc)proxy_repr, /* tp_repr */ 0, /* tp_as_number */ &proxy_as_sequence, /* tp_as_sequence */ &proxy_as_mapping, /* tp_as_mapping */ -- Repository URL: http://hg.python.org/cpython

1 0