From 47f18a722624527cc72eef44cfc9d1e07ea4b4e0 Mon Sep 17 00:00:00 2001
From: Simon Charette <charette.s@gmail.com>
Date: Fri, 9 Aug 2024 12:45:44 -0400
Subject: [PATCH] Refs #35326 -- Adjusted deprecation warning stacklevel in
 FileSystemStorage.OS_OPEN_FLAGS.

---
 django/core/files/storage/filesystem.py | 1 +
 docs/releases/5.1.1.txt                 | 4 ++++
 tests/file_storage/tests.py             | 3 ++-
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/django/core/files/storage/filesystem.py b/django/core/files/storage/filesystem.py
index 310a0ed0dee..bf2b9caad4d 100644
--- a/django/core/files/storage/filesystem.py
+++ b/django/core/files/storage/filesystem.py
@@ -48,6 +48,7 @@ class FileSystemStorage(Storage, StorageSettingsMixin):
                 "Overriding OS_OPEN_FLAGS is deprecated. Use "
                 "the allow_overwrite parameter instead.",
                 RemovedInDjango60Warning,
+                stacklevel=2,
             )
 
     @cached_property
diff --git a/docs/releases/5.1.1.txt b/docs/releases/5.1.1.txt
index 84a61efec54..82a7aed1c89 100644
--- a/docs/releases/5.1.1.txt
+++ b/docs/releases/5.1.1.txt
@@ -23,3 +23,7 @@ Bugfixes
 * Adjusted the deprecation warning ``stacklevel`` in :meth:`.Model.save` and
   :meth:`.Model.asave` to correctly point to the offending call site
   (:ticket:`35060`).
+
+* Adjusted the deprecation warning ``stacklevel`` when using ``OS_OPEN_FLAGS``
+  in :class:`~django.core.files.storage.FileSystemStorage` to correctly point
+  to the offending call site (:ticket:`35326`).
diff --git a/tests/file_storage/tests.py b/tests/file_storage/tests.py
index bac88235b53..5f0024b81aa 100644
--- a/tests/file_storage/tests.py
+++ b/tests/file_storage/tests.py
@@ -635,10 +635,11 @@ class OverwritingStorageOSOpenFlagsWarningTests(SimpleTestCase):
     def test_os_open_flags_deprecation_warning(self):
         msg = "Overriding OS_OPEN_FLAGS is deprecated. Use the allow_overwrite "
         msg += "parameter instead."
-        with self.assertWarnsMessage(RemovedInDjango60Warning, msg):
+        with self.assertWarnsMessage(RemovedInDjango60Warning, msg) as ctx:
             self.storage = self.storage_class(
                 location=self.temp_dir, base_url="/test_media_url/"
             )
+        self.assertEqual(ctx.filename, __file__)
 
 
 # RemovedInDjango60Warning: Remove this test class.