Mailman 3 July 2013 - Python-checkins

cpython: Fix style
by antoine.pitrou July 31, 2013

July 31, 2013

http://hg.python.org/cpython/rev/31664b304281 changeset: 84933:31664b304281 parent: 84913:4e9c8807d029 user: Antoine Pitrou <solipsis(a)pitrou.net> date: Tue Jul 30 21:01:23 2013 +0200 summary: Fix style files: Python/pythonrun.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Python/pythonrun.c b/Python/pythonrun.c --- a/Python/pythonrun.c +++ b/Python/pythonrun.c @@ -1382,8 +1382,8 @@ return 0; } -int -static set_main_loader(PyObject *d, const char *filename, const char *loader_name) +static int +set_main_loader(PyObject *d, const char *filename, const char *loader_name) { PyInterpreterState *interp; PyThreadState *tstate; -- Repository URL: http://hg.python.org/cpython

1 0

cpython: #17616: wave.open now supports the 'with' statement.
by r.david.murray July 31, 2013

July 31, 2013

http://hg.python.org/cpython/rev/8327780d3841 changeset: 84932:8327780d3841 user: R David Murray <rdmurray(a)bitdance.com> date: Wed Jul 31 13:46:08 2013 -0400 summary: #17616: wave.open now supports the 'with' statement. Feature and tests by ClClaudiu.Popa, I added the doc changes. files: Doc/library/aifc.rst | 3 ++- Doc/library/wave.rst | 5 +++++ Doc/whatsnew/3.4.rst | 5 ++++- Lib/test/test_wave.py | 29 +++++++++++++++++++---------- Lib/wave.py | 13 +++++++++++++ Misc/NEWS | 2 ++ 6 files changed, 45 insertions(+), 12 deletions(-) diff --git a/Doc/library/aifc.rst b/Doc/library/aifc.rst --- a/Doc/library/aifc.rst +++ b/Doc/library/aifc.rst @@ -51,7 +51,8 @@ used for writing, the file object should be seekable, unless you know ahead of time how many samples you are going to write in total and use :meth:`writeframesraw` and :meth:`setnframes`. - Objects returned by :func:`.open` also supports the :keyword:`with` statement. + The :func:`.open` function may be used in a :keyword:`with` statement. When + the :keyword:`with` block completes, the :meth:`~aifc.close` method is called. .. versionchanged:: 3.4 Support for the :keyword:`with` statement was added. diff --git a/Doc/library/wave.rst b/Doc/library/wave.rst --- a/Doc/library/wave.rst +++ b/Doc/library/wave.rst @@ -39,6 +39,11 @@ :meth:`close` method is called; it is the caller's responsibility to close the file object. + The :func:`.open` function may be used in a :keyword:`with` statement. When + the :keyword:`with` block completes, the :meth:`Wave_read.close() + <wave.Wave_read.close>` or :meth:`Wave_write.close() + <wave.Wave_write.close()>` method is called. + .. function:: openfp(file, mode) diff --git a/Doc/whatsnew/3.4.rst b/Doc/whatsnew/3.4.rst --- a/Doc/whatsnew/3.4.rst +++ b/Doc/whatsnew/3.4.rst @@ -239,8 +239,11 @@ The :meth:`~wave.getparams` method now returns a namedtuple rather than a plain tuple. (Contributed by Claudiu Popa in :issue:`17487`.) +:meth:`wave.open` now supports the context manager protocol. (Contributed +by Claudiu Popa in :issue:`17616`.) + stat ---- +---- The stat module is now backed by a C implementation in :mod:`_stat`. A C implementation is required as most of the values aren't standardized and diff --git a/Lib/test/test_wave.py b/Lib/test/test_wave.py --- a/Lib/test/test_wave.py +++ b/Lib/test/test_wave.py @@ -1,7 +1,5 @@ -from test.support import TESTFN, run_unittest -import os +from test.support import TESTFN, unlink import wave -import struct import unittest nchannels = 2 @@ -17,10 +15,7 @@ def tearDown(self): if self.f is not None: self.f.close() - try: - os.remove(TESTFN) - except OSError: - pass + unlink(TESTFN) def test_it(self, test_rounding=False): self.f = wave.open(TESTFN, 'wb') @@ -74,9 +69,23 @@ self.assertEqual(params.comptype, self.f.getcomptype()) self.assertEqual(params.compname, self.f.getcompname()) + def test_context_manager(self): + self.f = wave.open(TESTFN, 'wb') + self.f.setnchannels(nchannels) + self.f.setsampwidth(sampwidth) + self.f.setframerate(framerate) + self.f.close() -def test_main(): - run_unittest(TestWave) + with wave.open(TESTFN) as f: + self.assertFalse(f.getfp().closed) + self.assertIs(f.getfp(), None) + + with open(TESTFN, 'wb') as testfile: + with self.assertRaises(wave.Error): + with wave.open(testfile, 'wb'): + pass + self.assertEqual(testfile.closed, False) + if __name__ == '__main__': - test_main() + unittest.main() diff --git a/Lib/wave.py b/Lib/wave.py --- a/Lib/wave.py +++ b/Lib/wave.py @@ -167,6 +167,13 @@ def __del__(self): self.close() + + def __enter__(self): + return self + + def __exit__(self, *args): + self.close() + # # User visible methods. # @@ -323,6 +330,12 @@ def __del__(self): self.close() + def __enter__(self): + return self + + def __exit__(self, *args): + self.close() + # # User visible methods. # diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -173,6 +173,8 @@ Library ------- +- Issue #17616: wave.open now supports the context manager protocol. + - Issue #18599: Fix name attribute of _sha1.sha1() object. It now returns 'SHA1' instead of 'SHA'. -- Repository URL: http://hg.python.org/cpython

