Ticket #9216: widget_assert_list_or_tuple.diff

tests/regressiontests/forms/media.py

@@ -355 +355 @@
 <script type="text/javascript" src="/path/to/js4"></script>
 <script type="text/javascript" src="/some/form/javascript"></script>
 
+###############################################################
+# Assertions: js and css attributes need a list or tuple
+###############################################################
+
+# Test Assertion that you need to pass in a tuple or list
+>>> class MyBrokenCSSWidget(MyWidget1):
+...     class Media:
+...         css={'all': 'foo.css'}
+>>> widget=MyBrokenCSSWidget()
+>>> unicode(widget.media)
+Traceback (most recent call last):
+...
+AssertionError: Need tuple or list not <type 'str'>: foo.css
+
+# Test Assertion JS
+>>> class MyBrokenJSWidget(MyWidget1):
+...     class Media:
+...         js='foo.js'
+>>> widget=MyBrokenJSWidget()
+>>> unicode(widget.media)
+Traceback (most recent call last):
+...
+AssertionError: Need tuple or list not <type 'str'>: foo.js
+
 >>> settings.MEDIA_URL = ORIGINAL_MEDIA_URL

django/forms/widgets.py

@@ -80 +80 @@
 
     def add_js(self, data):
         if data:
+            assert isinstance(data, (tuple, list)), 'Need tuple or list not %s: %s' % (type(data), data)
             self._js.extend([path for path in data if path not in self._js])
 
     def add_css(self, data):
         if data:
             for medium, paths in data.items():
+                assert isinstance(paths, (tuple, list)), 'Need tuple or list not %s: %s' % (type(paths), paths)
                 self._css.setdefault(medium, []).extend([path for path in paths if path not in self._css[medium]])
 
     def __add__(self, other):