p31829507
/
django
mirror of https://github.com/django/django.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@7293 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Malcolm Tredinnick 2008-03-18 14:35:05 +00:00
parent 73328bf8ec
commit 5b8974c7b3
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
django/core/serializers/base.py
View File

@ -22,10 +22,10 @@ class Serializer(object):
Abstract serializer base class. Abstract serializer base class.
""" """
# Indicates if the implemented serializer is only available for # Indicates if the implemented serializer is only available for
# internal Django use. # internal Django use.
internal_use_only = False internal_use_only = False
def serialize(self, queryset, **options): def serialize(self, queryset, **options):
""" """
Serialize a queryset. Serialize a queryset.
@ -60,8 +60,6 @@ class Serializer(object):
""" """
if isinstance(field, models.DateTimeField): if isinstance(field, models.DateTimeField):
value = getattr(obj, field.name).strftime("%Y-%m-%d %H:%M:%S") 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: else:
value = field.flatten_data(follow=None, obj=obj).get(field.name, "") value = field.flatten_data(follow=None, obj=obj).get(field.name, "")
return smart_unicode(value) return smart_unicode(value)
@ -162,9 +160,9 @@ class DeserializedObject(object):
return "<DeserializedObject: %s>" % smart_str(self.object) return "<DeserializedObject: %s>" % smart_str(self.object)
def save(self, save_m2m=True): def save(self, save_m2m=True):
# Call save on the Model baseclass directly. This bypasses any # Call save on the Model baseclass directly. This bypasses any
# model-defined save. The save is also forced to be raw. # model-defined save. The save is also forced to be raw.
# This ensures that the data that is deserialized is literally # This ensures that the data that is deserialized is literally
# what came from the file, not post-processed by pre_save/save # what came from the file, not post-processed by pre_save/save
# methods. # methods.
models.Model.save(self.object, raw=True) models.Model.save(self.object, raw=True)