Mailman 3 December 2012 - Python-checkins

cpython (merge 3.2 -> 3.3): Merged fix for #15803 from 3.2
by lukasz.langa Dec. 31, 2012

Dec. 31, 2012

http://hg.python.org/cpython/rev/cc277b25eae7 changeset: 81162:cc277b25eae7 branch: 3.3 parent: 81159:9e6ead98762e parent: 81161:850503a117a9 user: Łukasz Langa <lukasz(a)langa.pl> date: Mon Dec 31 02:25:28 2012 +0100 summary: Merged fix for #15803 from 3.2 files: Lib/configparser.py | 7 +++---- Misc/ACKS | 1 + 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Lib/configparser.py b/Lib/configparser.py --- a/Lib/configparser.py +++ b/Lib/configparser.py @@ -99,10 +99,9 @@ yes, on for True). Returns False or True. items(section=_UNSET, raw=False, vars=None) - If section is given, return a list of tuples with (section_name, - section_proxy) for each section, including DEFAULTSECT. Otherwise, - return a list of tuples with (name, value) for each option - in the section. + If section is given, return a list of tuples with (name, value) for + each option in the section. Otherwise, return a list of tuples with + (section_name, section_proxy) for each section, including DEFAULTSECT. remove_section(section) Remove the given file section and all its options. diff --git a/Misc/ACKS b/Misc/ACKS --- a/Misc/ACKS +++ b/Misc/ACKS @@ -1191,6 +1191,7 @@ Sandro Tosi Richard Townsend David Townshend +Nathan Trapuzzano Laurence Tratt Alberto Trevino Matthias Troffaes -- Repository URL: http://hg.python.org/cpython

1 0

cpython (3.2): Fixes issue #15803: incorrect `ConfigParser.items()` docstring
by lukasz.langa Dec. 31, 2012

Dec. 31, 2012

http://hg.python.org/cpython/rev/850503a117a9 changeset: 81161:850503a117a9 branch: 3.2 parent: 81156:d42bf4faf3d1 user: Łukasz Langa <lukasz(a)langa.pl> date: Mon Dec 31 02:18:20 2012 +0100 summary: Fixes issue #15803: incorrect `ConfigParser.items()` docstring files: Lib/configparser.py | 7 +++---- Misc/ACKS | 1 + 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Lib/configparser.py b/Lib/configparser.py --- a/Lib/configparser.py +++ b/Lib/configparser.py @@ -99,10 +99,9 @@ yes, on for True). Returns False or True. items(section=_UNSET, raw=False, vars=None) - If section is given, return a list of tuples with (section_name, - section_proxy) for each section, including DEFAULTSECT. Otherwise, - return a list of tuples with (name, value) for each option - in the section. + If section is given, return a list of tuples with (name, value) for + each option in the section. Otherwise, return a list of tuples with + (section_name, section_proxy) for each section, including DEFAULTSECT. remove_section(section) Remove the given file section and all its options. diff --git a/Misc/ACKS b/Misc/ACKS --- a/Misc/ACKS +++ b/Misc/ACKS @@ -1078,6 +1078,7 @@ Matias Torchinsky Sandro Tosi Richard Townsend +Nathan Trapuzzano Laurence Tratt John Tromp Jason Trowbridge -- Repository URL: http://hg.python.org/cpython

1 0

cpython (merge 3.3 -> default): Fix the advertised size of PyCFunctionObjects in sys._debugmallocstats().
by antoine.pitrou Dec. 30, 2012

Dec. 30, 2012

http://hg.python.org/cpython/rev/e61381137b4a changeset: 81160:e61381137b4a parent: 81158:f173c2e92b64 parent: 81159:9e6ead98762e user: Antoine Pitrou <solipsis(a)pitrou.net> date: Sun Dec 30 22:46:56 2012 +0100 summary: Fix the advertised size of PyCFunctionObjects in sys._debugmallocstats(). files: Objects/methodobject.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Objects/methodobject.c b/Objects/methodobject.c --- a/Objects/methodobject.c +++ b/Objects/methodobject.c @@ -352,6 +352,6 @@ _PyCFunction_DebugMallocStats(FILE *out) { _PyDebugAllocatorStats(out, - "free PyCFunction", - numfree, sizeof(PyCFunction)); + "free PyCFunctionObjects", + numfree, sizeof(PyCFunctionObject)); } -- Repository URL: http://hg.python.org/cpython

1 0

cpython (3.3): Fix the advertised size of PyCFunctionObjects in sys._debugmallocstats().
by antoine.pitrou Dec. 30, 2012

Dec. 30, 2012

