summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRafael H. Schloming <rhs@apache.org>2009-09-02 14:11:12 +0000
committerRafael H. Schloming <rhs@apache.org>2009-09-02 14:11:12 +0000
commitd857bba4a54ea9453bbb74bfc43b34ef179dfe38 (patch)
tree45b7ef9eea576408af24d729a859fc8635cd9549
parentfd2df9e13b2db5939d87907d99070cfb71ef85e5 (diff)
downloadqpid-python-d857bba4a54ea9453bbb74bfc43b34ef179dfe38.tar.gz
fixed import
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@810511 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r--qpid/python/qpid/driver.py1
-rw-r--r--qpid/python/qpid/messaging.py1
2 files changed, 1 insertions, 1 deletions
diff --git a/qpid/python/qpid/driver.py b/qpid/python/qpid/driver.py
index 13aba6320b..2f56a6008e 100644
--- a/qpid/python/qpid/driver.py
+++ b/qpid/python/qpid/driver.py
@@ -19,6 +19,7 @@
import compat, connection, socket, sys, time
from datatypes import RangedSet, Message as Message010
+from exceptions import Timeout
from lockable import synchronized, Lockable
from logging import getLogger
from messaging import get_codec, Message, Pattern, UNLIMITED
diff --git a/qpid/python/qpid/messaging.py b/qpid/python/qpid/messaging.py
index d6d8a9ec04..3c12641bca 100644
--- a/qpid/python/qpid/messaging.py
+++ b/qpid/python/qpid/messaging.py
@@ -32,7 +32,6 @@ Areas that still need work:
from codec010 import StringCodec
from datatypes import timestamp, uuid4, Serial
-from exceptions import Timeout
from lockable import synchronized, Lockable
from logging import getLogger
from ops import PRIMITIVE