diff options
| author | Yury Selivanov <yselivanov@sprymix.com> | 2016-03-02 16:03:53 (GMT) |
|---|---|---|
| committer | Yury Selivanov <yselivanov@sprymix.com> | 2016-03-02 16:03:53 (GMT) |
| commit | a8ac8e336bcce0c890d171a019589f89f36dfdd5 (patch) | |
| tree | c1617afd133d59dad30c493472e785ba1971ccd2 /Lib/asyncio/futures.py | |
| parent | 578bc5b80b248f002373dd4d7cf29920fe18f34b (diff) | |
| parent | 1bd030788d1092ba5d5d8b4e2fd75346ded69b3b (diff) | |
| download | cpython-a8ac8e336bcce0c890d171a019589f89f36dfdd5.zip cpython-a8ac8e336bcce0c890d171a019589f89f36dfdd5.tar.gz cpython-a8ac8e336bcce0c890d171a019589f89f36dfdd5.tar.bz2 | |
Merge 3.5 (issue #26221)
Diffstat (limited to 'Lib/asyncio/futures.py')
| -rw-r--r-- | Lib/asyncio/futures.py | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/Lib/asyncio/futures.py b/Lib/asyncio/futures.py index 281fea3..ddb9cde 100644 --- a/Lib/asyncio/futures.py +++ b/Lib/asyncio/futures.py @@ -341,6 +341,9 @@ class Future: raise InvalidStateError('{}: {!r}'.format(self._state, self)) if isinstance(exception, type): exception = exception() + if type(exception) is StopIteration: + raise TypeError("StopIteration interacts badly with generators " + "and cannot be raised into a Future") self._exception = exception self._state = _FINISHED self._schedule_callbacks() |