summaryrefslogtreecommitdiff
path: root/Lib/asyncio/queues.py
diff options
context:
space:
mode:
authorVictor Stinner <victor.stinner@gmail.com>2015-07-09 23:14:50 +0200
committerVictor Stinner <victor.stinner@gmail.com>2015-07-09 23:14:50 +0200
commitfb578f0a0556951251a73726e574d821011c0927 (patch)
tree9f8dfcc9164f215be3803faa7b46053c36cc4aa9 /Lib/asyncio/queues.py
parentc5ea754e484d73f04b1a361d82d0eed1b51dfdc8 (diff)
parente6ecea53c8394b5101bb3ddab3216a948065ef97 (diff)
downloadcpython-git-fb578f0a0556951251a73726e574d821011c0927.tar.gz
Merge 3.4 (asyncio)
Diffstat (limited to 'Lib/asyncio/queues.py')
-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 50543c829e..e9ba0cd5c3 100644
--- a/Lib/asyncio/queues.py
+++ b/Lib/asyncio/queues.py
@@ -8,7 +8,7 @@ import heapq
from . import events
from . import futures
from . import locks
-from .tasks import coroutine
+from .coroutines import coroutine
class QueueEmpty(Exception):