Mailman 3 June 2014 - Python-checkins

cpython: (Merge 3.4) asyncio, Tulip issue 137: In debug mode, add the traceback where
by victor.stinner 27 Jun '14

27 Jun '14

http://hg.python.org/cpython/rev/d8c24c25c42d changeset: 91443:d8c24c25c42d parent: 91441:4be3ee53c62c user: Victor Stinner <victor.stinner(a)gmail.com> date: Fri Jun 27 12:29:30 2014 +0200 summary: (Merge 3.4) asyncio, Tulip issue 137: In debug mode, add the traceback where the coroutine object was created to the "coroutine ... was never yield from" log files: Lib/asyncio/tasks.py | 17 +++++--- Lib/test/test_asyncio/test_tasks.py | 32 +++++++++++++++++ 2 files changed, 42 insertions(+), 7 deletions(-) diff --git a/Lib/asyncio/tasks.py b/Lib/asyncio/tasks.py --- a/Lib/asyncio/tasks.py +++ b/Lib/asyncio/tasks.py @@ -43,6 +43,7 @@ assert inspect.isgenerator(gen), gen self.gen = gen self.func = func + self._source_traceback = traceback.extract_stack(sys._getframe(1)) def __iter__(self): return self @@ -81,13 +82,13 @@ gen = getattr(self, 'gen', None) frame = getattr(gen, 'gi_frame', None) if frame is not None and frame.f_lasti == -1: - func = self.func - code = func.__code__ - filename = code.co_filename - lineno = code.co_firstlineno - logger.error( - 'Coroutine %r defined at %s:%s was never yielded from', - func.__name__, filename, lineno) + func = events._format_callback(self.func, ()) + tb = ''.join(traceback.format_list(self._source_traceback)) + message = ('Coroutine %s was never yielded from\n' + 'Coroutine object created at (most recent call last):\n' + '%s' + % (func, tb.rstrip())) + logger.error(message) def coroutine(func): @@ -112,6 +113,8 @@ @functools.wraps(func) def wrapper(*args, **kwds): w = CoroWrapper(coro(*args, **kwds), func) + if w._source_traceback: + del w._source_traceback[-1] w.__name__ = func.__name__ if _PY35: w.__qualname__ = func.__qualname__ diff --git a/Lib/test/test_asyncio/test_tasks.py b/Lib/test/test_asyncio/test_tasks.py --- a/Lib/test/test_asyncio/test_tasks.py +++ b/Lib/test/test_asyncio/test_tasks.py @@ -1,6 +1,7 @@ """Tests for tasks.py.""" import os.path +import re import sys import types import unittest @@ -1572,6 +1573,37 @@ }) mock_handler.reset_mock() + @mock.patch('asyncio.tasks.logger') + def test_coroutine_never_yielded(self, m_log): + debug = asyncio.tasks._DEBUG + try: + asyncio.tasks._DEBUG = True + @asyncio.coroutine + def coro_noop(): + pass + finally: + asyncio.tasks._DEBUG = debug + + tb_filename = __file__ + tb_lineno = sys._getframe().f_lineno + 1 + coro = coro_noop() + coro = None + support.gc_collect() + + self.assertTrue(m_log.error.called) + message = m_log.error.call_args[0][0] + func_filename, func_lineno = test_utils.get_function_source(coro_noop) + regex = (r'^Coroutine %s at %s:%s was never yielded from\n' + r'Coroutine object created at $most recent call last$:\n' + r'.*\n' + r' File "%s", line %s, in test_coroutine_never_yielded\n' + r' coro = coro_noop$' + % (re.escape(coro_noop.__qualname__), + func_filename, func_lineno, + tb_filename, tb_lineno)) + + self.assertRegex(message, re.compile(regex, re.DOTALL)) + class GatherTestsBase: -- Repository URL: http://hg.python.org/cpython

1 0

cpython (3.4): asyncio, Tulip issue 137: In debug mode, add the traceback where the coroutine
by victor.stinner 27 Jun '14

