summaryrefslogtreecommitdiff
path: root/django
diff options
context:
space:
mode:
authorClaude Paroz <claude@2xlibre.net>2013-06-27 10:58:05 +0200
committerClaude Paroz <claude@2xlibre.net>2013-06-29 18:08:39 +0200
commitea3fe78a9d742904f6902cdc353a11d795418105 (patch)
tree21f431110ca64805c3ed83c2becd2443b509d5a7 /django
parentb5f709e6f4c67020bedb141b9b18c5cd1e05f829 (diff)
Fixed #20660 -- Do not try to delete an unset FieldFile
Thanks stanislas.guerra at gmail.com for the report and Baptiste Mispelon for the review.
Diffstat (limited to 'django')
-rw-r--r--django/db/models/fields/files.py2
1 files changed, 2 insertions, 0 deletions
diff --git a/django/db/models/fields/files.py b/django/db/models/fields/files.py
index 0a913e908b..7663c8ab90 100644
--- a/django/db/models/fields/files.py
+++ b/django/db/models/fields/files.py
@@ -96,6 +96,8 @@ class FieldFile(File):
save.alters_data = True
def delete(self, save=True):
+ if not self:
+ return
# Only close the file if it's already open, which we know by the
# presence of self._file
if hasattr(self, '_file'):