summaryrefslogtreecommitdiff
path: root/django/forms
diff options
context:
space:
mode:
authorJacob Walls <jacobtylerwalls@gmail.com>2026-06-10 16:24:10 -0400
committerJacob Walls <jacobtylerwalls@gmail.com>2026-06-10 17:15:59 -0400
commita2f8a4a6f9ac094edde937e56a3ecbd112ee448c (patch)
tree4423af3d5fb9382140692fac01cfdfc52c88682b /django/forms
parent15bcbeeb95ca34385c119acea14df1f5e7274d45 (diff)
Fixed #36104 -- Returned NotImplemented in Media.__add__ for non-Media RHS.
Diffstat (limited to 'django/forms')
-rw-r--r--django/forms/widgets.py2
1 files changed, 2 insertions, 0 deletions
diff --git a/django/forms/widgets.py b/django/forms/widgets.py
index 56ff7bb5ad..82498aa662 100644
--- a/django/forms/widgets.py
+++ b/django/forms/widgets.py
@@ -262,6 +262,8 @@ class Media:
return list(dict.fromkeys(chain.from_iterable(filter(None, lists))))
def __add__(self, other):
+ if not isinstance(other, Media):
+ return NotImplemented
combined = Media()
combined._css_lists = self._css_lists[:]
combined._js_lists = self._js_lists[:]