Mailman 3 June 2014 - Python-checkins

cpython (merge 3.4 -> default): merge
by raymond.hettinger 24 Jun '14

24 Jun '14

http://hg.python.org/cpython/rev/2f3a0ad5fe1f changeset: 91368:2f3a0ad5fe1f parent: 91358:3fa0d2b297c6 parent: 91367:c238d2899d47 user: Raymond Hettinger <python(a)rcn.com> date: Tue Jun 24 13:44:39 2014 -0700 summary: merge files: Lib/collections/__init__.py | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/Lib/collections/__init__.py b/Lib/collections/__init__.py --- a/Lib/collections/__init__.py +++ b/Lib/collections/__init__.py @@ -352,6 +352,7 @@ if isinstance(field_names, str): field_names = field_names.replace(',', ' ').split() field_names = list(map(str, field_names)) + typename = str(typename) if rename: seen = set() for index, name in enumerate(field_names): @@ -362,6 +363,8 @@ field_names[index] = '_%d' % index seen.add(name) for name in [typename] + field_names: + if type(name) != str: + raise TypeError('Type names and field names must be strings') if not name.isidentifier(): raise ValueError('Type names and field names must be valid ' 'identifiers: %r' % name) -- Repository URL: http://hg.python.org/cpython

1 0

cpython (3.4): Issue 21832: Require named tuple inputs to be exact strings
by raymond.hettinger 24 Jun '14

24 Jun '14

http://hg.python.org/cpython/rev/c238d2899d47 changeset: 91367:c238d2899d47 branch: 3.4 parent: 91357:a941bb617c2a user: Raymond Hettinger <python(a)rcn.com> date: Tue Jun 24 13:44:03 2014 -0700 summary: Issue 21832: Require named tuple inputs to be exact strings files: Lib/collections/__init__.py | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/Lib/collections/__init__.py b/Lib/collections/__init__.py --- a/Lib/collections/__init__.py +++ b/Lib/collections/__init__.py @@ -323,6 +323,7 @@ if isinstance(field_names, str): field_names = field_names.replace(',', ' ').split() field_names = list(map(str, field_names)) + typename = str(typename) if rename: seen = set() for index, name in enumerate(field_names): @@ -333,6 +334,8 @@ field_names[index] = '_%d' % index seen.add(name) for name in [typename] + field_names: + if type(name) != str: + raise TypeError('Type names and field names must be strings') if not name.isidentifier(): raise ValueError('Type names and field names must be valid ' 'identifiers: %r' % name) -- Repository URL: http://hg.python.org/cpython

1 0

cpython (merge 3.4 -> default): (Merge 3.4) asyncio: repr(Task) now also contains the line number even if the
by victor.stinner 24 Jun '14

24 Jun '14

http://hg.python.org/cpython/rev/4a0a0d4d5fd5 changeset: 91366:4a0a0d4d5fd5 parent: 91363:e67ad57eed26 parent: 91365:3bedc1846202 user: Victor Stinner <victor.stinner(a)gmail.com> date: Tue Jun 24 22:58:23 2014 +0200 summary: (Merge 3.4) asyncio: repr(Task) now also contains the line number even if the coroutine is done: use the first line number of the code object instead of the current line number of the generator frame. The name of the coroutine is not enough because many coroutines may have the same name. It's a common case in asyncio tests for example. files: Lib/asyncio/tasks.py | 6 ++++-- Lib/test/test_asyncio/test_tasks.py | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/Lib/asyncio/tasks.py b/Lib/asyncio/tasks.py --- a/Lib/asyncio/tasks.py +++ b/Lib/asyncio/tasks.py @@ -208,9 +208,11 @@ if iscoroutine(coro): filename = coro.gi_code.co_filename if coro.gi_frame is not None: - text += ' at %s:%s' % (filename, coro.gi_frame.f_lineno) + lineno = coro.gi_frame.f_lineno + text += ' at %s:%s' % (filename, lineno) else: - text += ' done at %s' % filename + lineno = coro.gi_code.co_firstlineno + text += ' done at %s:%s' % (filename, lineno) res = res[:i] + '(<{}>)'.format(text) + res[i:] return res 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 @@ -148,12 +148,14 @@ self.assertRaises(asyncio.CancelledError, self.loop.run_until_complete, t) self.assertEqual(repr(t), - 'Task(<notmuch done at %s>)<CANCELLED>' % filename) + 'Task(<notmuch done at %s:%s>)<CANCELLED>' + % (filename, lineno)) t = asyncio.Task(notmuch(), loop=self.loop) self.loop.run_until_complete(t) self.assertEqual(repr(t), - "Task(<notmuch done at %s>)<result='abc'>" % filename) + "Task(<notmuch done at %s:%s>)<result='abc'>" + % (filename, lineno)) def test_task_repr_custom(self): @asyncio.coroutine -- Repository URL: http://hg.python.org/cpython