1 0

cpython: yet another WITH_THREADS typo
by christian.heimes July 31, 2013

July 31, 2013

http://hg.python.org/cpython/rev/c3d90db88151 changeset: 84931:c3d90db88151 user: Christian Heimes <christian(a)cheimes.de> date: Wed Jul 31 13:32:40 2013 +0200 summary: yet another WITH_THREADS typo files: Modules/_sha3/sha3module.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Modules/_sha3/sha3module.c b/Modules/_sha3/sha3module.c --- a/Modules/_sha3/sha3module.c +++ b/Modules/_sha3/sha3module.c @@ -464,7 +464,7 @@ } if (data_obj) { -#ifdef WITH_THREADS +#ifdef WITH_THREAD if (buf.len >= HASHLIB_GIL_MINSIZE) { /* invariant: New objects can't be accessed by other code yet, * thus it's safe to release the GIL without locking the object. -- Repository URL: http://hg.python.org/cpython

1 0

cpython (merge default -> default): merge
by christian.heimes July 31, 2013

July 31, 2013

http://hg.python.org/cpython/rev/e825df34af94 changeset: 84930:e825df34af94 parent: 84929:6f2ba9a33bdf parent: 84927:acfb863b0937 user: Christian Heimes <christian(a)cheimes.de> date: Wed Jul 31 11:58:41 2013 +0200 summary: merge files: Doc/library/unittest.rst | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Doc/library/unittest.rst b/Doc/library/unittest.rst --- a/Doc/library/unittest.rst +++ b/Doc/library/unittest.rst @@ -974,12 +974,12 @@ Test that a warning is triggered when *callable* is called with any positional or keyword arguments that are also passed to :meth:`assertWarns`. The test passes if *warning* is triggered and - fails if it isn't. Also, any unexpected exception is an error. + fails if it isn't. Any exception is an error. To catch any of a group of warnings, a tuple containing the warning classes may be passed as *warnings*. If only the *warning* and possibly the *msg* arguments are given, - returns a context manager so that the code under test can be written + return a context manager so that the code under test can be written inline rather than as a function:: with self.assertWarns(SomeWarning): @@ -992,7 +992,7 @@ :attr:`warning` attribute, and the source line which triggered the warnings in the :attr:`filename` and :attr:`lineno` attributes. This can be useful if the intention is to perform additional checks - on the exception raised:: + on the warning caught:: with self.assertWarns(SomeWarning) as cm: do_something() -- Repository URL: http://hg.python.org/cpython

