add comments for when deprecation ends

django · May 9, 2024 · 2cb63d6 · 2cb63d6
1 parent f7a168b
commit 2cb63d6
Showing 1 changed file with 9 additions and 3 deletions.
diff --git a/django/core/files/storage/filesystem.py b/django/core/files/storage/filesystem.py
@@ -26,9 +26,8 @@ class FileSystemStorage(Storage, StorageSettingsMixin):
     Standard filesystem storage
     """
 
-    # RemovedInDjango60Warning: when the deprecation ends, all uses of
-    # OS_OPEN_FLAGS in this class should be removed, except the flags needed
-    # inside the _save() method.
+    # RemovedInDjango60Warning: when the deprecation ends, remove this
+    #   OS_OPEN_FLAGS definition.
     # The combination of O_CREAT and O_EXCL makes os.open() raise OSError if
     # the file already exists before it's opened.
     OS_OPEN_FLAGS = os.O_WRONLY | os.O_CREAT | os.O_EXCL | getattr(os, "O_BINARY", 0)
@@ -47,6 +46,8 @@ def __init__(
         self._directory_permissions_mode = directory_permissions_mode
         self._allow_overwrite = allow_overwrite
         setting_changed.connect(self._clear_cached_properties)
+        # RemovedInDjango60Warning: when the deprecation ends, remove this
+        #   warning.
         if self.OS_OPEN_FLAGS != os.O_WRONLY | os.O_CREAT | os.O_EXCL | getattr(
             os, "O_BINARY", 0
         ):
@@ -137,6 +138,11 @@ def _save(self, name, content):
 
                 # This is a normal uploadedfile that we can stream.
                 else:
+                    # RemovedInDjango60Warning: when the deprecation ends, replace with:
+                    # open_flags = os.O_WRONLY | os.O_CREAT | os.O_EXCL |
+                    #              getattr(os, "O_BINARY", 0)
+                    # if self._allow_overwrite:
+                    #     open_flags = open_flags & ~os.O_EXCL
                     if (
                         self.OS_OPEN_FLAGS
                         == os.O_WRONLY