From ba07eba2031f9173855e7e6b2285a071a0d8171b Mon Sep 17 00:00:00 2001 From: "Rafael H. Schloming" Date: Tue, 2 Jun 2009 14:23:20 +0000 Subject: made Future.get throw an exception on timeout git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@781041 13f79535-47bb-0310-9956-ffa450edef68 --- python/qpid/datatypes.py | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'python') diff --git a/python/qpid/datatypes.py b/python/qpid/datatypes.py index b2dcbe74ab..4cd3fade2c 100644 --- a/python/qpid/datatypes.py +++ b/python/qpid/datatypes.py @@ -18,6 +18,7 @@ # import threading, struct, datetime, time +from exceptions import Timeout class Struct: @@ -253,9 +254,12 @@ class Future: def get(self, timeout=None): self._set.wait(timeout) - if self._error != None: - raise self.exception(self._error) - return self.value + if self._set.isSet(): + if self._error != None: + raise self.exception(self._error) + return self.value + else: + raise Timeout() def is_set(self): return self._set.isSet() -- cgit v1.2.1