Ensure that encode_model_property is called for encoding xdb Model in…

…stances
hydralabs · Feb 16, 2015 · 0ff0bd5 · 0ff0bd5
1 parent e1f90dc
commit 0ff0bd5
Showing 1 changed file with 18 additions and 0 deletions.
diff --git a/pyamf/adapters/_google_appengine_ext_db.py b/pyamf/adapters/_google_appengine_ext_db.py
@@ -160,6 +160,24 @@ def getEncodableAttributes(self, obj, codec=None):
         for attr in obj.dynamic_properties():
             attrs[attr] = self.getAttribute(obj, attr, codec=codec)
 
+        if self.properties:
+            for name in self.encodable_properties:
+                prop = self.properties.get(name, None)
+
+                if not prop:
+                    continue
+
+                try:
+                    value = attrs[name]
+                except KeyError:
+                    value = self.getAttribute(obj, name, codec=codec)
+
+                attrs[name] = adapter_models.encode_model_property(
+                    obj,
+                    prop,
+                    value
+                )
+
         return attrs
 
     def getDecodableAttributes(self, obj, attrs, codec=None):