http://hg.python.org/cpython/rev/9e6ead98762e changeset: 81159:9e6ead98762e branch: 3.3 parent: 81157:e1a0901e4ef7 user: Antoine Pitrou <solipsis(a)pitrou.net> date: Sun Dec 30 22:46:04 2012 +0100 summary: Fix the advertised size of PyCFunctionObjects in sys._debugmallocstats(). files: Objects/methodobject.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Objects/methodobject.c b/Objects/methodobject.c --- a/Objects/methodobject.c +++ b/Objects/methodobject.c @@ -343,8 +343,8 @@ _PyCFunction_DebugMallocStats(FILE *out) { _PyDebugAllocatorStats(out, - "free PyCFunction", - numfree, sizeof(PyCFunction)); + "free PyCFunctionObjects", + numfree, sizeof(PyCFunctionObject)); } /* PyCFunction_New() is now just a macro that calls PyCFunction_NewEx(), -- Repository URL: http://hg.python.org/cpython

1 0

cpython (merge 3.3 -> default): Issue #16645: Fix hardlink extracting test for tarfile.
by serhiy.storchaka Dec. 30, 2012

Dec. 30, 2012

http://hg.python.org/cpython/rev/f173c2e92b64 changeset: 81158:f173c2e92b64 parent: 81154:08c215115842 parent: 81157:e1a0901e4ef7 user: Serhiy Storchaka <storchaka(a)gmail.com> date: Sun Dec 30 20:18:58 2012 +0200 summary: Issue #16645: Fix hardlink extracting test for tarfile. files: Lib/test/test_tarfile.py | 24 +++++++----------------- 1 files changed, 7 insertions(+), 17 deletions(-) diff --git a/Lib/test/test_tarfile.py b/Lib/test/test_tarfile.py --- a/Lib/test/test_tarfile.py +++ b/Lib/test/test_tarfile.py @@ -336,31 +336,21 @@ @support.skip_unless_symlink def test_extract_hardlink(self): # Test hardlink extraction (e.g. bug #857297). - tar = tarfile.open(tarname, errorlevel=1, encoding="iso8859-1") + with tarfile.open(tarname, errorlevel=1, encoding="iso8859-1") as tar: + tar.extract("ustar/regtype", TEMPDIR) + self.addCleanup(os.remove, os.path.join(TEMPDIR, "ustar/regtype")) - try: - tar.extract("ustar/regtype", TEMPDIR) - try: - tar.extract("ustar/lnktype", TEMPDIR) - except OSError as e: - if e.errno == errno.ENOENT: - self.fail("hardlink not extracted properly") - + tar.extract("ustar/lnktype", TEMPDIR) + self.addCleanup(os.remove, os.path.join(TEMPDIR, "ustar/lnktype")) with open(os.path.join(TEMPDIR, "ustar/lnktype"), "rb") as f: data = f.read() self.assertEqual(md5sum(data), md5_regtype) - try: - tar.extract("ustar/symtype", TEMPDIR) - except OSError as e: - if e.errno == errno.ENOENT: - self.fail("symlink not extracted properly") - + tar.extract("ustar/symtype", TEMPDIR) + self.addCleanup(os.remove, os.path.join(TEMPDIR, "ustar/symtype")) with open(os.path.join(TEMPDIR, "ustar/symtype"), "rb") as f: data = f.read() self.assertEqual(md5sum(data), md5_regtype) - finally: - tar.close() def test_extractall(self): # Test if extractall() correctly restores directory permissions -- Repository URL: http://hg.python.org/cpython

1 0

cpython (merge 3.2 -> 3.3): Issue #16645: Fix hardlink extracting test for tarfile.
by serhiy.storchaka Dec. 30, 2012

Dec. 30, 2012

http://hg.python.org/cpython/rev/e1a0901e4ef7 changeset: 81157:e1a0901e4ef7 branch: 3.3 parent: 81153:e2cce1100bd3 parent: 81156:d42bf4faf3d1 user: Serhiy Storchaka <storchaka(a)gmail.com> date: Sun Dec 30 20:17:28 2012 +0200 summary: Issue #16645: Fix hardlink extracting test for tarfile. files: Lib/test/test_tarfile.py | 24 +++++++----------------- 1 files changed, 7 insertions(+), 17 deletions(-) diff --git a/Lib/test/test_tarfile.py b/Lib/test/test_tarfile.py --- a/Lib/test/test_tarfile.py +++ b/Lib/test/test_tarfile.py @@ -336,31 +336,21 @@ @support.skip_unless_symlink def test_extract_hardlink(self): # Test hardlink extraction (e.g. bug #857297). - tar = tarfile.open(tarname, errorlevel=1, encoding="iso8859-1") + with tarfile.open(tarname, errorlevel=1, encoding="iso8859-1") as tar: + tar.extract("ustar/regtype", TEMPDIR) + self.addCleanup(os.remove, os.path.join(TEMPDIR, "ustar/regtype")) - try: - tar.extract("ustar/regtype", TEMPDIR) - try: - tar.extract("ustar/lnktype", TEMPDIR) - except EnvironmentError as e: - if e.errno == errno.ENOENT: - self.fail("hardlink not extracted properly") - + tar.extract("ustar/lnktype", TEMPDIR) + self.addCleanup(os.remove, os.path.join(TEMPDIR, "ustar/lnktype")) with open(os.path.join(TEMPDIR, "ustar/lnktype"), "rb") as f: data = f.read() self.assertEqual(md5sum(data), md5_regtype) - try: - tar.extract("ustar/symtype", TEMPDIR) - except EnvironmentError as e: - if e.errno == errno.ENOENT: - self.fail("symlink not extracted properly") - + tar.extract("ustar/symtype", TEMPDIR) + self.addCleanup(os.remove, os.path.join(TEMPDIR, "ustar/symtype")) with open(os.path.join(TEMPDIR, "ustar/symtype"), "rb") as f: data = f.read() self.assertEqual(md5sum(data), md5_regtype) - finally: - tar.close() def test_extractall(self): # Test if extractall() correctly restores directory permissions -- Repository URL: http://hg.python.org/cpython

