Ticket #5655: 5655.patch

django/db/models/base.py

@@ -380 +380 @@
         return os.path.getsize(self._get_FIELD_filename(field))
 
     def _save_FIELD_file(self, field, filename, raw_contents, save=True):
-        directory = field.get_directory_name()
-        try: # Create the date-based directory if it doesn't exist.
+        filename = field.get_filename(filename)
+
+        # Create the directory if it doesn't exist.
+        directory = os.path.split(filename)[0]
+        try:
             os.makedirs(os.path.join(settings.MEDIA_ROOT, directory))
         except OSError: # Directory probably already exists.
             pass
-        filename = field.get_filename(filename)
 
-        # If the filename already exists, keep adding an underscore to the name of
-        # the file until the filename doesn't exist.
+        # If the filename already exists, keep adding an underscore to the name
+        # of the file until the filename doesn't exist.
         while os.path.exists(os.path.join(settings.MEDIA_ROOT, filename)):
-            try:
-                dot_index = filename.rindex('.')
-            except ValueError: # filename has no dot
-                filename += '_'
-            else:
-                filename = filename[:dot_index] + '_' + filename[dot_index:]
+            filename = '%s_%s' % os.path.splitext(filename)
 
         # Write the file to disk.
         setattr(self, field.attname, filename)