Mailman 3 July 2011 - Python-checkins

cpython: make the types of None and Ellipsis callable
by benjamin.peterson July 29, 2011

July 29, 2011

http://hg.python.org/cpython/rev/84c3be27b4c7 changeset: 71614:84c3be27b4c7 parent: 71611:a6afd26caa8a user: Benjamin Peterson <benjamin(a)python.org> date: Fri Jul 29 18:19:43 2011 -0500 summary: make the types of None and Ellipsis callable files: Lib/test/test_builtin.py | 7 +++++ Misc/NEWS | 3 ++ Objects/object.c | 34 ++++++++++++++++++++++++++++ Objects/sliceobject.c | 29 +++++++++++++++++++++++ 4 files changed, 73 insertions(+), 0 deletions(-) diff --git a/Lib/test/test_builtin.py b/Lib/test/test_builtin.py --- a/Lib/test/test_builtin.py +++ b/Lib/test/test_builtin.py @@ -1343,6 +1343,13 @@ self.assertRaises(ValueError, x.translate, b"1", 1) self.assertRaises(TypeError, x.translate, b"1"*256, 1) + def test_construct_singletons(self): + for const in None, Ellipsis: + tp = type(const) + self.assertIs(tp(), const) + self.assertRaises(TypeError, tp, 1, 2) + self.assertRaises(TypeError, tp, a=1, b=2) + class TestSorted(unittest.TestCase): def test_basic(self): diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -10,6 +10,9 @@ Core and Builtins ----------------- +- Make type(None) and type(Ellipsis) callable. They return the respective + singleton instances. + - Forbid summing bytes in sum(). - Verify the types of AST strings and identifiers provided by the user before diff --git a/Objects/object.c b/Objects/object.c --- a/Objects/object.c +++ b/Objects/object.c @@ -1277,6 +1277,16 @@ Py_FatalError("deallocating None"); } +static PyObject * +none_new(PyTypeObject *type, PyObject *args, PyObject *kwargs) +{ + if (PyTuple_GET_SIZE(args) || (kwargs && PyDict_Size(kwargs))) { + PyErr_SetString(PyExc_TypeError, "NoneType takes no arguments"); + return NULL; + } + Py_RETURN_NONE; +} + static int none_bool(PyObject *v) { @@ -1335,6 +1345,30 @@ 0, /*tp_as_sequence*/ 0, /*tp_as_mapping*/ 0, /*tp_hash */ + 0, /*tp_call */ + 0, /*tp_str */ + 0, /*tp_getattro */ + 0, /*tp_setattro */ + 0, /*tp_as_buffer */ + Py_TPFLAGS_DEFAULT, /*tp_flags */ + 0, /*tp_doc */ + 0, /*tp_traverse */ + 0, /*tp_clear */ + 0, /*tp_richcompare */ + 0, /*tp_weaklistoffset */ + 0, /*tp_iter */ + 0, /*tp_iternext */ + 0, /*tp_methods */ + 0, /*tp_members */ + 0, /*tp_getset */ + 0, /*tp_base */ + 0, /*tp_dict */ + 0, /*tp_descr_get */ + 0, /*tp_descr_set */ + 0, /*tp_dictoffset */ + 0, /*tp_init */ + 0, /*tp_alloc */ + none_new, /*tp_new */ }; PyObject _Py_NoneStruct = { diff --git a/Objects/sliceobject.c b/Objects/sliceobject.c --- a/Objects/sliceobject.c +++ b/Objects/sliceobject.c @@ -17,6 +17,17 @@ #include "structmember.h" static PyObject * +ellipsis_new(PyTypeObject *type, PyObject *args, PyObject *kwargs) +{ + if (PyTuple_GET_SIZE(args) || (kwargs && PyDict_Size(kwargs))) { + PyErr_SetString(PyExc_TypeError, "EllipsisType takes no arguments"); + return NULL; + } + Py_INCREF(Py_Ellipsis); + return Py_Ellipsis; +} + +static PyObject * ellipsis_repr(PyObject *op) { return PyUnicode_FromString("Ellipsis"); @@ -43,6 +54,24 @@ 0, /* tp_setattro */ 0, /* tp_as_buffer */ Py_TPFLAGS_DEFAULT, /* tp_flags */ + 0, /* tp_doc */ + 0, /* tp_traverse */ + 0, /* tp_clear */ + 0, /* tp_richcompare */ + 0, /* tp_weaklistoffset */ + 0, /* tp_iter */ + 0, /* tp_iternext */ + 0, /* tp_methods */ + 0, /* tp_members */ + 0, /* tp_getset */ + 0, /* tp_base */ + 0, /* tp_dict */ + 0, /* tp_descr_get */ + 0, /* tp_descr_set */ + 0, /* tp_dictoffset */ + 0, /* tp_init */ + 0, /* tp_alloc */ + ellipsis_new, /* tp_new */ }; PyObject _Py_EllipsisObject = { -- Repository URL: http://hg.python.org/cpython