27 Jun '14

http://hg.python.org/cpython/rev/84816348e809 changeset: 91442:84816348e809 branch: 3.4 parent: 91440:1cd4210c050b user: Victor Stinner <victor.stinner(a)gmail.com> date: Fri Jun 27 12:28:41 2014 +0200 summary: asyncio, Tulip issue 137: In debug mode, add the traceback where the coroutine object was created to the "coroutine ... was never yield from" log files: Lib/asyncio/tasks.py | 17 +++++--- Lib/test/test_asyncio/test_tasks.py | 32 +++++++++++++++++ 2 files changed, 42 insertions(+), 7 deletions(-) diff --git a/Lib/asyncio/tasks.py b/Lib/asyncio/tasks.py --- a/Lib/asyncio/tasks.py +++ b/Lib/asyncio/tasks.py @@ -43,6 +43,7 @@ assert inspect.isgenerator(gen), gen self.gen = gen self.func = func + self._source_traceback = traceback.extract_stack(sys._getframe(1)) def __iter__(self): return self @@ -81,13 +82,13 @@ gen = getattr(self, 'gen', None) frame = getattr(gen, 'gi_frame', None) if frame is not None and frame.f_lasti == -1: - func = self.func - code = func.__code__ - filename = code.co_filename - lineno = code.co_firstlineno - logger.error( - 'Coroutine %r defined at %s:%s was never yielded from', - func.__name__, filename, lineno) + func = events._format_callback(self.func, ()) + tb = ''.join(traceback.format_list(self._source_traceback)) + message = ('Coroutine %s was never yielded from\n' + 'Coroutine object created at (most recent call last):\n' + '%s' + % (func, tb.rstrip())) + logger.error(message) def coroutine(func): @@ -112,6 +113,8 @@ @functools.wraps(func) def wrapper(*args, **kwds): w = CoroWrapper(coro(*args, **kwds), func) + if w._source_traceback: + del w._source_traceback[-1] w.__name__ = func.__name__ if _PY35: w.__qualname__ = func.__qualname__ diff --git a/Lib/test/test_asyncio/test_tasks.py b/Lib/test/test_asyncio/test_tasks.py --- a/Lib/test/test_asyncio/test_tasks.py +++ b/Lib/test/test_asyncio/test_tasks.py @@ -1,6 +1,7 @@ """Tests for tasks.py.""" import os.path +import re import sys import types import unittest @@ -1572,6 +1573,37 @@ }) mock_handler.reset_mock() + @mock.patch('asyncio.tasks.logger') + def test_coroutine_never_yielded(self, m_log): + debug = asyncio.tasks._DEBUG + try: + asyncio.tasks._DEBUG = True + @asyncio.coroutine + def coro_noop(): + pass + finally: + asyncio.tasks._DEBUG = debug + + tb_filename = __file__ + tb_lineno = sys._getframe().f_lineno + 1 + coro = coro_noop() + coro = None + support.gc_collect() + + self.assertTrue(m_log.error.called) + message = m_log.error.call_args[0][0] + func_filename, func_lineno = test_utils.get_function_source(coro_noop) + regex = (r'^Coroutine %s at %s:%s was never yielded from\n' + r'Coroutine object created at $most recent call last$:\n' + r'.*\n' + r' File "%s", line %s, in test_coroutine_never_yielded\n' + r' coro = coro_noop$' + % (re.escape(coro_noop.__qualname__), + func_filename, func_lineno, + tb_filename, tb_lineno)) + + self.assertRegex(message, re.compile(regex, re.DOTALL)) + class GatherTestsBase: -- Repository URL: http://hg.python.org/cpython

1 0

cpython (merge 3.4 -> default): (Merge 3.4) asyncio: Oops, restore a removed test
by victor.stinner 27 Jun '14

27 Jun '14

