Ticket #9433: inject_locks_Django-1.5a1.2.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

@@ -146 +146 @@
     Standard filesystem storage
     """
 
-    def __init__(self, location=None, base_url=None):
+    def __init__(self, location=None, base_url=None, locks=locks):
         if location is None:
             location = settings.MEDIA_ROOT
         self.base_location = location
@@ -154 +154 @@
         if base_url is None:
             base_url = settings.MEDIA_URL
         self.base_url = base_url
+        self.locks = locks
 
     def _open(self, name, mode='rb'):
         return File(open(self.path(name), mode))
@@ -185 +186 @@
             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, self.locks)
                     content.close()
 
                 # This is a normal uploadedfile that we can stream.
@@ -197 +198 @@
                     # The current umask value is masked out by os.open!
                     fd = os.open(full_path, flags, 0o666)
                     try:
-                        locks.lock(fd, locks.LOCK_EX)
+                        self.locks.lock(fd, self.locks.LOCK_EX)
                         _file = None
                         for chunk in content.chunks():
                             if _file is None:
@@ -205 +206 @@
                                 _file = os.fdopen(fd, mode)
                             _file.write(chunk)
                     finally:
-                        locks.unlock(fd)
+                        self.locks.unlock(fd)
                         if _file is not None:
                             _file.close()
                         else: