diff options
Diffstat (limited to 'django/db/models/fields/__init__.py')
| -rw-r--r-- | django/db/models/fields/__init__.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/django/db/models/fields/__init__.py b/django/db/models/fields/__init__.py index 87843ceeeb..8cc17079a9 100644 --- a/django/db/models/fields/__init__.py +++ b/django/db/models/fields/__init__.py @@ -305,9 +305,9 @@ class Field(object): def _get_val_from_obj(self, obj): if obj: - return getattr(obj, self.attname) + return getattr(obj, self.attname) else: - return self.get_default() + return self.get_default() def flatten_data(self, follow, obj=None): """ @@ -577,7 +577,7 @@ class FileField(Field): dispatcher.connect(self.delete_file, signal=signals.post_delete, sender=cls) def delete_file(self, instance): - if getattr(instance, self.attname): + if getattr(instance, self.attname): file_name = getattr(instance, 'get_%s_filename' % self.name)() # If the file exists and no other object of this type references it, # delete it from the filesystem. |