1 0

cpython (3.4): asyncio: repr(Task) now also contains the line number even if the coroutine is
by victor.stinner 24 Jun '14

24 Jun '14

http://hg.python.org/cpython/rev/3bedc1846202 changeset: 91365:3bedc1846202 branch: 3.4 parent: 91362:ffdd2d0b0049 user: Victor Stinner <victor.stinner(a)gmail.com> date: Tue Jun 24 22:57:14 2014 +0200 summary: asyncio: repr(Task) now also contains the line number even if the coroutine is done: use the first line number of the code object instead of the current line number of the generator frame. The name of the coroutine is not enough because many coroutines may have the same name. It's a common case in asyncio tests for example. files: Lib/asyncio/tasks.py | 6 ++++-- Lib/test/test_asyncio/test_tasks.py | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/Lib/asyncio/tasks.py b/Lib/asyncio/tasks.py --- a/Lib/asyncio/tasks.py +++ b/Lib/asyncio/tasks.py @@ -208,9 +208,11 @@ if iscoroutine(coro): filename = coro.gi_code.co_filename if coro.gi_frame is not None: - text += ' at %s:%s' % (filename, coro.gi_frame.f_lineno) + lineno = coro.gi_frame.f_lineno + text += ' at %s:%s' % (filename, lineno) else: - text += ' done at %s' % filename + lineno = coro.gi_code.co_firstlineno + text += ' done at %s:%s' % (filename, lineno) res = res[:i] + '(<{}>)'.format(text) + res[i:] return res 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 @@ -148,12 +148,14 @@ self.assertRaises(asyncio.CancelledError, self.loop.run_until_complete, t) self.assertEqual(repr(t), - 'Task(<notmuch done at %s>)<CANCELLED>' % filename) + 'Task(<notmuch done at %s:%s>)<CANCELLED>' + % (filename, lineno)) t = asyncio.Task(notmuch(), loop=self.loop) self.loop.run_until_complete(t) self.assertEqual(repr(t), - "Task(<notmuch done at %s>)<result='abc'>" % filename) + "Task(<notmuch done at %s:%s>)<result='abc'>" + % (filename, lineno)) def test_task_repr_custom(self): @asyncio.coroutine -- Repository URL: http://hg.python.org/cpython

1 0

cpython (2.7): #20155: use fake HTTP method names so windows doesn't hang the tests.
by r.david.murray 24 Jun '14

24 Jun '14