http://hg.python.org/cpython/rev/4be3ee53c62c changeset: 91441:4be3ee53c62c parent: 91439:3124790c07b4 parent: 91440:1cd4210c050b user: Victor Stinner <victor.stinner(a)gmail.com> date: Fri Jun 27 12:24:14 2014 +0200 summary: (Merge 3.4) asyncio: Oops, restore a removed test files: Lib/test/test_asyncio/test_tasks.py | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/Lib/test/test_asyncio/test_tasks.py b/Lib/test/test_asyncio/test_tasks.py --- a/Lib/test/test_asyncio/test_tasks.py +++ b/Lib/test/test_asyncio/test_tasks.py @@ -1529,6 +1529,9 @@ def test_corowrapper_weakref(self): wd = weakref.WeakValueDictionary() def foo(): yield from [] + cw = asyncio.tasks.CoroWrapper(foo(), foo) + wd['cw'] = cw # Would fail without __weakref__ slot. + cw.gen = None # Suppress warning from __del__. @unittest.skipUnless(PY34, 'need python 3.4 or later') -- Repository URL: http://hg.python.org/cpython

1 0

cpython (3.4): asyncio: Oops, restore a removed test
by victor.stinner 27 Jun '14

27 Jun '14

http://hg.python.org/cpython/rev/1cd4210c050b changeset: 91440:1cd4210c050b branch: 3.4 parent: 91438:d130a04fa6a1 user: Victor Stinner <victor.stinner(a)gmail.com> date: Fri Jun 27 12:23:41 2014 +0200 summary: asyncio: Oops, restore a removed test files: Lib/test/test_asyncio/test_tasks.py | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/Lib/test/test_asyncio/test_tasks.py b/Lib/test/test_asyncio/test_tasks.py --- a/Lib/test/test_asyncio/test_tasks.py +++ b/Lib/test/test_asyncio/test_tasks.py @@ -1529,6 +1529,9 @@ def test_corowrapper_weakref(self): wd = weakref.WeakValueDictionary() def foo(): yield from [] + cw = asyncio.tasks.CoroWrapper(foo(), foo) + wd['cw'] = cw # Would fail without __weakref__ slot. + cw.gen = None # Suppress warning from __del__. @unittest.skipUnless(PY34, 'need python 3.4 or later') -- Repository URL: http://hg.python.org/cpython

1 0

Daily reference leaks (169171da66fa): sum=23
by solipsis＠pitrou.net 27 Jun '14

27 Jun '14

results for 169171da66fa on branch "default" -------------------------------------------- test_asyncio leaked [0, 4, 0] memory blocks, sum=4 test_collections leaked [0, 4, 0] references, sum=4 test_collections leaked [0, 2, 0] memory blocks, sum=2 test_functools leaked [0, 0, 3] memory blocks, sum=3 test_io leaked [2, 2, 2] references, sum=6 test_site leaked [2, 0, 0] references, sum=2 test_site leaked [2, 0, 0] memory blocks, sum=2 Command line was: ['./python', '-m', 'test.regrtest', '-uall', '-R', '3:3:/home/antoine/cpython/refleaks/reflog71yKqN', '-x']

1 0

cpython (merge 3.4 -> default): Issue #21875: Remove vestigial references to Classic Mac OS in os module docs.
by ned.deily 27 Jun '14

27 Jun '14

