Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

(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.
This commit is contained in:
Victor Stinner 2014-06-24 22:58:23 +02:00
parent 24a3c72638 df29c4a83d
commit 5c2f5ab465
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Lib/asyncio/tasks.py
View File

@ -208,9 +208,11 @@ class Task(futures.Future):
if iscoroutine(coro): if iscoroutine(coro):
filename = coro.gi_code.co_filename filename = coro.gi_code.co_filename
if coro.gi_frame is not None: 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: 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:] res = res[:i] + '(<{}>)'.format(text) + res[i:]
return res return res

6
Lib/test/test_asyncio/test_tasks.py
View File

@ -148,12 +148,14 @@ class TaskTests(test_utils.TestCase):
self.assertRaises(asyncio.CancelledError, self.assertRaises(asyncio.CancelledError,
self.loop.run_until_complete, t) self.loop.run_until_complete, t)
self.assertEqual(repr(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) t = asyncio.Task(notmuch(), loop=self.loop)
self.loop.run_until_complete(t) self.loop.run_until_complete(t)
self.assertEqual(repr(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): def test_task_repr_custom(self):
@asyncio.coroutine @asyncio.coroutine