Ticket #9433: inject_locks.patch

django/core/files/move.py

@@ -35 +35 @@
     return (os.path.normcase(os.path.abspath(src)) ==
             os.path.normcase(os.path.abspath(dst)))
 
-def file_move_safe(old_file_name, new_file_name, chunk_size = 1024*64, allow_overwrite=False):
+def file_move_safe(old_file_name, new_file_name, chunk_size = 1024*64, allow_overwrite=False, locks=locks):
     """
     Moves a file from one location to another in the safest way possible.
 

django/core/files/storage.py

@@ -121 +121 @@
     Standard filesystem storage
     """
 
-    def __init__(self, location=settings.MEDIA_ROOT, base_url=settings.MEDIA_URL):
+    def __init__(self, location=settings.MEDIA_ROOT, base_url=settings.MEDIA_URL, locks=locks):
         self.location = os.path.abspath(location)
         self.base_url = base_url
+        self.locks = locks
 
     def _open(self, name, mode='rb'):
         return File(open(self.path(name), mode))
@@ -147 +148 @@
             try:
                 # This file has a file path that we can move.
                 if hasattr(content, 'temporary_file_path'):
-                    file_move_safe(content.temporary_file_path(), full_path)
+                    file_move_safe(content.temporary_file_path(), full_path, locks=self.locks)
                     content.close()
 
                 # This is a normal uploadedfile that we can stream.
@@ -156 +157 @@
                     # OSError if the file already exists before we open it.
                     fd = os.open(full_path, os.O_WRONLY | os.O_CREAT | os.O_EXCL | getattr(os, 'O_BINARY', 0))
                     try:
-                        locks.lock(fd, locks.LOCK_EX)
+                        self.locks.lock(fd, self.locks.LOCK_EX)
                         for chunk in content.chunks():
                             os.write(fd, chunk)
                     finally:
-                        locks.unlock(fd)
+                        self.locks.unlock(fd)
                         os.close(fd)
             except OSError, e:
                 if e.errno == errno.EEXIST: