Ticket #355: amf3.diff

amf3.py

@@ -27 +27 @@
 
 import pyamf
 from pyamf import util
+from pyamf.flex import ArrayCollection, ObjectProxy
 
+# encode/decode list,tuple/dict to
+# ArrayCollection/ObjectProxy
+use_proxies = True
+
 try:
     set()
 except NameError:
@@ -644 +649 @@
     """
 
     def __init__(self):
+        # Caches objects that have been 
+        # modified in some way.
+        # Added by Dave Thompson
+        self.translated = {}
+
         self.strings = util.IndexedCollection(use_hash=True)
         self.classes = util.IndexedCollection()
         self.class_defs = util.IndexedCollection()
@@ -657 +667 @@
         """
         pyamf.BaseContext.clear(self)
 
+        self.translated = {}
         self.strings.clear()
         self.classes.clear()
         self.class_defs.clear()
@@ -670 +681 @@
         """
         pyamf.BaseContext.reset(self)
 
+        self.translated = {}
         self.strings.clear()
         self.classes.clear()
         self.class_defs.clear()
         self.legacy_xml.clear()
 
+    def getTranslatedObject(self, obj):
+        """
+        Returns an object that has been modified.
+
+        Returns None if translated object is not cached.
+ 
+        Added by Dave Thompson
+        """
+        key = id(obj)
+        if self.translated.has_key(key):
+            return self.translated[key]
+        else:
+            return None
+
+    def setTranslatedObject(self, obj, trans_obj):
+        """Sets a translated object in the cache."""
+        self.translated[id(obj)] = trans_obj
+
     def getString(self, ref):
         """
         Gets a string based on a reference C{ref}.
@@ -1115 +1145 @@
             obj = klass()
 
         obj_attrs = pyamf.ASObject()
-        self.context.addObject(obj)
 
         if class_def.encoding in (ObjectEncoding.EXTERNAL, ObjectEncoding.PROXY):
             obj.__readamf__(DataInput(self))
@@ -1133 +1162 @@
             for k, v in obj_attrs.iteritems():
                 setattr(obj, k, v)
 
+        if use_proxies:
+            # Added by Dave Thompson
+            # to decode proxy objects
+            if type(obj) == ArrayCollection:
+                obj = obj.values()
+            elif type(obj) == ObjectProxy and type(obj._amf_object) == pyamf.ASObject:
+                obj = dict(obj._amf_object)
+
+        self.context.addObject(obj)
         return obj
 
     def _readXML(self, legacy=False):
@@ -1433 +1471 @@
         @type use_references: C{bool}
         @param use_references: Default is C{True}.
         """
+        if use_proxies:
+            # Added by Dave Thompson
+            # Encode all lists,tuples into ArrayCollections
+            if use_references:
+                obj = self.context.getTranslatedObject(n)
+            else:
+                obj = None
+            if obj is None:
+                obj = ArrayCollection(n)
+                if use_references:
+                    self.context.setTranslatedObject(n, obj)
+            self.writeObject(obj, use_references)
+            return
+
         self.writeType(ASTypes.ARRAY)
 
         if use_references is True:
@@ -1587 +1639 @@
         @type use_references: C{bool}
         @raise EncodeError: Encoding an object in amf3 tagged as amf0 only.
         """
+        if use_proxies and type(obj) == dict:
+            # Added by Dave Thompson
+            # encode dicts as ObjectProxys
+            if use_references:
+                new_obj = self.context.getTranslatedObject(obj)
+            else:
+                new_obj = None
+            if new_obj is None:
+                as_obj = pyamf.ASObject()
+                for k, v in obj.iteritems():
+                    as_obj[k] = v
+                new_obj = ObjectProxy(as_obj)
+                if use_references:
+                    self.context.setTranslatedObject(obj, new_obj)
+            self.writeObject(new_obj, use_references)
+            return
+
         self.writeType(ASTypes.OBJECT)
 
         if use_references is True: