diff options
| -rw-r--r-- | python/qpid/messaging/driver.py | 6 | ||||
| -rw-r--r-- | python/qpid/messaging/message.py | 12 | ||||
| -rw-r--r-- | python/qpid/tests/messaging/__init__.py | 2 | ||||
| -rw-r--r-- | python/qpid/tests/messaging/message.py | 1 |
4 files changed, 5 insertions, 16 deletions
diff --git a/python/qpid/messaging/driver.py b/python/qpid/messaging/driver.py index 5cf41eb455..058313ff86 100644 --- a/python/qpid/messaging/driver.py +++ b/python/qpid/messaging/driver.py @@ -307,7 +307,6 @@ EMPTY_DP = DeliveryProperties() EMPTY_MP = MessageProperties() SUBJECT = "qpid.subject" -TO = "qpid.to" CLOSED = "CLOSED" READ_ONLY = "READ_ONLY" @@ -1120,10 +1119,6 @@ class Engine: if mp.application_headers is None: mp.application_headers = {} mp.application_headers[SUBJECT] = subject - if msg.to is not None: - if mp.application_headers is None: - mp.application_headers = {} - mp.application_headers[TO] = msg.to if msg.durable is not None: if msg.durable: dp.delivery_mode = delivery_mode.persistent @@ -1175,7 +1170,6 @@ class Engine: msg = Message(content) msg.id = mp.message_id if ap is not None: - msg.to = ap.get(TO) msg.subject = ap.get(SUBJECT) msg.user_id = mp.user_id if mp.reply_to is not None: diff --git a/python/qpid/messaging/message.py b/python/qpid/messaging/message.py index d89fa00dc3..a96a6da0ac 100644 --- a/python/qpid/messaging/message.py +++ b/python/qpid/messaging/message.py @@ -76,8 +76,6 @@ class Message: @ivar id: the message id @type user_id: str @ivar user_id: the user-id of the message producer - @type to: str - @ivar to: the destination address @type reply_to: str @ivar reply_to: the address to send replies @type correlation_id: str @@ -91,9 +89,8 @@ class Message: """ def __init__(self, content=None, content_type=UNSPECIFIED, id=None, - subject=None, to=None, user_id=None, reply_to=None, - correlation_id=None, durable=None, priority=None, ttl=None, - properties=None): + subject=None, user_id=None, reply_to=None, correlation_id=None, + durable=None, priority=None, ttl=None, properties=None): """ Construct a new message with the supplied content. The content-type of the message will be automatically inferred from @@ -107,7 +104,6 @@ class Message: """ self.id = id self.subject = subject - self.to = to self.user_id = user_id self.reply_to = reply_to self.correlation_id = correlation_id @@ -127,8 +123,8 @@ class Message: def __repr__(self): args = [] - for name in ["id", "subject", "to", "user_id", "reply_to", - "correlation_id", "priority", "ttl"]: + for name in ["id", "subject", "user_id", "reply_to", "correlation_id", + "priority", "ttl"]: value = self.__dict__[name] if value is not None: args.append("%s=%r" % (name, value)) for name in ["durable", "redelivered", "properties"]: diff --git a/python/qpid/tests/messaging/__init__.py b/python/qpid/tests/messaging/__init__.py index b106377cc9..42e88dfd72 100644 --- a/python/qpid/tests/messaging/__init__.py +++ b/python/qpid/tests/messaging/__init__.py @@ -86,7 +86,7 @@ class Base(Test): def diff(self, m1, m2): result = {} - for attr in ("id", "subject", "user_id", "to", "reply_to", + for attr in ("id", "subject", "user_id", "reply_to", "correlation_id", "durable", "priority", "ttl", "redelivered", "properties", "content_type", "content"): diff --git a/python/qpid/tests/messaging/message.py b/python/qpid/tests/messaging/message.py index 51d7879d55..2ca1fbf155 100644 --- a/python/qpid/tests/messaging/message.py +++ b/python/qpid/tests/messaging/message.py @@ -97,7 +97,6 @@ class MessageEchoTests(Base): def testProperties(self): msg = Message() - msg.to = "to-address" msg.subject = "subject" msg.correlation_id = str(self.test_id) msg.durable = True |