From a2f8a4a6f9ac094edde937e56a3ecbd112ee448c Mon Sep 17 00:00:00 2001
From: Jacob Walls <jacobtylerwalls@gmail.com>
Date: Wed, 10 Jun 2026 16:24:10 -0400
Subject: Fixed #36104 -- Returned NotImplemented in Media.__add__ for
 non-Media RHS.

---
 tests/forms_tests/tests/test_media.py | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'tests')

diff --git a/tests/forms_tests/tests/test_media.py b/tests/forms_tests/tests/test_media.py
index b24ed948a9..854e52d95c 100644
--- a/tests/forms_tests/tests/test_media.py
+++ b/tests/forms_tests/tests/test_media.py
@@ -859,6 +859,13 @@ class FormsMediaTestCase(SimpleTestCase):
         self.assertEqual(merged._css_lists, [{"screen": ["a.css"]}])
         self.assertEqual(merged._js_lists, [["a"]])
 
+    def test_add_invalid_type(self):
+        class InvalidType:
+            pass
+
+        with self.assertRaises(TypeError):
+            Media() + InvalidType()
+
     def test_render_js_with_attrs(self):
         media = Media(js=[Script("/path/to/js", integrity="sha256-abc")])
         self.assertHTMLEqual(
-- 
cgit v1.3