1 0

cpython: Fix _sha3 module to actually release the GIL around its update function.
by christian.heimes July 31, 2013

July 31, 2013

http://hg.python.org/cpython/rev/6f2ba9a33bdf changeset: 84929:6f2ba9a33bdf parent: 84925:5cea8bc7bc7f user: Christian Heimes <christian(a)cheimes.de> date: Wed Jul 31 11:58:18 2013 +0200 summary: Fix _sha3 module to actually release the GIL around its update function. gcov is great. files: Modules/_sha3/sha3module.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Modules/_sha3/sha3module.c b/Modules/_sha3/sha3module.c --- a/Modules/_sha3/sha3module.c +++ b/Modules/_sha3/sha3module.c @@ -322,7 +322,7 @@ GET_BUFFER_VIEW_OR_ERROUT(obj, &buf); /* add new data, the function takes the length in bits not bytes */ -#ifdef WITH_THREADS +#ifdef WITH_THREAD if (self->lock == NULL && buf.len >= HASHLIB_GIL_MINSIZE) { self->lock = PyThread_allocate_lock(); } -- Repository URL: http://hg.python.org/cpython

1 0

cpython (2.7): Issue #18071: Extension module builds on OS X could fail with TypeError
by ned.deily July 31, 2013

July 31, 2013

http://hg.python.org/cpython/rev/addd9210816b changeset: 84928:addd9210816b branch: 2.7 parent: 84902:6e1dd1ce95b8 user: Ned Deily <nad(a)acm.org> date: Wed Jul 31 00:14:20 2013 -0700 summary: Issue #18071: Extension module builds on OS X could fail with TypeError if Xcode command line tools were not installed. files: Lib/_osx_support.py | 4 ++-- Misc/NEWS | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/Lib/_osx_support.py b/Lib/_osx_support.py --- a/Lib/_osx_support.py +++ b/Lib/_osx_support.py @@ -53,7 +53,7 @@ def _read_output(commandstring): - """Output from succesful command execution or None""" + """Output from successful command execution or None""" # Similar to os.popen(commandstring, "r").read(), # but without actually using os.popen because that # function is not usable during python bootstrap. @@ -68,7 +68,7 @@ with contextlib.closing(fp) as fp: cmd = "%s 2>/dev/null >'%s'" % (commandstring, fp.name) - return fp.read().decode('utf-8').strip() if not os.system(cmd) else None + return fp.read().strip() if not os.system(cmd) else None def _find_build_tool(toolname): diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -74,6 +74,9 @@ the default for linking if LDSHARED is not also overriden. This restores Distutils behavior introduced in 2.7.3 and inadvertently dropped in 2.7.4. +- Issue #18071: C extension module builds on OS X could fail with TypeError + if the Xcode command line tools were not installed. + - Issue #18113: Fixed a refcount leak in the curses.panel module's set_userptr() method. Reported by Atsuo Ishimoto. -- Repository URL: http://hg.python.org/cpython

1 0

Daily reference leaks (5cea8bc7bc7f): sum=0
by solipsis＠pitrou.net July 31, 2013

July 31, 2013

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

1 0

cpython (merge 3.3 -> default): Merge with 3.3
by terry.reedy July 31, 2013

July 31, 2013

http://hg.python.org/cpython/rev/acfb863b0937 changeset: 84927:acfb863b0937 parent: 84925:5cea8bc7bc7f parent: 84926:366beee880aa user: Terry Jan Reedy <tjreedy(a)udel.edu> date: Tue Jul 30 22:31:30 2013 -0400 summary: Merge with 3.3 files: Doc/library/unittest.rst | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Doc/library/unittest.rst b/Doc/library/unittest.rst --- a/Doc/library/unittest.rst +++ b/Doc/library/unittest.rst @@ -974,12 +974,12 @@ Test that a warning is triggered when *callable* is called with any positional or keyword arguments that are also passed to :meth:`assertWarns`. The test passes if *warning* is triggered and - fails if it isn't. Also, any unexpected exception is an error. + fails if it isn't. Any exception is an error. To catch any of a group of warnings, a tuple containing the warning classes may be passed as *warnings*. If only the *warning* and possibly the *msg* arguments are given, - returns a context manager so that the code under test can be written + return a context manager so that the code under test can be written inline rather than as a function:: with self.assertWarns(SomeWarning): @@ -992,7 +992,7 @@ :attr:`warning` attribute, and the source line which triggered the warnings in the :attr:`filename` and :attr:`lineno` attributes. This can be useful if the intention is to perform additional checks - on the exception raised:: + on the warning caught:: with self.assertWarns(SomeWarning) as cm: do_something() -- Repository URL: http://hg.python.org/cpython

