engine: Use Queue if JoinableQueue has been removed

Closes #289
ArchiveTeam · Oct 20, 2015 · 3e97037 · 3e97037
1 parent 089e931
commit 3e97037
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/doc/changelog.rst b/doc/changelog.rst
@@ -12,6 +12,7 @@ Unreleased
 * Fixed: ``--output-document`` file doesn't contain content.
 * Fixed: OverflowError when URL contains invalid port number greater than 65535 or less than 0.
 * Fixed: AssertionError when saving IPv4-mapped IPv6 addresses to WARC files.
+* Fixed: AttributeError when running with installed Trollius 2.0.
 * Changed: The setup file no longer requires optional psutil.
 
 

diff --git a/wpull/engine.py b/wpull/engine.py
@@ -3,9 +3,9 @@
 import abc
 import contextlib
 import gettext
+import itertools
 import logging
 import os
-import itertools
 
 from trollius import From, Return
 import trollius
@@ -33,7 +33,10 @@ def __init__(self):
         self.__concurrent = 1
         self._running = False
         self._item_queue = trollius.PriorityQueue()
-        self._token_queue = trollius.JoinableQueue()
+        try:
+            self._token_queue = trollius.JoinableQueue()
+        except AttributeError:
+            self._token_queue = trollius.Queue()
         self._item_get_semaphore = trollius.BoundedSemaphore(value=1)
 
         self._producer_task = None