1 0

cpython (merge 3.2 -> default): Issue #12626: In regrtest, allow to filter tests using a glob filter
by antoine.pitrou July 29, 2011

July 29, 2011

http://hg.python.org/cpython/rev/018e14a46454 changeset: 71613:018e14a46454 parent: 71611:a6afd26caa8a parent: 71612:5d7a2bd9a3d1 user: Antoine Pitrou <solipsis(a)pitrou.net> date: Fri Jul 29 23:57:10 2011 +0200 summary: Issue #12626: In regrtest, allow to filter tests using a glob filter with the `-m` (or `--match`) option. This works with all test cases using the unittest module. This is useful with long test suites such as test_io or test_subprocess. files: Lib/test/regrtest.py | 19 +++++++++++++------ Lib/test/support.py | 22 ++++++++++++++++++++++ Misc/NEWS | 5 +++++ 3 files changed, 40 insertions(+), 6 deletions(-) diff --git a/Lib/test/regrtest.py b/Lib/test/regrtest.py --- a/Lib/test/regrtest.py +++ b/Lib/test/regrtest.py @@ -43,6 +43,7 @@ -f/--fromfile -- read names of tests to run from a file (see below) -x/--exclude -- arguments are tests to *exclude* -s/--single -- single step through a set of tests (see below) +-m/--match PAT -- match test cases and methods with glob pattern PAT -G/--failfast -- fail as soon as a test fails (only with -v or -W) -u/--use RES1,RES2,... -- specify which special resource intensive tests to run @@ -253,7 +254,7 @@ findleaks=False, use_resources=None, trace=False, coverdir='coverage', runleaks=False, huntrleaks=False, verbose2=False, print_slow=False, random_seed=None, use_mp=None, verbose3=False, forever=False, - header=False, failfast=False): + header=False, failfast=False, match_tests=None): """Execute a test suite. This also parses command-line options and modifies its behavior @@ -293,14 +294,14 @@ support.record_original_stdout(sys.stdout) try: - opts, args = getopt.getopt(sys.argv[1:], 'hvqxsSrf:lu:t:TD:NLR:FwWM:nj:G', + opts, args = getopt.getopt(sys.argv[1:], 'hvqxsSrf:lu:t:TD:NLR:FwWM:nj:Gm:', ['help', 'verbose', 'verbose2', 'verbose3', 'quiet', 'exclude', 'single', 'slow', 'random', 'fromfile', 'findleaks', 'use=', 'threshold=', 'trace', 'coverdir=', 'nocoverdir', 'runleaks', 'huntrleaks=', 'memlimit=', 'randseed=', 'multiprocess=', 'coverage', 'slaveargs=', 'forever', 'debug', 'start=', 'nowindows', 'header', 'testdir=', 'timeout=', 'wait', - 'failfast']) + 'failfast', 'match']) except getopt.error as msg: usage(msg) @@ -343,6 +344,8 @@ random_seed = int(a) elif o in ('-f', '--fromfile'): fromfile = a + elif o in ('-m', '--match'): + match_tests = a elif o in ('-l', '--findleaks'): findleaks = True elif o in ('-L', '--runleaks'): @@ -606,7 +609,8 @@ (test, verbose, quiet), dict(huntrleaks=huntrleaks, use_resources=use_resources, debug=debug, output_on_failure=verbose3, - timeout=timeout, failfast=failfast) + timeout=timeout, failfast=failfast, + match_tests=match_tests) ) yield (test, args_tuple) pending = tests_and_args() @@ -692,7 +696,8 @@ try: result = runtest(test, verbose, quiet, huntrleaks, debug, output_on_failure=verbose3, - timeout=timeout, failfast=failfast) + timeout=timeout, failfast=failfast, + match_tests=match_tests) accumulate_result(test, result) except KeyboardInterrupt: interrupted = True @@ -837,7 +842,8 @@ def runtest(test, verbose, quiet, huntrleaks=False, debug=False, use_resources=None, - output_on_failure=False, failfast=False, timeout=None): + output_on_failure=False, failfast=False, match_tests=None, + timeout=None): """Run a single test. test -- the name of the test @@ -865,6 +871,7 @@ if use_timeout: faulthandler.dump_tracebacks_later(timeout, exit=True) try: + support.match_tests = match_tests if failfast: support.failfast = True if output_on_failure: diff --git a/Lib/test/support.py b/Lib/test/support.py --- a/Lib/test/support.py +++ b/Lib/test/support.py @@ -21,6 +21,7 @@ import imp import time import sysconfig +import fnmatch import logging.handlers try: @@ -180,6 +181,7 @@ # small sizes, to make sure they work.) real_max_memuse = 0 failfast = False +match_tests = None # _original_stdout is meant to hold stdout at the time regrtest began. # This may be "the real" stdout, or IDLE's emulation of stdout, or whatever. @@ -1268,6 +1270,18 @@ return no_tracing(cpython_only(test)) +def _filter_suite(suite, pred): + """Recursively filter test cases in a suite based on a predicate.""" + newtests = [] + for test in suite._tests: + if isinstance(test, unittest.TestSuite): + _filter_suite(test, pred) + newtests.append(test) + else: + if pred(test): + newtests.append(test) + suite._tests = newtests + def _run_suite(suite): """Run tests from a unittest.TestSuite-derived class.""" if verbose: @@ -1302,6 +1316,14 @@ suite.addTest(cls) else: suite.addTest(unittest.makeSuite(cls)) + def case_pred(test): + if match_tests is None: + return True + for name in test.id().split("."): + if fnmatch.fnmatchcase(name, match_tests): + return True + return False + _filter_suite(suite, case_pred) _run_suite(suite) diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -1137,6 +1137,11 @@ Tests ----- +- Issue #12626: In regrtest, allow to filter tests using a glob filter + with the ``-m`` (or ``--match``) option. This works with all test cases + using the unittest module. This is useful with long test suites + such as test_io or test_subprocess. + - Issue #12624: It is now possible to fail after the first failure when running in verbose mode (``-v`` or ``-W``), by using the ``--failfast`` (or ``-G``) option to regrtest. This is useful with long test suites -- Repository URL: http://hg.python.org/cpython

