Ticket #4948: safe_filename_gen__modelsonly.1.diff

django/db/models/base.py

@@ -380 +380 @@
-            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.
-while os.path.exists(os.path.join(settings.MEDIA_ROOT, filename)):
+Generate a unique filename
+while True:
+    full_filename = os.path.join(settings.MEDIA_ROOT, filename)
-            try:
+                # Try and open our filename, but only if it doesn't exist 
+                # and we can open it exclusively. This won't necessarily work on
+                # NFS and some other networked filesystems, but will be ok in normal
+                # cases.
+                fd = os.open(full_filename, os.O_RDWR | os.O_CREAT | os.O_EXCL)
+                break;
+            except OSError, e:
+                # Someone else grabbed this name already
+                pass
+
+            # If the filename already exists, keep adding an underscore to the name of
+            # the file until the filename doesn't exist.
+            try:
-                dot_index = filename.rindex('.')
-            except ValueError: # filename has no dot
-                filename += '_'
@@ -393 +406 @@
-        # Write the file to disk.
-        setattr(self, field.attname, filename)
-
-
-
+
-        fp.write(raw_contents)
-        fp.close()
-