http://hg.python.org/cpython/rev/3124790c07b4 changeset: 91439:3124790c07b4 parent: 91436:738262a327af parent: 91438:d130a04fa6a1 user: Ned Deily <nad(a)acm.org> date: Thu Jun 26 23:42:38 2014 -0700 summary: Issue #21875: Remove vestigial references to Classic Mac OS in os module docs. files: Doc/library/os.rst | 8 +------- Lib/os.py | 2 +- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/Doc/library/os.rst b/Doc/library/os.rst --- a/Doc/library/os.rst +++ b/Doc/library/os.rst @@ -53,7 +53,7 @@ .. data:: name The name of the operating system dependent module imported. The following - names have currently been registered: ``'posix'``, ``'nt'``, ``'mac'``, + names have currently been registered: ``'posix'``, ``'nt'``, ``'ce'``, ``'java'``. .. seealso:: @@ -1899,12 +1899,6 @@ * :attr:`st_gen` - file generation number * :attr:`st_birthtime` - time of file creation - On Mac OS systems, the following attributes may also be available: - - * :attr:`st_rsize` - * :attr:`st_creator` - * :attr:`st_type` - On Windows systems, the following attribute is also available: * :attr:`st_file_attributes` - Windows file attribute bits (see the diff --git a/Lib/os.py b/Lib/os.py --- a/Lib/os.py +++ b/Lib/os.py @@ -1,4 +1,4 @@ -r"""OS routines for Mac, NT, or Posix depending on what system we're on. +r"""OS routines for NT or Posix depending on what system we're on. This exports: - all functions from posix, nt or ce, e.g. unlink, stat, etc. -- Repository URL: http://hg.python.org/cpython

1 0

cpython (3.4): Issue #21875: Remove vestigial references to Classic Mac OS in os module docs.
by ned.deily 27 Jun '14

27 Jun '14

http://hg.python.org/cpython/rev/d130a04fa6a1 changeset: 91438:d130a04fa6a1 branch: 3.4 parent: 91435:92521be371c5 user: Ned Deily <nad(a)acm.org> date: Thu Jun 26 23:40:06 2014 -0700 summary: Issue #21875: Remove vestigial references to Classic Mac OS in os module docs. files: Doc/library/os.rst | 8 +------- Lib/os.py | 2 +- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/Doc/library/os.rst b/Doc/library/os.rst --- a/Doc/library/os.rst +++ b/Doc/library/os.rst @@ -53,7 +53,7 @@ .. data:: name The name of the operating system dependent module imported. The following - names have currently been registered: ``'posix'``, ``'nt'``, ``'mac'``, + names have currently been registered: ``'posix'``, ``'nt'``, ``'ce'``, ``'java'``. .. seealso:: @@ -1891,12 +1891,6 @@ * :attr:`st_gen` - file generation number * :attr:`st_birthtime` - time of file creation - On Mac OS systems, the following attributes may also be available: - - * :attr:`st_rsize` - * :attr:`st_creator` - * :attr:`st_type` - .. note:: The exact meaning and resolution of the :attr:`st_atime`, diff --git a/Lib/os.py b/Lib/os.py --- a/Lib/os.py +++ b/Lib/os.py @@ -1,4 +1,4 @@ -r"""OS routines for Mac, NT, or Posix depending on what system we're on. +r"""OS routines for NT or Posix depending on what system we're on. This exports: - all functions from posix, nt or ce, e.g. unlink, stat, etc. -- Repository URL: http://hg.python.org/cpython

1 0

cpython (2.7): Issue #21875: Remove vestigial references to Classic Mac OS in os module docs.
by ned.deily 27 Jun '14

27 Jun '14

http://hg.python.org/cpython/rev/94f7cdab9f71 changeset: 91437:94f7cdab9f71 branch: 2.7 parent: 91434:aa4b4487c7ad user: Ned Deily <nad(a)acm.org> date: Thu Jun 26 23:38:14 2014 -0700 summary: Issue #21875: Remove vestigial references to Classic Mac OS in os module docs. files: Doc/library/os.rst | 11 ++--------- Lib/os.py | 2 +- 2 files changed, 3 insertions(+), 10 deletions(-) diff --git a/Doc/library/os.rst b/Doc/library/os.rst --- a/Doc/library/os.rst +++ b/Doc/library/os.rst @@ -1382,9 +1382,8 @@ .. versionchanged:: 2.3 If :func:`stat_float_times` returns ``True``, the time values are floats, measuring - seconds. Fractions of a second may be reported if the system supports that. On - Mac OS, the times are always floats. See :func:`stat_float_times` for further - discussion. + seconds. Fractions of a second may be reported if the system supports that. + See :func:`stat_float_times` for further discussion. On some Unix systems (such as Linux), the following attributes may also be available: @@ -1400,12 +1399,6 @@ * :attr:`st_gen` - file generation number * :attr:`st_birthtime` - time of file creation - On Mac OS systems, the following attributes may also be available: - - * :attr:`st_rsize` - * :attr:`st_creator` - * :attr:`st_type` - On RISCOS systems, the following attributes are also available: * :attr:`st_ftype` (file type) diff --git a/Lib/os.py b/Lib/os.py --- a/Lib/os.py +++ b/Lib/os.py @@ -1,4 +1,4 @@ -r"""OS routines for Mac, NT, or Posix depending on what system we're on. +r"""OS routines for NT or Posix depending on what system we're on. This exports: - all functions from posix, nt, os2, or ce, e.g. unlink, stat, etc. -- Repository URL: http://hg.python.org/cpython