1 0

cpython (3.2): Issue #12626: In regrtest, allow to filter tests using a glob filter
by antoine.pitrou July 29, 2011

July 29, 2011

http://hg.python.org/cpython/rev/5d7a2bd9a3d1 changeset: 71612:5d7a2bd9a3d1 branch: 3.2 parent: 71608:5f7e71cfbcd6 user: Antoine Pitrou <solipsis(a)pitrou.net> date: Fri Jul 29 23:53:38 2011 +0200 summary: Issue #12626: In regrtest, allow to filter tests using a glob filter with the `-m` (or `--match`) option. This works with all test cases using the unittest module. This is useful with long test suites such as test_io or test_subprocess. files: Lib/test/regrtest.py | 16 ++++++++++------ Lib/test/support.py | 22 ++++++++++++++++++++++ Misc/NEWS | 5 +++++ 3 files changed, 37 insertions(+), 6 deletions(-) diff --git a/Lib/test/regrtest.py b/Lib/test/regrtest.py --- a/Lib/test/regrtest.py +++ b/Lib/test/regrtest.py @@ -38,6 +38,7 @@ -f/--fromfile -- read names of tests to run from a file (see below) -x/--exclude -- arguments are tests to *exclude* -s/--single -- single step through a set of tests (see below) +-m/--match PAT -- match test cases and methods with glob pattern PAT -G/--failfast -- fail as soon as a test fails (only with -v or -W) -u/--use RES1,RES2,... -- specify which special resource intensive tests to run @@ -242,7 +243,7 @@ findleaks=False, use_resources=None, trace=False, coverdir='coverage', runleaks=False, huntrleaks=False, verbose2=False, print_slow=False, random_seed=None, use_mp=None, verbose3=False, forever=False, - header=False, failfast=False): + header=False, failfast=False, match_tests=None): """Execute a test suite. This also parses command-line options and modifies its behavior @@ -270,13 +271,13 @@ support.record_original_stdout(sys.stdout) try: - opts, args = getopt.getopt(sys.argv[1:], 'hvqxsSrf:lu:t:TD:NLR:FwWM:nj:G', + opts, args = getopt.getopt(sys.argv[1:], 'hvqxsSrf:lu:t:TD:NLR:FwWM:nj:Gm:', ['help', 'verbose', 'verbose2', 'verbose3', 'quiet', 'exclude', 'single', 'slow', 'random', 'fromfile', 'findleaks', 'use=', 'threshold=', 'trace', 'coverdir=', 'nocoverdir', 'runleaks', 'huntrleaks=', 'memlimit=', 'randseed=', 'multiprocess=', 'coverage', 'slaveargs=', 'forever', 'debug', - 'start=', 'nowindows', 'header', 'failfast']) + 'start=', 'nowindows', 'header', 'failfast', 'match']) except getopt.error as msg: usage(msg) @@ -318,6 +319,8 @@ random_seed = int(a) elif o in ('-f', '--fromfile'): fromfile = a + elif o in ('-m', '--match'): + match_tests = a elif o in ('-l', '--findleaks'): findleaks = True elif o in ('-L', '--runleaks'): @@ -551,7 +554,7 @@ (test, verbose, quiet), dict(huntrleaks=huntrleaks, use_resources=use_resources, debug=debug, output_on_failure=verbose3, - failfast=failfast) + failfast=failfast, match_tests=match_tests) ) yield (test, args_tuple) pending = tests_and_args() @@ -630,7 +633,7 @@ try: result = runtest(test, verbose, quiet, huntrleaks, debug, output_on_failure=verbose3, - failfast=failfast) + failfast=failfast, match_tests=match_tests) accumulate_result(test, result) except KeyboardInterrupt: interrupted = True @@ -777,7 +780,7 @@ def runtest(test, verbose, quiet, huntrleaks=False, debug=False, use_resources=None, - output_on_failure=False, failfast=False): + output_on_failure=False, failfast=False, match_tests=None): """Run a single test. test -- the name of the test @@ -800,6 +803,7 @@ if use_resources is not None: support.use_resources = use_resources try: + support.match_tests = match_tests if failfast: support.failfast = True if output_on_failure: diff --git a/Lib/test/support.py b/Lib/test/support.py --- a/Lib/test/support.py +++ b/Lib/test/support.py @@ -21,6 +21,7 @@ import imp import time import sysconfig +import fnmatch import logging.handlers try: @@ -177,6 +178,7 @@ # small sizes, to make sure they work.) real_max_memuse = 0 failfast = False +match_tests = None # _original_stdout is meant to hold stdout at the time regrtest began. # This may be "the real" stdout, or IDLE's emulation of stdout, or whatever. @@ -1183,6 +1185,18 @@ return guards.get(platform.python_implementation().lower(), default) +def _filter_suite(suite, pred): + """Recursively filter test cases in a suite based on a predicate.""" + newtests = [] + for test in suite._tests: + if isinstance(test, unittest.TestSuite): + _filter_suite(test, pred) + newtests.append(test) + else: + if pred(test): + newtests.append(test) + suite._tests = newtests + def _run_suite(suite): """Run tests from a unittest.TestSuite-derived class.""" @@ -1218,6 +1232,14 @@ suite.addTest(cls) else: suite.addTest(unittest.makeSuite(cls)) + def case_pred(test): + if match_tests is None: + return True + for name in test.id().split("."): + if fnmatch.fnmatchcase(name, match_tests): + return True + return False + _filter_suite(suite, case_pred) _run_suite(suite) diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -137,6 +137,11 @@ Tests ----- +- Issue #12626: In regrtest, allow to filter tests using a glob filter + with the ``-m`` (or ``--match``) option. This works with all test cases + using the unittest module. This is useful with long test suites + such as test_io or test_subprocess. + - Issue #12624: It is now possible to fail after the first failure when running in verbose mode (``-v`` or ``-W``), by using the ``--failfast`` (or ``-G``) option to regrtest. This is useful with long test suites -- Repository URL: http://hg.python.org/cpython