1 0

cpython (3.2): Issue #16645: Fix hardlink extracting test for tarfile.
by serhiy.storchaka Dec. 30, 2012

Dec. 30, 2012

http://hg.python.org/cpython/rev/d42bf4faf3d1 changeset: 81156:d42bf4faf3d1 branch: 3.2 parent: 81144:cbee422ca727 user: Serhiy Storchaka <storchaka(a)gmail.com> date: Sun Dec 30 20:16:30 2012 +0200 summary: Issue #16645: Fix hardlink extracting test for tarfile. files: Lib/test/test_tarfile.py | 24 +++++++----------------- 1 files changed, 7 insertions(+), 17 deletions(-) diff --git a/Lib/test/test_tarfile.py b/Lib/test/test_tarfile.py --- a/Lib/test/test_tarfile.py +++ b/Lib/test/test_tarfile.py @@ -328,31 +328,21 @@ @support.skip_unless_symlink def test_extract_hardlink(self): # Test hardlink extraction (e.g. bug #857297). - tar = tarfile.open(tarname, errorlevel=1, encoding="iso8859-1") + with tarfile.open(tarname, errorlevel=1, encoding="iso8859-1") as tar: + tar.extract("ustar/regtype", TEMPDIR) + self.addCleanup(os.remove, os.path.join(TEMPDIR, "ustar/regtype")) - try: - tar.extract("ustar/regtype", TEMPDIR) - try: - tar.extract("ustar/lnktype", TEMPDIR) - except EnvironmentError as e: - if e.errno == errno.ENOENT: - self.fail("hardlink not extracted properly") - + tar.extract("ustar/lnktype", TEMPDIR) + self.addCleanup(os.remove, os.path.join(TEMPDIR, "ustar/lnktype")) with open(os.path.join(TEMPDIR, "ustar/lnktype"), "rb") as f: data = f.read() self.assertEqual(md5sum(data), md5_regtype) - try: - tar.extract("ustar/symtype", TEMPDIR) - except EnvironmentError as e: - if e.errno == errno.ENOENT: - self.fail("symlink not extracted properly") - + tar.extract("ustar/symtype", TEMPDIR) + self.addCleanup(os.remove, os.path.join(TEMPDIR, "ustar/symtype")) with open(os.path.join(TEMPDIR, "ustar/symtype"), "rb") as f: data = f.read() self.assertEqual(md5sum(data), md5_regtype) - finally: - tar.close() def test_extractall(self): # Test if extractall() correctly restores directory permissions -- Repository URL: http://hg.python.org/cpython

1 0

cpython (2.7): Issue #16645: Fix hardlink extracting test for tarfile.
by serhiy.storchaka Dec. 30, 2012

Dec. 30, 2012

