Ticket #5711: patch2.diff

core/serializers/json.py

@@ -23 +23 @@
     def end_serialization(self):
         self.options.pop('stream', None)
         self.options.pop('fields', None)
+        self.options.pop('extra', None)
         simplejson.dump(self.objects, self.stream, cls=DjangoJSONEncoder, **self.options)
 
     def getvalue(self):

core/serializers/base.py

@@ -30 +30 @@
 
         self.stream = options.get("stream", StringIO())
         self.selected_fields = options.get("fields")
-
+        self.select_extra = options.get("extra", False)
+        
         self.start_serialization()
         for obj in queryset:
             self.start_object(obj)
@@ -46 +47 @@
                 if field.serialize:
                     if self.selected_fields is None or field.attname in self.selected_fields:
                         self.handle_m2m_field(obj, field)
+            if queryset._select is not None and self.select_extra:
+                for field in queryset._select.keys():
+                    self.handle_extra(obj, field)
             self.end_object(obj)
         self.end_serialization()
         return self.getvalue()

core/serializers/python.py

@@ -34 +34 @@
 
     def handle_field(self, obj, field):
         self._current[field.name] = smart_unicode(getattr(obj, field.name), strings_only=True)
+    
+    def handle_extra(self, obj, field):
+        self._current[field] = smart_unicode(getattr(obj, field), strings_only=True)
 
     def handle_fk_field(self, obj, field):
         related = getattr(obj, field.name)