Author: rhs
Date: Fri Mar 6 20:28:04 2009
New Revision: 751064
URL: http://svn.apache.org/viewvc?rev=751064&view=rev
Log:
fixed uuid decoding errors due to read_uuid semantics change
Modified:
qpid/trunk/qpid/python/qmf/console.py
qpid/trunk/qpid/python/qpid/managementdata.py
Modified: qpid/trunk/qpid/python/qmf/console.py
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/python/qmf/console.py?rev=751064&r1=751063&r2=751064&view=diff
==============================================================================
--- qpid/trunk/qpid/python/qmf/console.py (original)
+++ qpid/trunk/qpid/python/qmf/console.py Fri Mar 6 20:28:04 2009
@@ -28,7 +28,7 @@
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 @@
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 @@
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
Modified: qpid/trunk/qpid/python/qpid/managementdata.py
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/python/qpid/managementdata.py?rev=751064&r1=751063&r2=751064&view=diff
==============================================================================
--- qpid/trunk/qpid/python/qpid/managementdata.py (original)
+++ qpid/trunk/qpid/python/qpid/managementdata.py Fri Mar 6 20:28:04 2009
@@ -263,7 +263,7 @@
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*"
---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project: http://qpid.apache.org
Use/Interact: mailto:commits-subscr...@qpid.apache.org
