Updated Branches: refs/heads/master 87b72088f -> b586c1042
Fixed an import error in futures.py. When queue is empty, the name Queue.Empty must be imported. From: Du Li <[email protected]> Review: https://reviews.apache.org/r/15585 Project: http://git-wip-us.apache.org/repos/asf/mesos/repo Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/b586c104 Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/b586c104 Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/b586c104 Branch: refs/heads/master Commit: b586c1042d92135c60a57cf7f308c444cbb4bd3b Parents: 87b7208 Author: Benjamin Mahler <[email protected]> Authored: Fri Nov 15 14:20:54 2013 -0800 Committer: Benjamin Mahler <[email protected]> Committed: Fri Nov 15 14:20:54 2013 -0800 ---------------------------------------------------------------------- src/cli/python/mesos/futures.py | 1 + 1 file changed, 1 insertion(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/mesos/blob/b586c104/src/cli/python/mesos/futures.py ---------------------------------------------------------------------- diff --git a/src/cli/python/mesos/futures.py b/src/cli/python/mesos/futures.py index 5486f1f..9c36823 100644 --- a/src/cli/python/mesos/futures.py +++ b/src/cli/python/mesos/futures.py @@ -5,6 +5,7 @@ except ImportError: import time from Queue import Queue + from Queue import Empty class TimeoutError(Exception): """The operation timed out"""