http://hg.python.org/cpython/rev/b0526da56c54 changeset: 91364:b0526da56c54 branch: 2.7 parent: 91361:30063f97a44d user: R David Murray <rdmurray(a)bitdance.com> date: Tue Jun 24 16:49:24 2014 -0400 summary: #20155: use fake HTTP method names so windows doesn't hang the tests. Windows was seeing the 'GET' generated by these tests as invalid and forcibly closing the socket, causing the test to fail. Patch by Jeff Allen. files: Lib/test/test_httpservers.py | 5 +++-- Misc/ACKS | 1 + Misc/NEWS | 4 ++++ 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/Lib/test/test_httpservers.py b/Lib/test/test_httpservers.py --- a/Lib/test/test_httpservers.py +++ b/Lib/test/test_httpservers.py @@ -189,7 +189,7 @@ def test_request_line_trimming(self): self.con._http_vsn_str = 'HTTP/1.1\n' - self.con.putrequest('GET', '/') + self.con.putrequest('XYZBOGUS', '/') self.con.endheaders() res = self.con.getresponse() self.assertEqual(res.status, 501) @@ -216,8 +216,9 @@ self.assertEqual(res.status, 501) def test_version_none(self): + # Test that a valid method is rejected when not HTTP/1.x self.con._http_vsn_str = '' - self.con.putrequest('PUT', '/') + self.con.putrequest('CUSTOM', '/') self.con.endheaders() res = self.con.getresponse() self.assertEqual(res.status, 400) diff --git a/Misc/ACKS b/Misc/ACKS --- a/Misc/ACKS +++ b/Misc/ACKS @@ -28,6 +28,7 @@ Jyrki Alakuijala Steve Alexander Fred Allen +Jeff Allen Ray Allen Billy G. Allie Kevin Altis diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -100,6 +100,10 @@ Tests ----- +- Issue #20155: Changed HTTP method names in failing tests in test_httpservers + so that packet filtering software (specifically Windows Base Filtering Engine) + does not interfere with the transaction semantics expected by the tests. + - Issue #19493: Refactored the ctypes test package to skip tests explicitly rather than silently. -- Repository URL: http://hg.python.org/cpython

1 0

cpython (merge 3.4 -> default): merge: #20155: use fake HTTP method names so windows doesn't hang the tests.
by r.david.murray 24 Jun '14

24 Jun '14

http://hg.python.org/cpython/rev/e67ad57eed26 changeset: 91363:e67ad57eed26 parent: 91360:e1d81c32f13d parent: 91362:ffdd2d0b0049 user: R David Murray <rdmurray(a)bitdance.com> date: Tue Jun 24 16:49:04 2014 -0400 summary: merge: #20155: use fake HTTP method names so windows doesn't hang the tests. files: Lib/test/test_httpservers.py | 5 +++-- Misc/ACKS | 1 + Misc/NEWS | 4 ++++ 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/Lib/test/test_httpservers.py b/Lib/test/test_httpservers.py --- a/Lib/test/test_httpservers.py +++ b/Lib/test/test_httpservers.py @@ -125,7 +125,7 @@ def test_request_line_trimming(self): self.con._http_vsn_str = 'HTTP/1.1\n' - self.con.putrequest('GET', '/') + self.con.putrequest('XYZBOGUS', '/') self.con.endheaders() res = self.con.getresponse() self.assertEqual(res.status, 501) @@ -152,8 +152,9 @@ self.assertEqual(res.status, 501) def test_version_none(self): + # Test that a valid method is rejected when not HTTP/1.x self.con._http_vsn_str = '' - self.con.putrequest('PUT', '/') + self.con.putrequest('CUSTOM', '/') self.con.endheaders() res = self.con.getresponse() self.assertEqual(res.status, 400) diff --git a/Misc/ACKS b/Misc/ACKS --- a/Misc/ACKS +++ b/Misc/ACKS @@ -29,6 +29,7 @@ Jyrki Alakuijala Steve Alexander Fred Allen +Jeff Allen Ray Allen Billy G. Allie Kevin Altis diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -612,6 +612,10 @@ Tests ----- +- Issue #20155: Changed HTTP method names in failing tests in test_httpservers + so that packet filtering software (specifically Windows Base Filtering Engine) + does not interfere with the transaction semantics expected by the tests. + - Issue #19493: Refactored the ctypes test package to skip tests explicitly rather than silently. -- Repository URL: http://hg.python.org/cpython

1 0

cpython (3.4): #20155: use fake HTTP method names so windows doesn't hang the tests.
by r.david.murray 24 Jun '14

24 Jun '14

