Mailman 3 June 2014 - Python-checkins

cpython (3.4): Add news entry for #21832
by raymond.hettinger 25 Jun '14

25 Jun '14

http://hg.python.org/cpython/rev/958e8bebda6d changeset: 91378:958e8bebda6d branch: 3.4 parent: 91375:fa2638e5370f user: Raymond Hettinger <python(a)rcn.com> date: Tue Jun 24 18:11:48 2014 -0700 summary: Add news entry for #21832 files: Misc/NEWS | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -29,6 +29,8 @@ - Issue #21491: socketserver: Fix a race condition in child processes reaping. +- Issue #21832: Require named tuple inputs to be exact strings. + - Issue #21812: turtle.shapetransform did not tranform the turtle on the first call. (Issue identified and fixed by Lita Cho.) -- Repository URL: http://hg.python.org/cpython

1 0

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

25 Jun '14

http://hg.python.org/cpython/rev/eee636e3edbe changeset: 91377:eee636e3edbe parent: 91376:0b44d8b3412c parent: 91375:fa2638e5370f user: Raymond Hettinger <python(a)rcn.com> date: Tue Jun 24 18:07:57 2014 -0700 summary: merge files: -- Repository URL: http://hg.python.org/cpython

1 0

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

25 Jun '14

http://hg.python.org/cpython/rev/0b44d8b3412c changeset: 91376:0b44d8b3412c parent: 91374:f0f6650ba35e parent: 91372:0039154be0c0 user: Raymond Hettinger <python(a)rcn.com> date: Tue Jun 24 18:07:33 2014 -0700 summary: merge files: -- Repository URL: http://hg.python.org/cpython

1 0

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

25 Jun '14

http://hg.python.org/cpython/rev/fa2638e5370f changeset: 91375:fa2638e5370f branch: 3.4 parent: 91373:5c60dd518182 parent: 91370:73cb193a6666 user: Raymond Hettinger <python(a)rcn.com> date: Tue Jun 24 18:07:14 2014 -0700 summary: merge files: -- Repository URL: http://hg.python.org/cpython

1 0

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

25 Jun '14

http://hg.python.org/cpython/rev/f0f6650ba35e changeset: 91374:f0f6650ba35e parent: 91366:4a0a0d4d5fd5 parent: 91373:5c60dd518182 user: Raymond Hettinger <python(a)rcn.com> date: Tue Jun 24 15:21:24 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 25 Jun '14

25 Jun '14

http://hg.python.org/cpython/rev/5c60dd518182 changeset: 91373:5c60dd518182 branch: 3.4 parent: 91365:3bedc1846202 user: Raymond Hettinger <python(a)rcn.com> date: Tue Jun 24 15:20:55 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 default -> default): merge
by raymond.hettinger 25 Jun '14

25 Jun '14

http://hg.python.org/cpython/rev/0039154be0c0 changeset: 91372:0039154be0c0 parent: 91371:e4249be10442 parent: 91363:e67ad57eed26 user: Raymond Hettinger <python(a)rcn.com> date: Tue Jun 24 13:52:19 2014 -0700 summary: merge 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 (merge 3.4 -> default): merge
by raymond.hettinger 25 Jun '14

25 Jun '14

http://hg.python.org/cpython/rev/e4249be10442 changeset: 91371:e4249be10442 parent: 91369:a4095a895425 parent: 91370:73cb193a6666 user: Raymond Hettinger <python(a)rcn.com> date: Tue Jun 24 13:51:59 2014 -0700 summary: merge files: -- Repository URL: http://hg.python.org/cpython

1 0

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

25 Jun '14

http://hg.python.org/cpython/rev/73cb193a6666 changeset: 91370:73cb193a6666 branch: 3.4 parent: 91367:c238d2899d47 parent: 91359:978525270264 user: Raymond Hettinger <python(a)rcn.com> date: Tue Jun 24 13:51:42 2014 -0700 summary: merge 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 (merge default -> default): merge
by raymond.hettinger 25 Jun '14

25 Jun '14

http://hg.python.org/cpython/rev/a4095a895425 changeset: 91369:a4095a895425 parent: 91368:2f3a0ad5fe1f parent: 91360:e1d81c32f13d user: Raymond Hettinger <python(a)rcn.com> date: Tue Jun 24 13:51:18 2014 -0700 summary: merge 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