http://hg.python.org/cpython/rev/503b889668fc changeset: 81155:503b889668fc branch: 2.7 parent: 81147:52900f205e6e user: Serhiy Storchaka <storchaka(a)gmail.com> date: Sun Dec 30 20:15:10 2012 +0200 summary: Issue #16645: Fix hardlink extracting test for tarfile. files: Lib/test/test_tarfile.py | 27 +++++++++++---------------- 1 files changed, 11 insertions(+), 16 deletions(-) diff --git a/Lib/test/test_tarfile.py b/Lib/test/test_tarfile.py --- a/Lib/test/test_tarfile.py +++ b/Lib/test/test_tarfile.py @@ -297,26 +297,21 @@ def test_extract_hardlink(self): # Test hardlink extraction (e.g. bug #857297). - tar = tarfile.open(tarname, errorlevel=1, encoding="iso8859-1") + with tarfile.open(tarname, errorlevel=1, encoding="iso8859-1") as tar: + tar.extract("ustar/regtype", TEMPDIR) + self.addCleanup(os.remove, os.path.join(TEMPDIR, "ustar/regtype")) - tar.extract("ustar/regtype", TEMPDIR) - try: tar.extract("ustar/lnktype", TEMPDIR) - except EnvironmentError, e: - if e.errno == errno.ENOENT: - self.fail("hardlink not extracted properly") + self.addCleanup(os.remove, os.path.join(TEMPDIR, "ustar/lnktype")) + with open(os.path.join(TEMPDIR, "ustar/lnktype"), "rb") as f: + data = f.read() + self.assertEqual(md5sum(data), md5_regtype) - data = open(os.path.join(TEMPDIR, "ustar/lnktype"), "rb").read() - self.assertEqual(md5sum(data), md5_regtype) - - try: tar.extract("ustar/symtype", TEMPDIR) - except EnvironmentError, e: - if e.errno == errno.ENOENT: - self.fail("symlink not extracted properly") - - data = open(os.path.join(TEMPDIR, "ustar/symtype"), "rb").read() - self.assertEqual(md5sum(data), md5_regtype) + self.addCleanup(os.remove, os.path.join(TEMPDIR, "ustar/symtype")) + with open(os.path.join(TEMPDIR, "ustar/symtype"), "rb") as f: + data = f.read() + self.assertEqual(md5sum(data), md5_regtype) def test_extractall(self): # Test if extractall() correctly restores directory permissions -- Repository URL: http://hg.python.org/cpython

1 0

peps: Add short example of using the new API
by nick.coghlan Dec. 30, 2012

Dec. 30, 2012

http://hg.python.org/peps/rev/6926ad909071 changeset: 4644:6926ad909071 user: Nick Coghlan <ncoghlan(a)gmail.com> date: Mon Dec 31 01:49:02 2012 +1000 summary: Add short example of using the new API files: pep-0432.txt | 29 +++++++++++++++++++++++++++++ 1 files changed, 29 insertions(+), 0 deletions(-) diff --git a/pep-0432.txt b/pep-0432.txt --- a/pep-0432.txt +++ b/pep-0432.txt @@ -511,6 +511,35 @@ proposed System Python interpreter. Other embedding applications may choose to skip the step of executing code in the ``__main__`` module. +An embedding application may still continue to leave the second phase +entirely under CPython's control by using the existing ``Py_Initialize`` +API. Alternatively, if an embedding application wants greater control +over CPython's initial state, it will be able to use the new, finer +grained API, which allows the embedding application greater control +over the initialization process:: + + /* Phase 1: Pre-Initialization */ + Py_CoreConfig core_config = Py_CoreConfig_INIT; + PyObject *full_config = NULL; + /* Easily control the core configuration */ + core_config.ignore_environment = 1; /* Ignore environment variables */ + core_config.use_hash_seed = 0; /* Full hash randomisation */ + Py_BeginInitialization(&core_config); + /* Phase 2: Initialization */ + full_config = PyDict_New(); + /* Can preconfigure settings here - they will then be + * used to derive other settings */ + Py_ReadConfiguration(full_config); + /* Can completely override derived settings here */ + Py_EndInitialization(full_config); + /* Phase 3: Pre-Main */ + Py_DECREF(full_config); + /* If an embedding application has no real concept of a main module + * it can leave the interpreter in this state indefinitely. + * Otherwise, it can launch __main__ via the Py_Run*AsMain functions. + */ + + Pre-Initialization Phase ------------------------ -- Repository URL: http://hg.python.org/peps

1 0

peps: Allow future-proof initialisation of Py_CoreConfig
by nick.coghlan Dec. 30, 2012

Dec. 30, 2012

http://hg.python.org/peps/rev/6da7f3ff59b7 changeset: 4643:6da7f3ff59b7 user: Nick Coghlan <ncoghlan(a)gmail.com> date: Mon Dec 31 01:32:51 2012 +1000 summary: Allow future-proof initialisation of Py_CoreConfig files: pep-0432.txt | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/pep-0432.txt b/pep-0432.txt --- a/pep-0432.txt +++ b/pep-0432.txt @@ -546,9 +546,16 @@ unsigned long hash_seed; } Py_CoreConfig; + #define Py_CoreConfig_INIT {0, -1, 0} + The core configuration settings pointer may be ``NULL``, in which case the default values are ``ignore_environment = 0`` and ``use_hash_seed = -1``. +The ``Py_CoreConfig_INIT`` macro is designed to allow easy initialization +of a struct instance with sensible defaults:: + + Py_CoreConfig core_config = Py_CoreConfig_INIT; + ``ignore_environment`` controls the processing of all Python related environment variables. If the flag is zero, then environment variables are processed normally. Otherwise, all Python-specific environment variables -- Repository URL: http://hg.python.org/peps

1 0