diff options
| author | Rafael H. Schloming <rhs@apache.org> | 2010-01-21 12:05:43 +0000 |
|---|---|---|
| committer | Rafael H. Schloming <rhs@apache.org> | 2010-01-21 12:05:43 +0000 |
| commit | 1aaba52bd281fbc64edad8c857ee6c972ae7796f (patch) | |
| tree | 6cd8c45db4313c26427c9f4da68dbd8acb735918 /python | |
| parent | b65797c5d8cb8a026c5f171bbbeff8afc321d2d7 (diff) | |
| download | qpid-python-1aaba52bd281fbc64edad8c857ee6c972ae7796f.tar.gz | |
removed imports so that the old spec doesn't need to be parsed
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@901666 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'python')
| -rw-r--r-- | python/qmf/console.py | 2 | ||||
| -rw-r--r-- | python/qpid/__init__.py | 2 | ||||
| -rw-r--r-- | python/qpid/connection.py | 1 | ||||
| -rw-r--r-- | python/qpid/framing.py | 1 | ||||
| -rw-r--r-- | python/qpid/peer.py | 3 | ||||
| -rw-r--r-- | python/qpid/session.py | 1 |
6 files changed, 3 insertions, 7 deletions
diff --git a/python/qmf/console.py b/python/qmf/console.py index 6f200d0f3f..45004716a8 100644 --- a/python/qmf/console.py +++ b/python/qmf/console.py @@ -28,7 +28,7 @@ import re from qpid.datatypes import UUID from qpid.datatypes import timestamp from qpid.datatypes import datetime -from qpid.peer import Closed +from qpid.exceptions import Closed from qpid.session import SessionDetached from qpid.connection import Connection, ConnectionFailed, Timeout from qpid.datatypes import Message, RangedSet, UUID diff --git a/python/qpid/__init__.py b/python/qpid/__init__.py index ff9cc04df8..780cab46a0 100644 --- a/python/qpid/__init__.py +++ b/python/qpid/__init__.py @@ -17,7 +17,7 @@ # under the License. # -import spec, codec, connection, content, peer, delegate, client +import connection class Struct: diff --git a/python/qpid/connection.py b/python/qpid/connection.py index 18eeb99de8..81ce446ab6 100644 --- a/python/qpid/connection.py +++ b/python/qpid/connection.py @@ -24,7 +24,6 @@ from codec010 import StringCodec from framing import * from session import Session from generator import control_invoker -from spec import SPEC from exceptions import * from logging import getLogger import delegates, socket diff --git a/python/qpid/framing.py b/python/qpid/framing.py index 0a8f26272c..62fd38dfcd 100644 --- a/python/qpid/framing.py +++ b/python/qpid/framing.py @@ -198,7 +198,6 @@ class SegmentEncoder: return result from ops import COMMANDS, CONTROLS, COMPOUND, Header, segment_type, track -from spec import SPEC from codec010 import StringCodec diff --git a/python/qpid/peer.py b/python/qpid/peer.py index 2bc9844351..95055cc014 100644 --- a/python/qpid/peer.py +++ b/python/qpid/peer.py @@ -31,6 +31,7 @@ from queue import Queue, Closed as QueueClosed from content import Content from cStringIO import StringIO from time import time +from exceptions import Closed class Sequence: @@ -173,8 +174,6 @@ class Responder: frame = Response(self.sequence.next(), request.id, batch, method) self.write(frame) -class Closed(Exception): pass - class Channel: def __init__(self, id, outgoing, spec): diff --git a/python/qpid/session.py b/python/qpid/session.py index 2f1bd81bd4..95714a128a 100644 --- a/python/qpid/session.py +++ b/python/qpid/session.py @@ -18,7 +18,6 @@ # from threading import Condition, RLock, Lock, currentThread -from spec import SPEC from generator import command_invoker from datatypes import RangedSet, Struct, Future from codec010 import StringCodec |