1 0

cpython (3.3): Issue #18573: More copy-paste fixes to assertWarns entry.
by terry.reedy July 31, 2013

July 31, 2013

http://hg.python.org/cpython/rev/366beee880aa changeset: 84926:366beee880aa branch: 3.3 parent: 84921:e6f2f3eda290 user: Terry Jan Reedy <tjreedy(a)udel.edu> date: Tue Jul 30 22:31:06 2013 -0400 summary: Issue #18573: More copy-paste fixes to assertWarns entry. files: Doc/library/unittest.rst | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Doc/library/unittest.rst b/Doc/library/unittest.rst --- a/Doc/library/unittest.rst +++ b/Doc/library/unittest.rst @@ -897,12 +897,12 @@ Test that a warning is triggered when *callable* is called with any positional or keyword arguments that are also passed to :meth:`assertWarns`. The test passes if *warning* is triggered and - fails if it isn't. Also, any unexpected exception is an error. + fails if it isn't. Any exception is an error. To catch any of a group of warnings, a tuple containing the warning classes may be passed as *warnings*. If only the *warning* and possibly the *msg* arguments are given, - returns a context manager so that the code under test can be written + return a context manager so that the code under test can be written inline rather than as a function:: with self.assertWarns(SomeWarning): @@ -915,7 +915,7 @@ :attr:`warning` attribute, and the source line which triggered the warnings in the :attr:`filename` and :attr:`lineno` attributes. This can be useful if the intention is to perform additional checks - on the exception raised:: + on the warning caught:: with self.assertWarns(SomeWarning) as cm: do_something() -- Repository URL: http://hg.python.org/cpython

1 0

cpython: Test Py_IncRef() and Py_DecRef() C functions
by christian.heimes July 31, 2013

July 31, 2013

http://hg.python.org/cpython/rev/5cea8bc7bc7f changeset: 84925:5cea8bc7bc7f user: Christian Heimes <christian(a)cheimes.de> date: Wed Jul 31 02:36:43 2013 +0200 summary: Test Py_IncRef() and Py_DecRef() C functions files: Modules/_testcapimodule.c | 11 +++++++++++ 1 files changed, 11 insertions(+), 0 deletions(-) diff --git a/Modules/_testcapimodule.c b/Modules/_testcapimodule.c --- a/Modules/_testcapimodule.c +++ b/Modules/_testcapimodule.c @@ -2614,6 +2614,16 @@ } static PyObject * +test_incref_decref_API(PyObject *ob) +{ + PyObject *obj = PyLong_FromLong(0); + Py_IncRef(ob); + Py_DecRef(obj); + Py_DecRef(obj); + Py_RETURN_NONE; +} + +static PyObject * test_pymem_alloc0(PyObject *self) { void *ptr; @@ -2781,6 +2791,7 @@ {"test_incref_doesnt_leak", (PyCFunction)test_incref_doesnt_leak, METH_NOARGS}, {"test_xdecref_doesnt_leak",(PyCFunction)test_xdecref_doesnt_leak, METH_NOARGS}, {"test_decref_doesnt_leak", (PyCFunction)test_decref_doesnt_leak, METH_NOARGS}, + {"test_incref_decref_API", (PyCFunction)test_incref_decref_API, METH_NOARGS}, {"test_long_and_overflow", (PyCFunction)test_long_and_overflow, METH_NOARGS}, {"test_long_as_double", (PyCFunction)test_long_as_double,METH_NOARGS}, -- Repository URL: http://hg.python.org/cpython

1 0