Ticket #5458: 20070914_patchSerializeXml4Flex.diff

core/serializers/xml_serializer.py

@@ -12 +12 @@
 class Serializer(base.Serializer):
     """
     Serializes a QuerySet to XML.
+     - flexmode - enables easier xml parsing from Adobe Flex (HttpService+Dataprovider), no '-' in tag names, tags 'field'  to '%field.name%' tag.
     """
-
+    def serialize(self, queryset, **options):
+        self.flexmode = options.get("flexmode")
+        if self.flexmode:
+            self.startelemname="django_objects"
+        else:
+            self.startelemname="django-objects"
+        return base.Serializer.serialize(self, queryset, **options)
+        
     def indent(self, level):
         if self.options.get('indent', None) is not None:
             self.xml.ignorableWhitespace('\n' + ' ' * self.options.get('indent', None) * level)
@@ -24 +32 @@
         """
         self.xml = SimplerXMLGenerator(self.stream, self.options.get("encoding", settings.DEFAULT_CHARSET))
         self.xml.startDocument()
-        self.xml.startElement("django-objects", {"version" : "1.0"})
+        self.xml.startElement(self.startelemname, {"version" : "1.0"})
 
     def end_serialization(self):
         """
         End serialization -- end the document.
         """
         self.indent(0)
-        self.xml.endElement("django-objects")
+        self.xml.endElement(self.startelemname)
         self.xml.endDocument()
 
     def start_object(self, obj):
@@ -60 +68 @@
         ManyToManyFields)
         """
         self.indent(2)
-        self.xml.startElement("field", {
+        if self.flexmode:
+            elemname = field.name
+        else:
+            elemname = "field"
+        self.xml.startElement(elemname, {
             "name" : field.name,
-            "type" : field.get_internal_type()
-        })
+            "type" : field.get_internal_type(),
+            })
 
         # Get a "string version" of the object's data (this is handled by the
         # serializer base class).
@@ -73 +85 @@
         else:
             self.xml.addQuickElement("None")
 
-        self.xml.endElement("field")
+        self.xml.endElement(elemname)
 
     def handle_fk_field(self, obj, field):
         """