You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by rh...@apache.org on 2009/06/02 17:31:33 UTC

svn commit: r781061 - /qpid/trunk/qpid/python/qpid/messaging.py

Author: rhs
Date: Tue Jun  2 15:31:32 2009
New Revision: 781061

URL: http://svn.apache.org/viewvc?rev=781061&view=rev
Log:
removed another turnary if

Modified:
    qpid/trunk/qpid/python/qpid/messaging.py

Modified: qpid/trunk/qpid/python/qpid/messaging.py
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/python/qpid/messaging.py?rev=781061&r1=781060&r2=781061&view=diff
==============================================================================
--- qpid/trunk/qpid/python/qpid/messaging.py (original)
+++ qpid/trunk/qpid/python/qpid/messaging.py Tue Jun  2 15:31:32 2009
@@ -551,7 +551,10 @@
     else:
       message = Message(object)
     # XXX: what if subject is specified for a normal queue?
-    rk = message.subject if self._routing_key is None else self._routing_key
+    if self._routing_key is None:
+      rk = message.subject
+    else:
+      rk = self._routing_key
     # XXX: do we need to query to figure out how to create the reply-to interoperably?
     rt = self._ssn.reply_to(*parse_addr(message.reply_to)) if message.reply_to else None
     dp = self._ssn.delivery_properties(routing_key=rk)



---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project:      http://qpid.apache.org
Use/Interact: mailto:commits-subscribe@qpid.apache.org