diff options
Diffstat (limited to 'python/qpid')
| -rw-r--r-- | python/qpid/client.py | 2 | ||||
| -rw-r--r-- | python/qpid/connection.py | 4 | ||||
| -rw-r--r-- | python/qpid/testlib.py | 9 |
3 files changed, 5 insertions, 10 deletions
diff --git a/python/qpid/client.py b/python/qpid/client.py index 3efd79c389..edcd1b8ad2 100644 --- a/python/qpid/client.py +++ b/python/qpid/client.py @@ -115,8 +115,6 @@ class ClientDelegate(Delegate): self.client.started.set() def message_transfer(self, ch, msg): - if isinstance(msg.body, ReferenceId): - msg.reference = ch.references.get(msg.body.id) self.client.queue(msg.destination).put(msg) def message_open(self, ch, msg): diff --git a/python/qpid/connection.py b/python/qpid/connection.py index 46b58e83b7..39bcde17df 100644 --- a/python/qpid/connection.py +++ b/python/qpid/connection.py @@ -239,9 +239,7 @@ class Response(Frame): return "[%s] Response(%s,%s,%s) %s" % (self.channel, self.id, self.request_id, self.batch_offset, self.method) def uses_struct_encoding(spec): - return (spec.major == 0 and - spec.minor == 10 and - "transitional" not in spec.file) + return (spec.major == 0 and spec.minor == 10) class Header(Frame): diff --git a/python/qpid/testlib.py b/python/qpid/testlib.py index 0b2a1b78d6..28c07ba43a 100644 --- a/python/qpid/testlib.py +++ b/python/qpid/testlib.py @@ -280,18 +280,17 @@ class TestBase(unittest.TestCase): routing_key=routing_key) else: self.channel.message_transfer( - destination=exchange, body=body, - application_headers=properties, - routing_key=routing_key) + destination=exchange, + content=Content(body, properties={'application_headers':properties,'routing_key':routing_key})) msg = queue.get(timeout=1) if testrunner.use08spec(): self.assertEqual(body, msg.content.body) if (properties): self.assertEqual(properties, msg.content.properties) else: - self.assertEqual(body, msg.body) + self.assertEqual(body, msg.content.body) if (properties): - self.assertEqual(properties, msg.application_headers) + self.assertEqual(properties, msg.content['application_headers']) def assertPublishConsume(self, queue="", exchange="", routing_key="", properties=None): """ |