Ticket #17556: media_inherit.2.patch

django/forms/widgets.py

@@ -11 +11 @@
     from urllib.parse import urljoin
 except ImportError:     # Python 2
     from urlparse import urljoin
+from inspect import getmembers
 
 from django.conf import settings
 from django.forms.util import flatatt, to_current_timezone
@@ -36 +37 @@
 class Media(object):
     def __init__(self, media=None, **kwargs):
         if media:
-            media_attrs = media.__dict__
+            media_attrs = dict(getmembers(media))
         else:
             media_attrs = kwargs
 

tests/regressiontests/forms/tests/media.py

@@ -285 +285 @@
 <script type="text/javascript" src="https://secure.other.com/path/to/js3"></script>
 <script type="text/javascript" src="/path/to/js4"></script>""")
 
+        class BaseMedia:
+            css = {"all": ["/path/to/css"]}
+
+        class ExtendWidget(TextInput):
+            class Media(BaseMedia):
+                js = ["/path/to/js"]
+
+        extend_widget = ExtendWidget()
+
+        self.assertEqual(str(extend_widget.media), """<link href="/path/to/css" type="text/css" media="all" rel="stylesheet" />
+<script type="text/javascript" src="/path/to/js"></script>""")
+
     def test_media_inheritance_single_type(self):
         # A widget can enable inheritance of one media type by specifying extend as a tuple
         class MyWidget1(TextInput):