http://hg.python.org/cpython/rev/ffdd2d0b0049 changeset: 91362:ffdd2d0b0049 branch: 3.4 parent: 91359:978525270264 user: R David Murray <rdmurray(a)bitdance.com> date: Tue Jun 24 16:39:49 2014 -0400 summary: #20155: use fake HTTP method names so windows doesn't hang the tests. Windows was seeing the 'GET' generated by these tests as invalid and forcibly closing the socket, causing the test to fail. Patch by Jeff Allen. files: Lib/test/test_httpservers.py | 5 +++-- Misc/ACKS | 1 + Misc/NEWS | 4 ++++ 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/Lib/test/test_httpservers.py b/Lib/test/test_httpservers.py --- a/Lib/test/test_httpservers.py +++ b/Lib/test/test_httpservers.py @@ -125,7 +125,7 @@ def test_request_line_trimming(self): self.con._http_vsn_str = 'HTTP/1.1\n' - self.con.putrequest('GET', '/') + self.con.putrequest('XYZBOGUS', '/') self.con.endheaders() res = self.con.getresponse() self.assertEqual(res.status, 501) @@ -152,8 +152,9 @@ self.assertEqual(res.status, 501) def test_version_none(self): + # Test that a valid method is rejected when not HTTP/1.x self.con._http_vsn_str = '' - self.con.putrequest('PUT', '/') + self.con.putrequest('CUSTOM', '/') self.con.endheaders() res = self.con.getresponse() self.assertEqual(res.status, 400) diff --git a/Misc/ACKS b/Misc/ACKS --- a/Misc/ACKS +++ b/Misc/ACKS @@ -29,6 +29,7 @@ Jyrki Alakuijala Steve Alexander Fred Allen +Jeff Allen Ray Allen Billy G. Allie Kevin Altis diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -133,6 +133,10 @@ Tests ----- +- Issue #20155: Changed HTTP method names in failing tests in test_httpservers + so that packet filtering software (specifically Windows Base Filtering Engine) + does not interfere with the transaction semantics expected by the tests. + - Issue #19493: Refactored the ctypes test package to skip tests explicitly rather than silently. -- Repository URL: http://hg.python.org/cpython

1 0

cpython (2.7): Issue 21832: Require named tuple inputs to be exact strings
by raymond.hettinger 24 Jun '14

24 Jun '14

http://hg.python.org/cpython/rev/30063f97a44d changeset: 91361:30063f97a44d branch: 2.7 parent: 91352:e04eefef7820 user: Raymond Hettinger <python(a)rcn.com> date: Tue Jun 24 13:49:24 2014 -0700 summary: Issue 21832: Require named tuple inputs to be exact strings files: Lib/collections.py | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/Lib/collections.py b/Lib/collections.py --- a/Lib/collections.py +++ b/Lib/collections.py @@ -314,6 +314,7 @@ if isinstance(field_names, basestring): field_names = field_names.replace(',', ' ').split() field_names = map(str, field_names) + typename = str(typename) if rename: seen = set() for index, name in enumerate(field_names): @@ -326,6 +327,8 @@ field_names[index] = '_%d' % index seen.add(name) for name in [typename] + field_names: + if type(name) != str: + raise TypeError('Type names and field names must be strings') if not all(c.isalnum() or c=='_' for c in name): raise ValueError('Type names and field names can only contain ' 'alphanumeric characters and underscores: %r' % name) -- Repository URL: http://hg.python.org/cpython

1 0

cpython (merge 3.4 -> default): (Merge 3.4) asyncio: Log an error if a Task is destroyed while it is still
by victor.stinner 24 Jun '14

24 Jun '14

