Skip to content
This repository has been archived by the owner on Jan 30, 2023. It is now read-only.

Commit

Permalink
Use six to abstract the Queue/queue difference in Python 3
Browse files Browse the repository at this point in the history
  • Loading branch information
embray committed Aug 17, 2016
1 parent 2cb9701 commit 5c6f30b
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions src/sage/parallel/map_reduce.py
Original file line number Diff line number Diff line change
Expand Up @@ -506,7 +506,7 @@
from multiprocessing.queues import Pipe, Queue, SimpleQueue
from multiprocessing.sharedctypes import RawArray
from threading import Thread
from Queue import Empty
from six.moves import queue
from sage.sets.recursively_enumerated_set import RecursivelyEnumeratedSet # _generic
from sage.misc.lazy_attribute import lazy_attribute
import collections
Expand Down Expand Up @@ -1133,7 +1133,7 @@ def get_results(self, timeout=None):
'timeout: %s, aborted: %s' %
(active_proc, timeout, self._aborted.value))
newres = self._results.get(timeout=timeout)
except Empty:
except queue.Empty:
logger.debug('Timed out waiting for results; aborting')
# If we timed out here then the abort timer should have
# already fired, but just in case it didn't (or is in
Expand Down

0 comments on commit 5c6f30b

Please sign in to comment.