diff options
| author | Rafael H. Schloming <rhs@apache.org> | 2009-03-06 20:28:04 +0000 |
|---|---|---|
| committer | Rafael H. Schloming <rhs@apache.org> | 2009-03-06 20:28:04 +0000 |
| commit | 8ffde0cd3073badff0fe0c662f8cb5bd1786d585 (patch) | |
| tree | 87bee1a0c6cd0e1abfd94a2203335ef697b4791c /python | |
| parent | 48e760c0778332d2c9f7bb104a14342314763957 (diff) | |
| download | qpid-python-8ffde0cd3073badff0fe0c662f8cb5bd1786d585.tar.gz | |
fixed uuid decoding errors due to read_uuid semantics change
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@751064 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'python')
| -rw-r--r-- | python/qmf/console.py | 6 | ||||
| -rw-r--r-- | python/qpid/managementdata.py | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/python/qmf/console.py b/python/qmf/console.py index 39ef157f82..541ba8724f 100644 --- a/python/qmf/console.py +++ b/python/qmf/console.py @@ -28,7 +28,7 @@ import re from qpid.peer import Closed from qpid.session import SessionDetached from qpid.connection import Connection, ConnectionFailed -from qpid.datatypes import UUID, uuid4, Message, RangedSet +from qpid.datatypes import Message, RangedSet from qpid.util import connect, ssl, URL from qpid.codec010 import StringCodec as Codec from threading import Lock, Condition, Thread @@ -415,7 +415,7 @@ class Session: self.console.brokerDisconnected(broker) def _handleBrokerResp(self, broker, codec, seq): - broker.brokerId = UUID(codec.read_uuid()) + broker.brokerId = codec.read_uuid() if self.console != None: self.console.brokerInfo(broker) @@ -616,7 +616,7 @@ class Session: elif typecode == 11: data = codec.read_uint8() != 0 # BOOL elif typecode == 12: data = codec.read_float() # FLOAT elif typecode == 13: data = codec.read_double() # DOUBLE - elif typecode == 14: data = UUID(codec.read_uuid()) # UUID + elif typecode == 14: data = codec.read_uuid() # UUID elif typecode == 15: data = codec.read_map() # FTABLE elif typecode == 16: data = codec.read_int8() # S8 elif typecode == 17: data = codec.read_int16() # S16 diff --git a/python/qpid/managementdata.py b/python/qpid/managementdata.py index 2fe85dbdf3..e1fd8d54eb 100644 --- a/python/qpid/managementdata.py +++ b/python/qpid/managementdata.py @@ -263,7 +263,7 @@ class ManagementData: else: return "True" elif typecode == 14: - return "%08x-%04x-%04x-%04x-%04x%08x" % struct.unpack ("!LHHHHL", value) + return str (value) elif typecode == 15: return str (value) return "*type-error*" |