qpid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From g...@apache.org
Subject svn commit: r1163537 - /qpid/trunk/qpid/cpp/bindings/qpid/python/python.i
Date Wed, 31 Aug 2011 09:01:10 GMT
Author: gsim
Date: Wed Aug 31 09:01:10 2011
New Revision: 1163537

URL: http://svn.apache.org/viewvc?rev=1163537&view=rev
Log:
QPID-3333: Patch from Anthony Foglia - Handle amqp/list and amqp/map content (0013)

Modified:
    qpid/trunk/qpid/cpp/bindings/qpid/python/python.i

Modified: qpid/trunk/qpid/cpp/bindings/qpid/python/python.i
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/bindings/qpid/python/python.i?rev=1163537&r1=1163536&r2=1163537&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/bindings/qpid/python/python.i (original)
+++ qpid/trunk/qpid/cpp/bindings/qpid/python/python.i Wed Aug 31 09:01:10 2011
@@ -251,9 +251,11 @@ static PyObject* pTransportFailure;
                       subject=None, user_id=None, reply_to=None,
                       correlation_id=None, durable=None, priority=None,
                       ttl=None, properties=None):
-             this = _cqpid.new_Message(content if content else '')
+             this = _cqpid.new_Message('')
              try: self.this.append(this)
              except: self.this = this
+             if content :
+                 self.content = content
              if content_type != UNSPECIFIED :
                  self.content_type = content_type
              if id is not None :
@@ -279,9 +281,24 @@ static PyObject* pTransportFailure;
                  for k, v in properties.iteritems() :
                      self.setProperty(k, v)
 
-         __swig_getmethods__["content"] = getContent
-         __swig_setmethods__["content"] = setContent
-         if _newclass: content = _swig_property(getContent, setContent)
+         def _get_content(self) :
+             if self.content_type == "amqp/list" :
+                 return decodeList(self)
+             if self.content_type == "amqp/map" :
+                 return decodeMap(self)
+             return self.getContent()
+         def _set_content(self, content) :
+             if isinstance(content, basestring) :
+                 self.setContent(content)
+             elif isinstance(content, list) or isinstance(content, dict) :
+                 encode(content, self)
+             else :
+                 # Not a type we can handle.  Try setting it anyway,
+                 # although this will probably lead to a swig error
+                 self.setContent(content)
+         __swig_getmethods__["content"] = _get_content
+         __swig_setmethods__["content"] = _set_content
+         if _newclass: content = _swig_property(_get_content, _set_content)
 
          __swig_getmethods__["content_type"] = getContentType
          __swig_setmethods__["content_type"] = setContentType



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


Mime
View raw message