1 0

cpython: bytes should be verboten in sum() (fixes #12654)
by benjamin.peterson July 29, 2011

July 29, 2011

http://hg.python.org/cpython/rev/7368d0e9b33e changeset: 71610:7368d0e9b33e user: Benjamin Peterson <benjamin(a)python.org> date: Fri Jul 29 14:23:47 2011 -0500 summary: bytes should be verboten in sum() (fixes #12654) files: Lib/test/test_builtin.py | 3 +++ Misc/NEWS | 2 ++ Python/bltinmodule.c | 5 +++++ 3 files changed, 10 insertions(+), 0 deletions(-) diff --git a/Lib/test/test_builtin.py b/Lib/test/test_builtin.py --- a/Lib/test/test_builtin.py +++ b/Lib/test/test_builtin.py @@ -1128,6 +1128,9 @@ self.assertRaises(TypeError, sum, 42) self.assertRaises(TypeError, sum, ['a', 'b', 'c']) self.assertRaises(TypeError, sum, ['a', 'b', 'c'], '') + self.assertRaises(TypeError, sum, [b'a', b'c'], b'') + values = [bytearray(b'a'), bytearray(b'b')] + self.assertRaises(TypeError, sum, values, bytearray(b'')) self.assertRaises(TypeError, sum, [[1], [2], [3]]) self.assertRaises(TypeError, sum, [{2:3}]) self.assertRaises(TypeError, sum, [{2:3}]*2, {2:3}) diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -10,6 +10,8 @@ Core and Builtins ----------------- +- Forbid summing bytes in sum(). + - Verify the types of AST strings and identifiers provided by the user before compiling them. diff --git a/Python/bltinmodule.c b/Python/bltinmodule.c --- a/Python/bltinmodule.c +++ b/Python/bltinmodule.c @@ -1888,6 +1888,11 @@ Py_DECREF(iter); return NULL; } + if (PyBytes_Check(result)) { + PyErr_SetString(PyExc_TypeError, + "sum() can't sum bytes [use b''.join(seq) instead]"); + return NULL; + } if (PyByteArray_Check(result)) { PyErr_SetString(PyExc_TypeError, "sum() can't sum bytes [use b''.join(seq) instead]"); -- Repository URL: http://hg.python.org/cpython

1 0

cpython: bytes -> bytearray
by benjamin.peterson July 29, 2011

July 29, 2011

http://hg.python.org/cpython/rev/a6afd26caa8a changeset: 71611:a6afd26caa8a user: Benjamin Peterson <benjamin(a)python.org> date: Fri Jul 29 14:24:29 2011 -0500 summary: bytes -> bytearray files: Python/bltinmodule.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Python/bltinmodule.c b/Python/bltinmodule.c --- a/Python/bltinmodule.c +++ b/Python/bltinmodule.c @@ -1895,7 +1895,7 @@ } if (PyByteArray_Check(result)) { PyErr_SetString(PyExc_TypeError, - "sum() can't sum bytes [use b''.join(seq) instead]"); + "sum() can't sum bytearray [use b''.join(seq) instead]"); Py_DECREF(iter); return NULL; } -- Repository URL: http://hg.python.org/cpython

1 0

cpython (3.2): Issue #12464: tempfile.TemporaryDirectory.cleanup() should not follow symlinks:
by charles-francois.natali July 29, 2011

July 29, 2011

http://hg.python.org/cpython/rev/5f7e71cfbcd6 changeset: 71608:5f7e71cfbcd6 branch: 3.2 parent: 71604:e37fa30c4be4 user: Charles-François Natali <neologix(a)free.fr> date: Fri Jul 29 18:59:24 2011 +0200 summary: Issue #12464: tempfile.TemporaryDirectory.cleanup() should not follow symlinks: fix it. Patch by Petri Lehtinen. files: Lib/tempfile.py | 3 ++- Lib/test/test_tempfile.py | 21 +++++++++++++++++++++ Misc/ACKS | 1 + Misc/NEWS | 3 +++ 4 files changed, 27 insertions(+), 1 deletions(-) diff --git a/Lib/tempfile.py b/Lib/tempfile.py --- a/Lib/tempfile.py +++ b/Lib/tempfile.py @@ -661,6 +661,7 @@ _listdir = staticmethod(_os.listdir) _path_join = staticmethod(_os.path.join) _isdir = staticmethod(_os.path.isdir) + _islink = staticmethod(_os.path.islink) _remove = staticmethod(_os.remove) _rmdir = staticmethod(_os.rmdir) _os_error = _os.error @@ -672,7 +673,7 @@ for name in self._listdir(path): fullname = self._path_join(path, name) try: - isdir = self._isdir(fullname) + isdir = self._isdir(fullname) and not self._islink(fullname) except self._os_error: isdir = False if isdir: diff --git a/Lib/test/test_tempfile.py b/Lib/test/test_tempfile.py --- a/Lib/test/test_tempfile.py +++ b/Lib/test/test_tempfile.py @@ -964,6 +964,27 @@ finally: os.rmdir(dir) + @support.skip_unless_symlink + def test_cleanup_with_symlink_to_a_directory(self): + # cleanup() should not follow symlinks to directories (issue #12464) + d1 = self.do_create() + d2 = self.do_create() + + # Symlink d1/foo -> d2 + os.symlink(d2.name, os.path.join(d1.name, "foo")) + + # This call to cleanup() should not follow the "foo" symlink + d1.cleanup() + + self.assertFalse(os.path.exists(d1.name), + "TemporaryDirectory %s exists after cleanup" % d1.name) + self.assertTrue(os.path.exists(d2.name), + "Directory pointed to by a symlink was deleted") + self.assertEqual(os.listdir(d2.name), ['test.txt'], + "Contents of the directory pointed to by a symlink " + "were deleted") + d2.cleanup() + @support.cpython_only def test_del_on_collection(self): # A TemporaryDirectory is deleted when garbage collected diff --git a/Misc/ACKS b/Misc/ACKS --- a/Misc/ACKS +++ b/Misc/ACKS @@ -526,6 +526,7 @@ Kip Lehman Joerg Lehmann Robert Lehmann +Petri Lehtinen Luke Kenneth Casson Leighton Marc-Andre Lemburg John Lenton diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -41,6 +41,9 @@ Library ------- +- Issue #12464: tempfile.TemporaryDirectory.cleanup() should not follow + symlinks: fix it. Patch by Petri Lehtinen. + - Issue #8887: "pydoc somebuiltin.somemethod" (or help('somebuiltin.somemethod') in Python code) now finds the doc of the method. -- Repository URL: http://hg.python.org/cpython

1 0

cpython (merge 3.2 -> default): Issue #12464: tempfile.TemporaryDirectory.cleanup() should not follow symlinks:
by charles-francois.natali July 29, 2011

July 29, 2011

http://hg.python.org/cpython/rev/c0bae008df81 changeset: 71609:c0bae008df81 parent: 71605:4a6cb2d9e906 parent: 71608:5f7e71cfbcd6 user: Charles-François Natali <neologix(a)free.fr> date: Fri Jul 29 19:00:38 2011 +0200 summary: Issue #12464: tempfile.TemporaryDirectory.cleanup() should not follow symlinks: fix it. Patch by Petri Lehtinen. files: Lib/tempfile.py | 3 ++- Lib/test/test_tempfile.py | 21 +++++++++++++++++++++ Misc/NEWS | 3 +++ 3 files changed, 26 insertions(+), 1 deletions(-) diff --git a/Lib/tempfile.py b/Lib/tempfile.py --- a/Lib/tempfile.py +++ b/Lib/tempfile.py @@ -661,6 +661,7 @@ _listdir = staticmethod(_os.listdir) _path_join = staticmethod(_os.path.join) _isdir = staticmethod(_os.path.isdir) + _islink = staticmethod(_os.path.islink) _remove = staticmethod(_os.remove) _rmdir = staticmethod(_os.rmdir) _os_error = _os.error @@ -672,7 +673,7 @@ for name in self._listdir(path): fullname = self._path_join(path, name) try: - isdir = self._isdir(fullname) + isdir = self._isdir(fullname) and not self._islink(fullname) except self._os_error: isdir = False if isdir: diff --git a/Lib/test/test_tempfile.py b/Lib/test/test_tempfile.py --- a/Lib/test/test_tempfile.py +++ b/Lib/test/test_tempfile.py @@ -964,6 +964,27 @@ finally: os.rmdir(dir) + @support.skip_unless_symlink + def test_cleanup_with_symlink_to_a_directory(self): + # cleanup() should not follow symlinks to directories (issue #12464) + d1 = self.do_create() + d2 = self.do_create() + + # Symlink d1/foo -> d2 + os.symlink(d2.name, os.path.join(d1.name, "foo")) + + # This call to cleanup() should not follow the "foo" symlink + d1.cleanup() + + self.assertFalse(os.path.exists(d1.name), + "TemporaryDirectory %s exists after cleanup" % d1.name) + self.assertTrue(os.path.exists(d2.name), + "Directory pointed to by a symlink was deleted") + self.assertEqual(os.listdir(d2.name), ['test.txt'], + "Contents of the directory pointed to by a symlink " + "were deleted") + d2.cleanup() + @support.cpython_only def test_del_on_collection(self): # A TemporaryDirectory is deleted when garbage collected diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -244,6 +244,9 @@ Library ------- +- Issue #12464: tempfile.TemporaryDirectory.cleanup() should not follow + symlinks: fix it. Patch by Petri Lehtinen. + - Issue #8887: "pydoc somebuiltin.somemethod" (or help('somebuiltin.somemethod') in Python code) now finds the doc of the method. -- Repository URL: http://hg.python.org/cpython

1 0

cpython (2.7): Document that atexit execution order is undefined (#9788)
by eric.araujo July 29, 2011

July 29, 2011

http://hg.python.org/cpython/rev/df415bfbb652 changeset: 71607:df415bfbb652 branch: 2.7 user: Éric Araujo <merwok(a)netwok.org> date: Fri Jul 29 18:04:24 2011 +0200 summary: Document that atexit execution order is undefined (#9788) files: Doc/library/atexit.rst | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/Doc/library/atexit.rst b/Doc/library/atexit.rst --- a/Doc/library/atexit.rst +++ b/Doc/library/atexit.rst @@ -12,7 +12,9 @@ The :mod:`atexit` module defines a single function to register cleanup functions. Functions thus registered are automatically executed upon normal -interpreter termination. +interpreter termination. The order in which the functions are called is not +defined; if you have cleanup operations that depend on each other, you should +wrap them in a function and register that one. This keeps :mod:`atexit` simple. .. seealso:: -- Repository URL: http://hg.python.org/cpython

1 0

cpython (2.7): Add a link target for argparse.Namespace (#8982)
by eric.araujo July 29, 2011

July 29, 2011

http://hg.python.org/cpython/rev/01722022f88d changeset: 71606:01722022f88d branch: 2.7 parent: 71599:68df566cbf92 user: Éric Araujo <merwok(a)netwok.org> date: Fri Jul 29 17:59:17 2011 +0200 summary: Add a link target for argparse.Namespace (#8982) files: Doc/library/argparse.rst | 17 ++++++++++------- 1 files changed, 10 insertions(+), 7 deletions(-) diff --git a/Doc/library/argparse.rst b/Doc/library/argparse.rst --- a/Doc/library/argparse.rst +++ b/Doc/library/argparse.rst @@ -106,7 +106,7 @@ :class:`ArgumentParser` parses args through the :meth:`~ArgumentParser.parse_args` method. This will inspect the command line, convert each arg to the appropriate type and then invoke the appropriate action. -In most cases, this means a simple namespace object will be built up from +In most cases, this means a simple :class:`Namespace` object will be built up from attributes parsed out of the command line:: >>> parser.parse_args(['--sum', '7', '-1', '42']) @@ -714,7 +714,7 @@ * ``parser`` - The ArgumentParser object which contains this action. -* ``namespace`` - The namespace object that will be returned by +* ``namespace`` - The :class:`Namespace` object that will be returned by :meth:`~ArgumentParser.parse_args`. Most actions add an attribute to this object. @@ -1325,11 +1325,14 @@ The Namespace object ^^^^^^^^^^^^^^^^^^^^ -By default, :meth:`~ArgumentParser.parse_args` will return a new object of type -:class:`Namespace` where the necessary attributes have been set. This class is -deliberately simple, just an :class:`object` subclass with a readable string -representation. If you prefer to have dict-like view of the attributes, you -can use the standard Python idiom via :func:`vars`:: +.. class:: Namespace + + Simple class used by default by :meth:`~ArgumentParser.parse_args` to create + an object holding attributes and return it. + +This class is deliberately simple, just an :class:`object` subclass with a +readable string representation. If you prefer to have dict-like view of the +attributes, you can use the standard Python idiom, :func:`vars`:: >>> parser = argparse.ArgumentParser() >>> parser.add_argument('--foo') -- Repository URL: http://hg.python.org/cpython

1 0

cpython (merge 3.2 -> default): Merge from 3.2 (#9254, #8982, #9788)
by eric.araujo July 29, 2011

July 29, 2011

http://hg.python.org/cpython/rev/4a6cb2d9e906 changeset: 71605:4a6cb2d9e906 parent: 71601:91d6cabf77d6 parent: 71604:e37fa30c4be4 user: Éric Araujo <merwok(a)netwok.org> date: Fri Jul 29 18:10:12 2011 +0200 summary: Merge from 3.2 (#9254, #8982, #9788) files: Doc/library/argparse.rst | 17 ++++++++++------- Doc/library/atexit.rst | 4 +++- Doc/library/functions.rst | 11 ++--------- 3 files changed, 15 insertions(+), 17 deletions(-) diff --git a/Doc/library/argparse.rst b/Doc/library/argparse.rst --- a/Doc/library/argparse.rst +++ b/Doc/library/argparse.rst @@ -110,7 +110,7 @@ :class:`ArgumentParser` parses args through the :meth:`~ArgumentParser.parse_args` method. This will inspect the command line, convert each arg to the appropriate type and then invoke the appropriate action. -In most cases, this means a simple namespace object will be built up from +In most cases, this means a simple :class:`Namespace` object will be built up from attributes parsed out of the command line:: >>> parser.parse_args(['--sum', '7', '-1', '42']) @@ -741,7 +741,7 @@ * ``parser`` - The ArgumentParser object which contains this action. -* ``namespace`` - The namespace object that will be returned by +* ``namespace`` - The :class:`Namespace` object that will be returned by :meth:`~ArgumentParser.parse_args`. Most actions add an attribute to this object. @@ -1352,11 +1352,14 @@ The Namespace object ^^^^^^^^^^^^^^^^^^^^ -By default, :meth:`~ArgumentParser.parse_args` will return a new object of type -:class:`Namespace` where the necessary attributes have been set. This class is -deliberately simple, just an :class:`object` subclass with a readable string -representation. If you prefer to have dict-like view of the attributes, you -can use the standard Python idiom via :func:`vars`:: +.. class:: Namespace + + Simple class used by default by :meth:`~ArgumentParser.parse_args` to create + an object holding attributes and return it. + +This class is deliberately simple, just an :class:`object` subclass with a +readable string representation. If you prefer to have dict-like view of the +attributes, you can use the standard Python idiom, :func:`vars`:: >>> parser = argparse.ArgumentParser() >>> parser.add_argument('--foo') diff --git a/Doc/library/atexit.rst b/Doc/library/atexit.rst --- a/Doc/library/atexit.rst +++ b/Doc/library/atexit.rst @@ -9,7 +9,9 @@ The :mod:`atexit` module defines functions to register and unregister cleanup functions. Functions thus registered are automatically executed upon normal -interpreter termination. +interpreter termination. The order in which the functions are called is not +defined; if you have cleanup operations that depend on each other, you should +wrap them in a function and register that one. This keeps :mod:`atexit` simple. Note: the functions registered via this module are not called when the program is killed by a signal not handled by Python, when a Python fatal internal error diff --git a/Doc/library/functions.rst b/Doc/library/functions.rst --- a/Doc/library/functions.rst +++ b/Doc/library/functions.rst @@ -1387,7 +1387,7 @@ .. note:: This is an advanced function that is not needed in everyday Python - programming. + programming, unlike :func:`importlib.import_module`. This function is invoked by the :keyword:`import` statement. It can be replaced (by importing the :mod:`builtins` module and assigning to @@ -1437,15 +1437,8 @@ names. If you simply want to import a module (potentially within a package) by name, - you can call :func:`__import__` and then look it up in :data:`sys.modules`:: + use :func:`importlib.import_module`. - >>> import sys - >>> name = 'foo.bar.baz' - >>> __import__(name) - <module 'foo' from ...> - >>> baz = sys.modules[name] - >>> baz - <module 'foo.bar.baz' from ...> .. rubric:: Footnotes -- Repository URL: http://hg.python.org/cpython

1 0