1 0

cpython (merge 3.4 -> default): merge 3.4
by benjamin.peterson 27 Jun '14

27 Jun '14

http://hg.python.org/cpython/rev/738262a327af changeset: 91436:738262a327af parent: 91433:169171da66fa parent: 91435:92521be371c5 user: Benjamin Peterson <benjamin(a)python.org> date: Thu Jun 26 23:29:19 2014 -0700 summary: merge 3.4 files: Objects/abstract.c | 15 ++++++--------- 1 files changed, 6 insertions(+), 9 deletions(-) diff --git a/Objects/abstract.c b/Objects/abstract.c --- a/Objects/abstract.c +++ b/Objects/abstract.c @@ -2205,9 +2205,8 @@ return null_error(); func = PyObject_GetAttrString(o, name); - if (func == NULL) { - return 0; - } + if (func == NULL) + return NULL; va_start(va, format); retval = callmethod(func, format, va, 0); @@ -2227,9 +2226,8 @@ return null_error(); func = _PyObject_GetAttrId(o, name); - if (func == NULL) { - return 0; - } + if (func == NULL) + return NULL; va_start(va, format); retval = callmethod(func, format, va, 0); @@ -2249,9 +2247,8 @@ return null_error(); func = PyObject_GetAttrString(o, name); - if (func == NULL) { - return 0; - } + if (func == NULL) + return NULL; va_start(va, format); retval = callmethod(func, format, va, 1); va_end(va); -- Repository URL: http://hg.python.org/cpython

1 0

cpython (3.4): use NULL not 0
by benjamin.peterson 27 Jun '14

27 Jun '14

http://hg.python.org/cpython/rev/92521be371c5 changeset: 91435:92521be371c5 branch: 3.4 parent: 91432:62612b195cb5 user: Benjamin Peterson <benjamin(a)python.org> date: Thu Jun 26 23:29:13 2014 -0700 summary: use NULL not 0 files: Objects/abstract.c | 15 ++++++--------- 1 files changed, 6 insertions(+), 9 deletions(-) diff --git a/Objects/abstract.c b/Objects/abstract.c --- a/Objects/abstract.c +++ b/Objects/abstract.c @@ -2191,9 +2191,8 @@ return null_error(); func = PyObject_GetAttrString(o, name); - if (func == NULL) { - return 0; - } + if (func == NULL) + return NULL; va_start(va, format); retval = callmethod(func, format, va, 0); @@ -2213,9 +2212,8 @@ return null_error(); func = _PyObject_GetAttrId(o, name); - if (func == NULL) { - return 0; - } + if (func == NULL) + return NULL; va_start(va, format); retval = callmethod(func, format, va, 0); @@ -2235,9 +2233,8 @@ return null_error(); func = PyObject_GetAttrString(o, name); - if (func == NULL) { - return 0; - } + if (func == NULL) + return NULL; va_start(va, format); retval = callmethod(func, format, va, 1); va_end(va); -- Repository URL: http://hg.python.org/cpython

1 0