diff options
| author | Victor Stinner <victor.stinner@gmail.com> | 2015-01-28 00:30:51 +0100 |
|---|---|---|
| committer | Victor Stinner <victor.stinner@gmail.com> | 2015-01-28 00:30:51 +0100 |
| commit | bf9765186ddd3e9972e4004ade0476f6ee7c1692 (patch) | |
| tree | d126b28d4ea2fc77c654be9ee0483d5d910fc631 /Lib/asyncio/base_events.py | |
| parent | 07f051566725e7e1406fccc1c28d2877fcc13738 (diff) | |
| parent | ff018e406cd96d117b54edcb30808a56fc2f689a (diff) | |
| download | cpython-git-bf9765186ddd3e9972e4004ade0476f6ee7c1692.tar.gz | |
Merge 3.4 (asyncio)
Diffstat (limited to 'Lib/asyncio/base_events.py')
| -rw-r--r-- | Lib/asyncio/base_events.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Lib/asyncio/base_events.py b/Lib/asyncio/base_events.py index 1c51a7cf85..e40d3ad5f2 100644 --- a/Lib/asyncio/base_events.py +++ b/Lib/asyncio/base_events.py @@ -956,7 +956,8 @@ class BaseEventLoop(events.AbstractEventLoop): else: exc_info = False - if (self._current_handle is not None + if ('source_traceback' not in context + and self._current_handle is not None and self._current_handle._source_traceback): context['handle_traceback'] = self._current_handle._source_traceback |