http://hg.python.org/cpython/rev/e1d81c32f13d changeset: 91360:e1d81c32f13d parent: 91358:3fa0d2b297c6 parent: 91359:978525270264 user: Victor Stinner <victor.stinner(a)gmail.com> date: Tue Jun 24 22:38:31 2014 +0200 summary: (Merge 3.4) asyncio: Log an error if a Task is destroyed while it is still pending files: Lib/asyncio/futures.py | 3 + Lib/asyncio/tasks.py | 13 +++ Lib/test/test_asyncio/test_base_events.py | 3 +- Lib/test/test_asyncio/test_tasks.py | 45 ++++++++++- 4 files changed, 60 insertions(+), 4 deletions(-) diff --git a/Lib/asyncio/futures.py b/Lib/asyncio/futures.py --- a/Lib/asyncio/futures.py +++ b/Lib/asyncio/futures.py @@ -169,6 +169,9 @@ res += '<{}>'.format(self._state) return res + # On Python 3.3 or older, objects with a destructor part of a reference + # cycle are never destroyed. It's not more the case on Python 3.4 thanks to + # the PEP 442. if _PY34: def __del__(self): if not self._log_traceback: diff --git a/Lib/asyncio/tasks.py b/Lib/asyncio/tasks.py --- a/Lib/asyncio/tasks.py +++ b/Lib/asyncio/tasks.py @@ -32,6 +32,7 @@ _DEBUG = (not sys.flags.ignore_environment and bool(os.environ.get('PYTHONASYNCIODEBUG'))) +_PY34 = (sys.version_info >= (3, 4)) _PY35 = (sys.version_info >= (3, 5)) @@ -181,6 +182,18 @@ self._loop.call_soon(self._step) self.__class__._all_tasks.add(self) + # On Python 3.3 or older, objects with a destructor part of a reference + # cycle are never destroyed. It's not more the case on Python 3.4 thanks to + # the PEP 442. + if _PY34: + def __del__(self): + if self._state == futures._PENDING: + self._loop.call_exception_handler({ + 'task': self, + 'message': 'Task was destroyed but it is pending!', + }) + futures.Future.__del__(self) + def __repr__(self): res = super().__repr__() if (self._must_cancel and diff --git a/Lib/test/test_asyncio/test_base_events.py b/Lib/test/test_asyncio/test_base_events.py --- a/Lib/test/test_asyncio/test_base_events.py +++ b/Lib/test/test_asyncio/test_base_events.py @@ -244,7 +244,8 @@ @mock.patch('asyncio.base_events.logger') def test__run_once_logging(self, m_logger): def slow_select(timeout): - time.sleep(1.0) + # Sleep a bit longer than a second to avoid timer resolution issues. + time.sleep(1.1) return [] # logging needs debug flag 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 @@ -5,13 +5,16 @@ import types import unittest import weakref +from test import support from test.script_helper import assert_python_ok +from unittest import mock import asyncio from asyncio import tasks from asyncio import test_utils +PY34 = (sys.version_info >= (3, 4)) PY35 = (sys.version_info >= (3, 5)) @@ -1501,9 +1504,45 @@ 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') + def test_log_destroyed_pending_task(self): + @asyncio.coroutine + def kill_me(loop): + future = asyncio.Future(loop=loop) + yield from future + # at this point, the only reference to kill_me() task is + # the Task._wakeup() method in future._callbacks + raise Exception("code never reached") + + mock_handler = mock.Mock() + self.loop.set_exception_handler(mock_handler) + + # schedule the task + coro = kill_me(self.loop) + task = asyncio.async(coro, loop=self.loop) + self.assertEqual(asyncio.Task.all_tasks(loop=self.loop), {task}) + + # execute the task so it waits for future + self.loop._run_once() + self.assertEqual(len(self.loop._ready), 0) + + # remove the future used in kill_me(), and references to the task + del coro.gi_frame.f_locals['future'] + coro = None + task = None + + # no more reference to kill_me() task: the task is destroyed by the GC + support.gc_collect() + + self.assertEqual(asyncio.Task.all_tasks(loop=self.loop), set()) + + mock_handler.assert_called_with(self.loop, { + 'message': 'Task was destroyed but it is pending!', + 'task': mock.ANY, + }) + mock_handler.reset_mock() class GatherTestsBase: -- Repository URL: http://hg.python.org/cpython

1 0

cpython (3.4): asyncio: Log an error if a Task is destroyed while it is still pending
by victor.stinner 24 Jun '14

24 Jun '14

