Ticket #5619: patch-5619-with-tests.diff

django/db/models/base.py

@@ -462 +462 @@
 
     def _get_FIELD_filename(self, field):
         if getattr(self, field.attname): # Value is not blank.
-            return os.path.normpath(os.path.join(settings.MEDIA_ROOT, getattr(self, field.attname)))
+            return os.path.normpath(os.path.join(settings.MEDIA_ROOT, field.get_filename(getattr(self, field.attname))))
         return ''
 
     def _get_FIELD_url(self, field):
         if getattr(self, field.attname): # Value is not blank.
             import urlparse
-            return urlparse.urljoin(settings.MEDIA_URL, getattr(self, field.attname)).replace('\\', '/')
+            return urlparse.urljoin(settings.MEDIA_URL, field.get_filename(getattr(self, field.attname))).replace('\\', '/')
         return ''
 
     def _get_FIELD_size(self, field):

tests/modeltests/model_forms/models.py

@@ -12 +12 @@
 
 from django.db import models
 
+TEMP_DIR = tempfile.gettempdir()
+
 ARTICLE_STATUS = (
     (1, 'Draft'),
     (2, 'Pending'),
@@ -60 +62 @@
 
 class TextFile(models.Model):
     description = models.CharField(max_length=20)
-    file = models.FileField(upload_to=tempfile.gettempdir())
+    file = models.FileField(upload_to=TEMP_DIR)
 
     def __unicode__(self):
         return self.description
@@ -71 +73 @@
         # If PIL is available, try testing PIL.
         # Otherwise, it's equivalent to TextFile above.
         import Image
-        image = models.ImageField(upload_to=tempfile.gettempdir())
+        image = models.ImageField(upload_to=TEMP_DIR)
     except ImportError:
-        image = models.FileField(upload_to=tempfile.gettempdir())
+        image = models.FileField(upload_to=TEMP_DIR)
 
     def __unicode__(self):
         return self.description
@@ -784 +786 @@
 
 # FileField ###################################################################
 
+# File instance methods. Tests fix for #5619.
+
+>>> instance = TextFile(description='nothing', file='name')
+>>> expected = '%s/name' % TEMP_DIR
+>>> instance.get_file_filename() == expected
+True
+>>> instance.get_file_url() == expected
+True
+>>> instance.save_file_file(instance.file, 'some text')
+>>> instance.get_file_filename() == expected
+True
+>>> instance.get_file_url() == expected
+True
+
+>>> os.unlink(instance.get_file_filename())
+
+# File forms.
+
 >>> class TextFileForm(ModelForm):
 ...     class Meta:
 ...         model = TextFile