Changeset 7293

Timestamp:

03/18/08 09:35:05 (4 months ago)

Author:

mtredinnick

Message:

Fixed #5574 -- Serialize a FileField? using its filename from the database, not
external URL. The problem showed up when reloading the data. Patch from Chris
Henderson.

Files:

• django/trunk/django/core/serializers/base.py (modified) (3 diffs)

django/trunk/django/core/serializers/base.py

@@ -23 +23 @@
-    """
-
- 
+
-    # internal Django use.
-    internal_use_only = False
-
+
-    def serialize(self, queryset, **options):
-        """
@@ -61 +61 @@
-        if isinstance(field, models.DateTimeField):
-            value = getattr(obj, field.name).strftime("%Y-%m-%d %H:%M:%S")
-        elif isinstance(field, models.FileField):
-            value = getattr(obj, "get_%s_url" % field.name, lambda: None)()
-        else:
-            value = field.flatten_data(follow=None, obj=obj).get(field.name, "")
@@ -163 +161 @@
-
-    def save(self, save_m2m=True):
- 
+
-        # model-defined save. The save is also forced to be raw.
- 
+
-        # what came from the file, not post-processed by pre_save/save
-        # methods.