http://hg.python.org/cpython/rev/978525270264 changeset: 91359:978525270264 branch: 3.4 parent: 91357:a941bb617c2a user: Victor Stinner <victor.stinner(a)gmail.com> date: Tue Jun 24 22:37:53 2014 +0200 summary: asyncio: Log an error if a Task is destroyed while it is still pending files: Lib/asyncio/futures.py | 3 + Lib/asyncio/tasks.py | 13 +++ Lib/test/test_asyncio/test_base_events.py | 3 +- Lib/test/test_asyncio/test_tasks.py | 45 ++++++++++- 4 files changed, 60 insertions(+), 4 deletions(-) diff --git a/Lib/asyncio/futures.py b/Lib/asyncio/futures.py --- a/Lib/asyncio/futures.py +++ b/Lib/asyncio/futures.py @@ -169,6 +169,9 @@ res += '<{}>'.format(self._state) return res + # On Python 3.3 or older, objects with a destructor part of a reference + # cycle are never destroyed. It's not more the case on Python 3.4 thanks to + # the PEP 442. if _PY34: def __del__(self): if not self._log_traceback: diff --git a/Lib/asyncio/tasks.py b/Lib/asyncio/tasks.py --- a/Lib/asyncio/tasks.py +++ b/Lib/asyncio/tasks.py @@ -32,6 +32,7 @@ _DEBUG = (not sys.flags.ignore_environment and bool(os.environ.get('PYTHONASYNCIODEBUG'))) +_PY34 = (sys.version_info >= (3, 4)) _PY35 = (sys.version_info >= (3, 5)) @@ -181,6 +182,18 @@ self._loop.call_soon(self._step) self.__class__._all_tasks.add(self) + # On Python 3.3 or older, objects with a destructor part of a reference + # cycle are never destroyed. It's not more the case on Python 3.4 thanks to + # the PEP 442. + if _PY34: + def __del__(self): + if self._state == futures._PENDING: + self._loop.call_exception_handler({ + 'task': self, + 'message': 'Task was destroyed but it is pending!', + }) + futures.Future.__del__(self) + def __repr__(self): res = super().__repr__() if (self._must_cancel and diff --git a/Lib/test/test_asyncio/test_base_events.py b/Lib/test/test_asyncio/test_base_events.py --- a/Lib/test/test_asyncio/test_base_events.py +++ b/Lib/test/test_asyncio/test_base_events.py @@ -244,7 +244,8 @@ @mock.patch('asyncio.base_events.logger') def test__run_once_logging(self, m_logger): def slow_select(timeout): - time.sleep(1.0) + # Sleep a bit longer than a second to avoid timer resolution issues. + time.sleep(1.1) return [] # logging needs debug flag 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 @@ -5,13 +5,16 @@ import types import unittest import weakref +from test import support from test.script_helper import assert_python_ok +from unittest import mock import asyncio from asyncio import tasks from asyncio import test_utils +PY34 = (sys.version_info >= (3, 4)) PY35 = (sys.version_info >= (3, 5)) @@ -1501,9 +1504,45 @@ 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') + def test_log_destroyed_pending_task(self): + @asyncio.coroutine + def kill_me(loop): + future = asyncio.Future(loop=loop) + yield from future + # at this point, the only reference to kill_me() task is + # the Task._wakeup() method in future._callbacks + raise Exception("code never reached") + + mock_handler = mock.Mock() + self.loop.set_exception_handler(mock_handler) + + # schedule the task + coro = kill_me(self.loop) + task = asyncio.async(coro, loop=self.loop) + self.assertEqual(asyncio.Task.all_tasks(loop=self.loop), {task}) + + # execute the task so it waits for future + self.loop._run_once() + self.assertEqual(len(self.loop._ready), 0) + + # remove the future used in kill_me(), and references to the task + del coro.gi_frame.f_locals['future'] + coro = None + task = None + + # no more reference to kill_me() task: the task is destroyed by the GC + support.gc_collect() + + self.assertEqual(asyncio.Task.all_tasks(loop=self.loop), set()) + + mock_handler.assert_called_with(self.loop, { + 'message': 'Task was destroyed but it is pending!', + 'task': mock.ANY, + }) + mock_handler.reset_mock() class GatherTestsBase: -- Repository URL: http://hg.python.org/cpython

1 0