Ticket #10774: template-media.diff

django/forms/widgets.py

@@ -75 +75 @@
     def __getitem__(self, name):
         "Returns a Media object that only contains media of the given type"
         if name in MEDIA_TYPES:
-            return Media(**{name: getattr(self, '_' + name)})
+            return Media(**{str(name): getattr(self, '_' + name)})
         raise KeyError('Unknown media type "%s"' % name)
 
     def add_js(self, data):
@@ -422 +422 @@
 
     def value_from_datadict(self, data, files, name):
         value = data.get(name, None)
-        return {u'2': True, 
-                True: True, 
-                'True': True, 
-                u'3': False, 
-                'False': False, 
+        return {u'2': True,
+                True: True,
+                'True': True,
+                u'3': False,
+                'False': False,
                 False: False}.get(value, None)
 
     def _has_changed(self, initial, data):

tests/regressiontests/forms/media.py

@@ -286 +286 @@
 # Multiwidget media handling
 ###############################################################
 
-# MultiWidgets have a default media definition that gets all the 
+# MultiWidgets have a default media definition that gets all the
 # media from the component widgets
 >>> class MyMultiWidget(MultiWidget):
 ...     def __init__(self, attrs=None):
 ...         widgets = [MyWidget1, MyWidget2, MyWidget3]
 ...         super(MyMultiWidget, self).__init__(widgets, attrs)
-            
+
 >>> mymulti = MyMultiWidget()
->>> print mymulti.media   
+>>> print mymulti.media
 <link href="http://media.example.com/media/path/to/css1" type="text/css" media="all" rel="stylesheet" />
 <link href="/path/to/css2" type="text/css" media="all" rel="stylesheet" />
 <link href="/path/to/css3" type="text/css" media="all" rel="stylesheet" />
@@ -355 +355 @@
 <script type="text/javascript" src="/path/to/js4"></script>
 <script type="text/javascript" src="/some/form/javascript"></script>
 
+# Media works in templates
+>>> from django.template import Template, Context
+>>> Template("{{ form.media.js }}{{ form.media.css }}").render(Context({'form': f3}))
+u'<script type="text/javascript" src="/path/to/js1"></script>
+<script type="text/javascript" src="http://media.other.com/path/to/js2"></script>
+<script type="text/javascript" src="https://secure.other.com/path/to/js3"></script>
+<script type="text/javascript" src="/path/to/js4"></script>
+<script type="text/javascript" src="/some/form/javascript"></script><link href="http://media.example.com/media/path/to/css1" type="text/css" media="all" rel="stylesheet" />
+<link href="/path/to/css2" type="text/css" media="all" rel="stylesheet" />
+<link href="/path/to/css3" type="text/css" media="all" rel="stylesheet" />
+<link href="/some/form/css" type="text/css" media="all" rel="stylesheet" />'
+
 >>> settings.MEDIA_URL = ORIGINAL_MEDIA_URL
-"""
- No newline at end of file
+"""