summaryrefslogtreecommitdiffstats
path: root/Lib/asyncio
diff options
context:
space:
mode:
authorVictor Stinner <victor.stinner@gmail.com>2015-07-09 21:13:50 (GMT)
committerVictor Stinner <victor.stinner@gmail.com>2015-07-09 21:13:50 (GMT)
commite6ecea53c8394b5101bb3ddab3216a948065ef97 (patch)
tree225a711992ec59273d9a1f6d75b8a19c64959137 /Lib/asyncio
parentaf320b389bba5221870553e70eaefee3bdf860e5 (diff)
downloadcpython-e6ecea53c8394b5101bb3ddab3216a948065ef97.zip
cpython-e6ecea53c8394b5101bb3ddab3216a948065ef97.tar.gz
cpython-e6ecea53c8394b5101bb3ddab3216a948065ef97.tar.bz2
asyncio: sync with github asyncio
* queues: get coroutine from asyncio.coroutines, not from asyncio.tasks * tets: replace tulip with asyncio in comments
Diffstat (limited to 'Lib/asyncio')
-rw-r--r--Lib/asyncio/queues.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/Lib/asyncio/queues.py b/Lib/asyncio/queues.py
index ed11662..3b4dc21 100644
--- a/Lib/asyncio/queues.py
+++ b/Lib/asyncio/queues.py
@@ -9,7 +9,7 @@ import heapq
from . import events
from . import futures
from . import locks
-from .tasks import coroutine
+from .coroutines import coroutine
class QueueEmpty(Exception):