p31829507
/
django
mirror of https://github.com/django/django.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Stopped including type="text/css" attributes for CSS link tags.

This commit is contained in:
Claude Paroz 2022-01-21 15:46:37 +01:00
parent 9dc65263d4
commit 7c4f396509
19 changed files with 105 additions and 97 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
django/contrib/admin/templates/admin/auth/user/change_password.html
View File

@ -2,7 +2,7 @@
{% load i18n static %} {% load i18n static %}
{% load admin_urls %} {% load admin_urls %}
{% block extrastyle %}{{ block.super }}<link rel="stylesheet" type="text/css" href="{% static "admin/css/forms.css" %}">{% endblock %} {% block extrastyle %}{{ block.super }}<link rel="stylesheet" href="{% static "admin/css/forms.css" %}">{% endblock %}
{% block bodyclass %}{{ block.super }} {{ opts.app_label }}-{{ opts.model_name }} change-form{% endblock %} {% block bodyclass %}{{ block.super }} {{ opts.app_label }}-{{ opts.model_name }} change-form{% endblock %}
{% if not is_popup %} {% if not is_popup %}
{% block breadcrumbs %} {% block breadcrumbs %}

12
django/contrib/admin/templates/admin/base.html
View File

@ -3,21 +3,21 @@
<html lang="{{ LANGUAGE_CODE|default:"en-us" }}" dir="{{ LANGUAGE_BIDI|yesno:'rtl,ltr,auto' }}"> <html lang="{{ LANGUAGE_CODE|default:"en-us" }}" dir="{{ LANGUAGE_BIDI|yesno:'rtl,ltr,auto' }}">
<head> <head>
<title>{% block title %}{% endblock %}</title> <title>{% block title %}{% endblock %}</title>
<link rel="stylesheet" type="text/css" href="{% block stylesheet %}{% static "admin/css/base.css" %}{% endblock %}"> <link rel="stylesheet" href="{% block stylesheet %}{% static "admin/css/base.css" %}{% endblock %}">
{% block dark-mode-vars %} {% block dark-mode-vars %}
<link rel="stylesheet" type="text/css" href="{% static "admin/css/dark_mode.css" %}"> <link rel="stylesheet" href="{% static "admin/css/dark_mode.css" %}">
{% endblock %} {% endblock %}
{% if not is_popup and is_nav_sidebar_enabled %} {% if not is_popup and is_nav_sidebar_enabled %}
<link rel="stylesheet" type="text/css" href="{% static "admin/css/nav_sidebar.css" %}"> <link rel="stylesheet" href="{% static "admin/css/nav_sidebar.css" %}">
<script src="{% static 'admin/js/nav_sidebar.js' %}" defer></script> <script src="{% static 'admin/js/nav_sidebar.js' %}" defer></script>
{% endif %} {% endif %}
{% block extrastyle %}{% endblock %} {% block extrastyle %}{% endblock %}
{% if LANGUAGE_BIDI %}<link rel="stylesheet" type="text/css" href="{% block stylesheet_rtl %}{% static "admin/css/rtl.css" %}{% endblock %}">{% endif %} {% if LANGUAGE_BIDI %}<link rel="stylesheet" href="{% block stylesheet_rtl %}{% static "admin/css/rtl.css" %}{% endblock %}">{% endif %}
{% block extrahead %}{% endblock %} {% block extrahead %}{% endblock %}
{% block responsive %} {% block responsive %}
<meta name="viewport" content="user-scalable=no, width=device-width, initial-scale=1.0, maximum-scale=1.0"> <meta name="viewport" content="user-scalable=no, width=device-width, initial-scale=1.0, maximum-scale=1.0">
<link rel="stylesheet" type="text/css" href="{% static "admin/css/responsive.css" %}"> <link rel="stylesheet" href="{% static "admin/css/responsive.css" %}">
{% if LANGUAGE_BIDI %}<link rel="stylesheet" type="text/css" href="{% static "admin/css/responsive_rtl.css" %}">{% endif %} {% if LANGUAGE_BIDI %}<link rel="stylesheet" href="{% static "admin/css/responsive_rtl.css" %}">{% endif %}
{% endblock %} {% endblock %}
{% block blockbots %}<meta name="robots" content="NONE,NOARCHIVE">{% endblock %} {% block blockbots %}<meta name="robots" content="NONE,NOARCHIVE">{% endblock %}
</head> </head>

2
django/contrib/admin/templates/admin/change_form.html
View File

@ -6,7 +6,7 @@
{{ media }} {{ media }}
{% endblock %} {% endblock %}
{% block extrastyle %}{{ block.super }}<link rel="stylesheet" type="text/css" href="{% static "admin/css/forms.css" %}">{% endblock %} {% block extrastyle %}{{ block.super }}<link rel="stylesheet" href="{% static "admin/css/forms.css" %}">{% endblock %}
{% block coltype %}colM{% endblock %} {% block coltype %}colM{% endblock %}

4
django/contrib/admin/templates/admin/change_list.html
View File

@ -3,9 +3,9 @@
{% block extrastyle %} {% block extrastyle %}
{{ block.super }} {{ block.super }}
<link rel="stylesheet" type="text/css" href="{% static "admin/css/changelists.css" %}"> <link rel="stylesheet" href="{% static "admin/css/changelists.css" %}">
{% if cl.formset %} {% if cl.formset %}
<link rel="stylesheet" type="text/css" href="{% static "admin/css/forms.css" %}"> <link rel="stylesheet" href="{% static "admin/css/forms.css" %}">
{% endif %} {% endif %}
{% if cl.formset or action_form %} {% if cl.formset or action_form %}
<script src="{% url 'admin:jsi18n' %}"></script> <script src="{% url 'admin:jsi18n' %}"></script>

2
django/contrib/admin/templates/admin/index.html
View File

@ -1,7 +1,7 @@
{% extends "admin/base_site.html" %} {% extends "admin/base_site.html" %}
{% load i18n static %} {% load i18n static %}
{% block extrastyle %}{{ block.super }}<link rel="stylesheet" type="text/css" href="{% static "admin/css/dashboard.css" %}">{% endblock %} {% block extrastyle %}{{ block.super }}<link rel="stylesheet" href="{% static "admin/css/dashboard.css" %}">{% endblock %}
{% block coltype %}colMS{% endblock %} {% block coltype %}colMS{% endblock %}

2
django/contrib/admin/templates/admin/login.html
View File

@ -1,7 +1,7 @@
{% extends "admin/base_site.html" %} {% extends "admin/base_site.html" %}
{% load i18n static %} {% load i18n static %}
{% block extrastyle %}{{ block.super }}<link rel="stylesheet" type="text/css" href="{% static "admin/css/login.css" %}"> {% block extrastyle %}{{ block.super }}<link rel="stylesheet" href="{% static "admin/css/login.css" %}">
{{ form.media }} {{ form.media }}
{% endblock %} {% endblock %}

2
django/contrib/admin/templates/registration/password_change_form.html
View File

@ -1,6 +1,6 @@
{% extends "admin/base_site.html" %} {% extends "admin/base_site.html" %}
{% load i18n static %} {% load i18n static %}
{% block extrastyle %}{{ block.super }}<link rel="stylesheet" type="text/css" href="{% static "admin/css/forms.css" %}">{% endblock %} {% block extrastyle %}{{ block.super }}<link rel="stylesheet" href="{% static "admin/css/forms.css" %}">{% endblock %}
{% block userlinks %}{% url 'django-admindocs-docroot' as docsroot %}{% if docsroot %}<a href="{{ docsroot }}">{% translate 'Documentation' %}</a> / {% endif %} {% translate 'Change password' %} / <a href="{% url 'admin:logout' %}">{% translate 'Log out' %}</a>{% endblock %} {% block userlinks %}{% url 'django-admindocs-docroot' as docsroot %}{% if docsroot %}<a href="{{ docsroot }}">{% translate 'Documentation' %}</a> / {% endif %} {% translate 'Change password' %} / <a href="{% url 'admin:logout' %}">{% translate 'Log out' %}</a>{% endblock %}
{% block breadcrumbs %} {% block breadcrumbs %}
<div class="breadcrumbs"> <div class="breadcrumbs">

2
django/contrib/admin/templates/registration/password_reset_confirm.html
View File

@ -1,7 +1,7 @@
{% extends "admin/base_site.html" %} {% extends "admin/base_site.html" %}
{% load i18n static %} {% load i18n static %}
{% block extrastyle %}{{ block.super }}<link rel="stylesheet" type="text/css" href="{% static "admin/css/forms.css" %}">{% endblock %} {% block extrastyle %}{{ block.super }}<link rel="stylesheet" href="{% static "admin/css/forms.css" %}">{% endblock %}
{% block breadcrumbs %} {% block breadcrumbs %}
<div class="breadcrumbs"> <div class="breadcrumbs">
<a href="{% url 'admin:index' %}">{% translate 'Home' %}</a> <a href="{% url 'admin:index' %}">{% translate 'Home' %}</a>

2
django/contrib/admin/templates/registration/password_reset_form.html
View File

@ -1,7 +1,7 @@
{% extends "admin/base_site.html" %} {% extends "admin/base_site.html" %}
{% load i18n static %} {% load i18n static %}
{% block extrastyle %}{{ block.super }}<link rel="stylesheet" type="text/css" href="{% static "admin/css/forms.css" %}">{% endblock %} {% block extrastyle %}{{ block.super }}<link rel="stylesheet" href="{% static "admin/css/forms.css" %}">{% endblock %}
{% block breadcrumbs %} {% block breadcrumbs %}
<div class="breadcrumbs"> <div class="breadcrumbs">
<a href="{% url 'admin:index' %}">{% translate 'Home' %}</a> <a href="{% url 'admin:index' %}">{% translate 'Home' %}</a>

2
django/forms/widgets.py
View File

@ -90,7 +90,7 @@ class Media:
media = sorted(self._css) media = sorted(self._css)
return chain.from_iterable([ return chain.from_iterable([
format_html( format_html(
'<link href="{}" type="text/css" media="{}" rel="stylesheet">', '<link href="{}" media="{}" rel="stylesheet">',
self.absolute_path(path), medium self.absolute_path(path), medium
) for path in self._css[medium] ) for path in self._css[medium]
] for medium in media) ] for medium in media)

2
django/views/templates/default_urlconf.html
View File

@ -6,7 +6,7 @@
<meta charset="utf-8"> <meta charset="utf-8">
<title>{% translate "The install worked successfully! Congratulations!" %}</title> <title>{% translate "The install worked successfully! Congratulations!" %}</title>
<meta name="viewport" content="width=device-width, initial-scale=1"> <meta name="viewport" content="width=device-width, initial-scale=1">
<link rel="stylesheet" type="text/css" href="/static/admin/css/fonts.css"> <link rel="stylesheet" href="/static/admin/css/fonts.css">
<style> <style>
html { html {
line-height: 1.15; line-height: 1.15;

2
docs/_theme/djangodocs/layout.html vendored
View File

@ -72,7 +72,7 @@
</script> </script>
{% endif %} {% endif %}
{%- if include_console_assets -%} {%- if include_console_assets -%}
<link rel="stylesheet" href="{{ pathto('_static/console-tabs.css', 1) }}" type="text/css" /> <link rel="stylesheet" href="{{ pathto('_static/console-tabs.css', 1) }}">
{%- endif -%} {%- endif -%}
{% endblock %} {% endblock %}

2
docs/intro/tutorial06.txt
View File

@ -74,7 +74,7 @@ Next, add the following at the top of ``polls/templates/polls/index.html``:
{% load static %} {% load static %}
<link rel="stylesheet" type="text/css" href="{% static 'polls/style.css' %}"> <link rel="stylesheet" href="{% static 'polls/style.css' %}">
The ``{% static %}`` template tag generates the absolute URL of static files. The ``{% static %}`` template tag generates the absolute URL of static files.

2
docs/ref/templates/builtins.txt
View File

@ -2637,7 +2637,7 @@ It is also able to consume standard context variables, e.g. assuming a
``user_stylesheet`` variable is passed to the template:: ``user_stylesheet`` variable is passed to the template::
{% load static %} {% load static %}
<link rel="stylesheet" href="{% static user_stylesheet %}" type="text/css" media="screen"> <link rel="stylesheet" href="{% static user_stylesheet %}" media="screen">
If you'd like to retrieve a static URL without displaying it, you can use a If you'd like to retrieve a static URL without displaying it, you can use a
slightly different call:: slightly different call::

3
docs/releases/4.1.txt
View File

@ -366,6 +366,9 @@ Miscellaneous
:attr:`~django.contrib.admin.ModelAdmin.inlines` attributes now default to an :attr:`~django.contrib.admin.ModelAdmin.inlines` attributes now default to an
empty tuple rather than an empty list to discourage unintended mutation. empty tuple rather than an empty list to discourage unintended mutation.
* The ``type="text/css"`` attribute is no longer included in ``<link>`` tags
for CSS :doc:`form media </topics/forms/media>`.
.. _deprecated-features-4.1: .. _deprecated-features-4.1:
Features deprecated in 4.1 Features deprecated in 4.1

37
docs/topics/forms/media.txt
View File

@ -71,7 +71,7 @@ can be retrieved through this property::
>>> w = CalendarWidget() >>> w = CalendarWidget()
>>> print(w.media) >>> print(w.media)
<link href="http://static.example.com/pretty.css" type="text/css" media="all" rel="stylesheet"> <link href="http://static.example.com/pretty.css" media="all" rel="stylesheet">
<script src="http://static.example.com/animations.js"></script> <script src="http://static.example.com/animations.js"></script>
<script src="http://static.example.com/actions.js"></script> <script src="http://static.example.com/actions.js"></script>
@ -114,9 +114,14 @@ requirements::
If this last CSS definition were to be rendered, it would become the following HTML:: If this last CSS definition were to be rendered, it would become the following HTML::
<link href="http://static.example.com/pretty.css" type="text/css" media="screen" rel="stylesheet"> <link href="http://static.example.com/pretty.css" media="screen" rel="stylesheet">
<link href="http://static.example.com/lo_res.css" type="text/css" media="tv,projector" rel="stylesheet"> <link href="http://static.example.com/lo_res.css" media="tv,projector" rel="stylesheet">
<link href="http://static.example.com/newspaper.css" type="text/css" media="print" rel="stylesheet"> <link href="http://static.example.com/newspaper.css" media="print" rel="stylesheet">
.. versionchanged:: 4.1
In older versions, the ``type="text/css"`` attribute is included in CSS
links.
``js`` ``js``
------ ------
@ -145,8 +150,8 @@ example above::
>>> w = FancyCalendarWidget() >>> w = FancyCalendarWidget()
>>> print(w.media) >>> print(w.media)
<link href="http://static.example.com/pretty.css" type="text/css" media="all" rel="stylesheet"> <link href="http://static.example.com/pretty.css" media="all" rel="stylesheet">
<link href="http://static.example.com/fancy.css" type="text/css" media="all" rel="stylesheet"> <link href="http://static.example.com/fancy.css" media="all" rel="stylesheet">
<script src="http://static.example.com/animations.js"></script> <script src="http://static.example.com/animations.js"></script>
<script src="http://static.example.com/actions.js"></script> <script src="http://static.example.com/actions.js"></script>
<script src="http://static.example.com/whizbang.js"></script> <script src="http://static.example.com/whizbang.js"></script>
@ -165,7 +170,7 @@ an ``extend=False`` declaration to the ``Media`` declaration::
>>> w = FancyCalendarWidget() >>> w = FancyCalendarWidget()
>>> print(w.media) >>> print(w.media)
<link href="http://static.example.com/fancy.css" type="text/css" media="all" rel="stylesheet"> <link href="http://static.example.com/fancy.css" media="all" rel="stylesheet">
<script src="http://static.example.com/whizbang.js"></script> <script src="http://static.example.com/whizbang.js"></script>
If you require even more control over inheritance, define your assets using a If you require even more control over inheritance, define your assets using a
@ -228,7 +233,7 @@ was ``None``::
>>> w = CalendarWidget() >>> w = CalendarWidget()
>>> print(w.media) >>> print(w.media)
<link href="/css/pretty.css" type="text/css" media="all" rel="stylesheet"> <link href="/css/pretty.css" media="all" rel="stylesheet">
<script src="http://uploads.example.com/animations.js"></script> <script src="http://uploads.example.com/animations.js"></script>
<script src="http://othersite.com/actions.js"></script> <script src="http://othersite.com/actions.js"></script>
@ -236,7 +241,7 @@ But if :setting:`STATIC_URL` is ``'http://static.example.com/'``::
>>> w = CalendarWidget() >>> w = CalendarWidget()
>>> print(w.media) >>> print(w.media)
<link href="/css/pretty.css" type="text/css" media="all" rel="stylesheet"> <link href="/css/pretty.css" media="all" rel="stylesheet">
<script src="http://static.example.com/animations.js"></script> <script src="http://static.example.com/animations.js"></script>
<script src="http://othersite.com/actions.js"></script> <script src="http://othersite.com/actions.js"></script>
@ -245,7 +250,7 @@ Or if :mod:`~django.contrib.staticfiles` is configured using the
>>> w = CalendarWidget() >>> w = CalendarWidget()
>>> print(w.media) >>> print(w.media)
<link href="/css/pretty.css" type="text/css" media="all" rel="stylesheet"> <link href="/css/pretty.css" media="all" rel="stylesheet">
<script src="https://static.example.com/animations.27e20196a850.js"></script> <script src="https://static.example.com/animations.27e20196a850.js"></script>
<script src="http://othersite.com/actions.js"></script> <script src="http://othersite.com/actions.js"></script>
@ -268,12 +273,12 @@ operator to filter out a medium of interest. For example::
>>> w = CalendarWidget() >>> w = CalendarWidget()
>>> print(w.media) >>> print(w.media)
<link href="http://static.example.com/pretty.css" type="text/css" media="all" rel="stylesheet"> <link href="http://static.example.com/pretty.css" media="all" rel="stylesheet">
<script src="http://static.example.com/animations.js"></script> <script src="http://static.example.com/animations.js"></script>
<script src="http://static.example.com/actions.js"></script> <script src="http://static.example.com/actions.js"></script>
>>> print(w.media['css']) >>> print(w.media['css'])
<link href="http://static.example.com/pretty.css" type="text/css" media="all" rel="stylesheet"> <link href="http://static.example.com/pretty.css" media="all" rel="stylesheet">
When you use the subscript operator, the value that is returned is a When you use the subscript operator, the value that is returned is a
new ``Media`` object -- but one that only contains the media of interest. new ``Media`` object -- but one that only contains the media of interest.
@ -300,7 +305,7 @@ specified by both::
>>> w1 = CalendarWidget() >>> w1 = CalendarWidget()
>>> w2 = OtherWidget() >>> w2 = OtherWidget()
>>> print(w1.media + w2.media) >>> print(w1.media + w2.media)
<link href="http://static.example.com/pretty.css" type="text/css" media="all" rel="stylesheet"> <link href="http://static.example.com/pretty.css" media="all" rel="stylesheet">
<script src="http://static.example.com/animations.js"></script> <script src="http://static.example.com/animations.js"></script>
<script src="http://static.example.com/actions.js"></script> <script src="http://static.example.com/actions.js"></script>
<script src="http://static.example.com/whizbang.js"></script> <script src="http://static.example.com/whizbang.js"></script>
@ -356,7 +361,7 @@ are part of the form::
>>> f = ContactForm() >>> f = ContactForm()
>>> f.media >>> f.media
<link href="http://static.example.com/pretty.css" type="text/css" media="all" rel="stylesheet"> <link href="http://static.example.com/pretty.css" media="all" rel="stylesheet">
<script src="http://static.example.com/animations.js"></script> <script src="http://static.example.com/animations.js"></script>
<script src="http://static.example.com/actions.js"></script> <script src="http://static.example.com/actions.js"></script>
<script src="http://static.example.com/whizbang.js"></script> <script src="http://static.example.com/whizbang.js"></script>
@ -375,8 +380,8 @@ CSS for form layout -- add a ``Media`` declaration to the form::
>>> f = ContactForm() >>> f = ContactForm()
>>> f.media >>> f.media
<link href="http://static.example.com/pretty.css" type="text/css" media="all" rel="stylesheet"> <link href="http://static.example.com/pretty.css" media="all" rel="stylesheet">
<link href="http://static.example.com/layout.css" type="text/css" media="all" rel="stylesheet"> <link href="http://static.example.com/layout.css" media="all" rel="stylesheet">
<script src="http://static.example.com/animations.js"></script> <script src="http://static.example.com/animations.js"></script>
<script src="http://static.example.com/actions.js"></script> <script src="http://static.example.com/actions.js"></script>
<script src="http://static.example.com/whizbang.js"></script> <script src="http://static.example.com/whizbang.js"></script>

114
tests/forms_tests/tests/test_media.py
View File

@ -17,8 +17,8 @@ class FormsMediaTestCase(SimpleTestCase):
) )
self.assertEqual( self.assertEqual(
str(m), str(m),
"""<link href="http://media.example.com/static/path/to/css1" type="text/css" media="all" rel="stylesheet"> """<link href="http://media.example.com/static/path/to/css1" media="all" rel="stylesheet">
<link href="/path/to/css2" type="text/css" media="all" rel="stylesheet"> <link href="/path/to/css2" media="all" rel="stylesheet">
<script src="/path/to/js1"></script> <script src="/path/to/js1"></script>
<script src="http://media.other.com/path/to/js2"></script> <script src="http://media.other.com/path/to/js2"></script>
<script src="https://secure.other.com/path/to/js3"></script>""" <script src="https://secure.other.com/path/to/js3"></script>"""
@ -38,8 +38,8 @@ class FormsMediaTestCase(SimpleTestCase):
m3 = Media(Foo) m3 = Media(Foo)
self.assertEqual( self.assertEqual(
str(m3), str(m3),
"""<link href="http://media.example.com/static/path/to/css1" type="text/css" media="all" rel="stylesheet"> """<link href="http://media.example.com/static/path/to/css1" media="all" rel="stylesheet">
<link href="/path/to/css2" type="text/css" media="all" rel="stylesheet"> <link href="/path/to/css2" media="all" rel="stylesheet">
<script src="/path/to/js1"></script> <script src="/path/to/js1"></script>
<script src="http://media.other.com/path/to/js2"></script> <script src="http://media.other.com/path/to/js2"></script>
<script src="https://secure.other.com/path/to/js3"></script>""" <script src="https://secure.other.com/path/to/js3"></script>"""
@ -70,8 +70,8 @@ class FormsMediaTestCase(SimpleTestCase):
w1 = MyWidget1() w1 = MyWidget1()
self.assertEqual( self.assertEqual(
str(w1.media), str(w1.media),
"""<link href="http://media.example.com/static/path/to/css1" type="text/css" media="all" rel="stylesheet"> """<link href="http://media.example.com/static/path/to/css1" media="all" rel="stylesheet">
<link href="/path/to/css2" type="text/css" media="all" rel="stylesheet"> <link href="/path/to/css2" media="all" rel="stylesheet">
<script src="/path/to/js1"></script> <script src="/path/to/js1"></script>
<script src="http://media.other.com/path/to/js2"></script> <script src="http://media.other.com/path/to/js2"></script>
<script src="https://secure.other.com/path/to/js3"></script>""" <script src="https://secure.other.com/path/to/js3"></script>"""
@ -80,8 +80,8 @@ class FormsMediaTestCase(SimpleTestCase):
# Media objects can be interrogated by media type # Media objects can be interrogated by media type
self.assertEqual( self.assertEqual(
str(w1.media['css']), str(w1.media['css']),
"""<link href="http://media.example.com/static/path/to/css1" type="text/css" media="all" rel="stylesheet"> """<link href="http://media.example.com/static/path/to/css1" media="all" rel="stylesheet">
<link href="/path/to/css2" type="text/css" media="all" rel="stylesheet">""" <link href="/path/to/css2" media="all" rel="stylesheet">"""
) )
self.assertEqual( self.assertEqual(
@ -120,9 +120,9 @@ class FormsMediaTestCase(SimpleTestCase):
w3 = MyWidget3() w3 = MyWidget3()
self.assertEqual( self.assertEqual(
str(w1.media + w2.media + w3.media), str(w1.media + w2.media + w3.media),
"""<link href="http://media.example.com/static/path/to/css1" type="text/css" media="all" rel="stylesheet"> """<link href="http://media.example.com/static/path/to/css1" media="all" rel="stylesheet">
<link href="/path/to/css2" type="text/css" media="all" rel="stylesheet"> <link href="/path/to/css2" media="all" rel="stylesheet">
<link href="/path/to/css3" type="text/css" media="all" rel="stylesheet"> <link href="/path/to/css3" media="all" rel="stylesheet">
<script src="/path/to/js1"></script> <script src="/path/to/js1"></script>
<script src="http://media.other.com/path/to/js2"></script> <script src="http://media.other.com/path/to/js2"></script>
<script src="/path/to/js4"></script> <script src="/path/to/js4"></script>
@ -132,8 +132,8 @@ class FormsMediaTestCase(SimpleTestCase):
# media addition hasn't affected the original objects # media addition hasn't affected the original objects
self.assertEqual( self.assertEqual(
str(w1.media), str(w1.media),
"""<link href="http://media.example.com/static/path/to/css1" type="text/css" media="all" rel="stylesheet"> """<link href="http://media.example.com/static/path/to/css1" media="all" rel="stylesheet">
<link href="/path/to/css2" type="text/css" media="all" rel="stylesheet"> <link href="/path/to/css2" media="all" rel="stylesheet">
<script src="/path/to/js1"></script> <script src="/path/to/js1"></script>
<script src="http://media.other.com/path/to/js2"></script> <script src="http://media.other.com/path/to/js2"></script>
<script src="https://secure.other.com/path/to/js3"></script>""" <script src="https://secure.other.com/path/to/js3"></script>"""
@ -148,7 +148,7 @@ class FormsMediaTestCase(SimpleTestCase):
js = ('/path/to/js1', '/path/to/js1') js = ('/path/to/js1', '/path/to/js1')
w4 = MyWidget4() w4 = MyWidget4()
self.assertEqual(str(w4.media), """<link href="/path/to/css1" type="text/css" media="all" rel="stylesheet"> self.assertEqual(str(w4.media), """<link href="/path/to/css1" media="all" rel="stylesheet">
<script src="/path/to/js1"></script>""") <script src="/path/to/js1"></script>""")
def test_media_deduplication(self): def test_media_deduplication(self):
@ -159,7 +159,7 @@ class FormsMediaTestCase(SimpleTestCase):
css={'all': ('/path/to/css1', '/path/to/css1')}, css={'all': ('/path/to/css1', '/path/to/css1')},
js=('/path/to/js1', '/path/to/js1'), js=('/path/to/js1', '/path/to/js1'),
) )
self.assertEqual(str(media), """<link href="/path/to/css1" type="text/css" media="all" rel="stylesheet"> self.assertEqual(str(media), """<link href="/path/to/css1" media="all" rel="stylesheet">
<script src="/path/to/js1"></script>""") <script src="/path/to/js1"></script>""")
def test_media_property(self): def test_media_property(self):
@ -174,7 +174,7 @@ class FormsMediaTestCase(SimpleTestCase):
media = property(_media) media = property(_media)
w4 = MyWidget4() w4 = MyWidget4()
self.assertEqual(str(w4.media), """<link href="/some/path" type="text/css" media="all" rel="stylesheet"> self.assertEqual(str(w4.media), """<link href="/some/path" media="all" rel="stylesheet">
<script src="/some/js"></script>""") <script src="/some/js"></script>""")
# Media properties can reference the media of their parents # Media properties can reference the media of their parents
@ -184,8 +184,8 @@ class FormsMediaTestCase(SimpleTestCase):
media = property(_media) media = property(_media)
w5 = MyWidget5() w5 = MyWidget5()
self.assertEqual(str(w5.media), """<link href="/some/path" type="text/css" media="all" rel="stylesheet"> self.assertEqual(str(w5.media), """<link href="/some/path" media="all" rel="stylesheet">
<link href="/other/path" type="text/css" media="all" rel="stylesheet"> <link href="/other/path" media="all" rel="stylesheet">
<script src="/some/js"></script> <script src="/some/js"></script>
<script src="/other/js"></script>""") <script src="/other/js"></script>""")
@ -207,9 +207,9 @@ class FormsMediaTestCase(SimpleTestCase):
w6 = MyWidget6() w6 = MyWidget6()
self.assertEqual( self.assertEqual(
str(w6.media), str(w6.media),
"""<link href="http://media.example.com/static/path/to/css1" type="text/css" media="all" rel="stylesheet"> """<link href="http://media.example.com/static/path/to/css1" media="all" rel="stylesheet">
<link href="/other/path" type="text/css" media="all" rel="stylesheet"> <link href="/other/path" media="all" rel="stylesheet">
<link href="/path/to/css2" type="text/css" media="all" rel="stylesheet"> <link href="/path/to/css2" media="all" rel="stylesheet">
<script src="/path/to/js1"></script> <script src="/path/to/js1"></script>
<script src="/other/js"></script> <script src="/other/js"></script>
<script src="http://media.other.com/path/to/js2"></script> <script src="http://media.other.com/path/to/js2"></script>
@ -235,8 +235,8 @@ class FormsMediaTestCase(SimpleTestCase):
w7 = MyWidget7() w7 = MyWidget7()
self.assertEqual( self.assertEqual(
str(w7.media), str(w7.media),
"""<link href="http://media.example.com/static/path/to/css1" type="text/css" media="all" rel="stylesheet"> """<link href="http://media.example.com/static/path/to/css1" media="all" rel="stylesheet">
<link href="/path/to/css2" type="text/css" media="all" rel="stylesheet"> <link href="/path/to/css2" media="all" rel="stylesheet">
<script src="/path/to/js1"></script> <script src="/path/to/js1"></script>
<script src="http://media.other.com/path/to/js2"></script> <script src="http://media.other.com/path/to/js2"></script>
<script src="https://secure.other.com/path/to/js3"></script>""" <script src="https://secure.other.com/path/to/js3"></script>"""
@ -253,9 +253,9 @@ class FormsMediaTestCase(SimpleTestCase):
w8 = MyWidget8() w8 = MyWidget8()
self.assertEqual( self.assertEqual(
str(w8.media), str(w8.media),
"""<link href="/path/to/css3" type="text/css" media="all" rel="stylesheet"> """<link href="/path/to/css3" media="all" rel="stylesheet">
<link href="http://media.example.com/static/path/to/css1" type="text/css" media="all" rel="stylesheet"> <link href="http://media.example.com/static/path/to/css1" media="all" rel="stylesheet">
<link href="/path/to/css2" type="text/css" media="all" rel="stylesheet"> <link href="/path/to/css2" media="all" rel="stylesheet">
<script src="/path/to/js1"></script> <script src="/path/to/js1"></script>
<script src="http://media.other.com/path/to/js2"></script> <script src="http://media.other.com/path/to/js2"></script>
<script src="/path/to/js4"></script> <script src="/path/to/js4"></script>
@ -287,8 +287,8 @@ class FormsMediaTestCase(SimpleTestCase):
w9 = MyWidget9() w9 = MyWidget9()
self.assertEqual( self.assertEqual(
str(w9.media), str(w9.media),
"""<link href="/some/path" type="text/css" media="all" rel="stylesheet"> """<link href="/some/path" media="all" rel="stylesheet">
<link href="/other/path" type="text/css" media="all" rel="stylesheet"> <link href="/other/path" media="all" rel="stylesheet">
<script src="/some/js"></script> <script src="/some/js"></script>
<script src="/other/js"></script>""" <script src="/other/js"></script>"""
) )
@ -303,8 +303,8 @@ class FormsMediaTestCase(SimpleTestCase):
js = ('/path/to/js1', '/path/to/js4') js = ('/path/to/js1', '/path/to/js4')
w10 = MyWidget10() w10 = MyWidget10()
self.assertEqual(str(w10.media), """<link href="/path/to/css3" type="text/css" media="all" rel="stylesheet"> self.assertEqual(str(w10.media), """<link href="/path/to/css3" media="all" rel="stylesheet">
<link href="http://media.example.com/static/path/to/css1" type="text/css" media="all" rel="stylesheet"> <link href="http://media.example.com/static/path/to/css1" media="all" rel="stylesheet">
<script src="/path/to/js1"></script> <script src="/path/to/js1"></script>
<script src="/path/to/js4"></script>""") <script src="/path/to/js4"></script>""")
@ -328,9 +328,9 @@ class FormsMediaTestCase(SimpleTestCase):
w11 = MyWidget11() w11 = MyWidget11()
self.assertEqual( self.assertEqual(
str(w11.media), str(w11.media),
"""<link href="/path/to/css3" type="text/css" media="all" rel="stylesheet"> """<link href="/path/to/css3" media="all" rel="stylesheet">
<link href="http://media.example.com/static/path/to/css1" type="text/css" media="all" rel="stylesheet"> <link href="http://media.example.com/static/path/to/css1" media="all" rel="stylesheet">
<link href="/path/to/css2" type="text/css" media="all" rel="stylesheet"> <link href="/path/to/css2" media="all" rel="stylesheet">
<script src="/path/to/js1"></script> <script src="/path/to/js1"></script>
<script src="http://media.other.com/path/to/js2"></script> <script src="http://media.other.com/path/to/js2"></script>
<script src="/path/to/js4"></script> <script src="/path/to/js4"></script>
@ -357,9 +357,9 @@ class FormsMediaTestCase(SimpleTestCase):
w12 = MyWidget12() w12 = MyWidget12()
self.assertEqual( self.assertEqual(
str(w12.media), str(w12.media),
"""<link href="/path/to/css3" type="text/css" media="all" rel="stylesheet"> """<link href="/path/to/css3" media="all" rel="stylesheet">
<link href="http://media.example.com/static/path/to/css1" type="text/css" media="all" rel="stylesheet"> <link href="http://media.example.com/static/path/to/css1" media="all" rel="stylesheet">
<link href="/path/to/css2" type="text/css" media="all" rel="stylesheet"> <link href="/path/to/css2" media="all" rel="stylesheet">
<script src="/path/to/js1"></script> <script src="/path/to/js1"></script>
<script src="/path/to/js4"></script>""" <script src="/path/to/js4"></script>"""
) )
@ -382,10 +382,10 @@ class FormsMediaTestCase(SimpleTestCase):
multimedia = MultimediaWidget() multimedia = MultimediaWidget()
self.assertEqual( self.assertEqual(
str(multimedia.media), str(multimedia.media),
"""<link href="/file4" type="text/css" media="print" rel="stylesheet"> """<link href="/file4" media="print" rel="stylesheet">
<link href="/file3" type="text/css" media="screen" rel="stylesheet"> <link href="/file3" media="screen" rel="stylesheet">
<link href="/file1" type="text/css" media="screen, print" rel="stylesheet"> <link href="/file1" media="screen, print" rel="stylesheet">
<link href="/file2" type="text/css" media="screen, print" rel="stylesheet"> <link href="/file2" media="screen, print" rel="stylesheet">
<script src="/path/to/js1"></script> <script src="/path/to/js1"></script>
<script src="/path/to/js4"></script>""" <script src="/path/to/js4"></script>"""
) )
@ -426,9 +426,9 @@ class FormsMediaTestCase(SimpleTestCase):
mymulti = MyMultiWidget() mymulti = MyMultiWidget()
self.assertEqual( self.assertEqual(
str(mymulti.media), str(mymulti.media),
"""<link href="http://media.example.com/static/path/to/css1" type="text/css" media="all" rel="stylesheet"> """<link href="http://media.example.com/static/path/to/css1" media="all" rel="stylesheet">
<link href="/path/to/css2" type="text/css" media="all" rel="stylesheet"> <link href="/path/to/css2" media="all" rel="stylesheet">
<link href="/path/to/css3" type="text/css" media="all" rel="stylesheet"> <link href="/path/to/css3" media="all" rel="stylesheet">
<script src="/path/to/js1"></script> <script src="/path/to/js1"></script>
<script src="http://media.other.com/path/to/js2"></script> <script src="http://media.other.com/path/to/js2"></script>
<script src="/path/to/js4"></script> <script src="/path/to/js4"></script>
@ -468,9 +468,9 @@ class FormsMediaTestCase(SimpleTestCase):
f1 = MyForm() f1 = MyForm()
self.assertEqual( self.assertEqual(
str(f1.media), str(f1.media),
"""<link href="http://media.example.com/static/path/to/css1" type="text/css" media="all" rel="stylesheet"> """<link href="http://media.example.com/static/path/to/css1" media="all" rel="stylesheet">
<link href="/path/to/css2" type="text/css" media="all" rel="stylesheet"> <link href="/path/to/css2" media="all" rel="stylesheet">
<link href="/path/to/css3" type="text/css" media="all" rel="stylesheet"> <link href="/path/to/css3" media="all" rel="stylesheet">
<script src="/path/to/js1"></script> <script src="/path/to/js1"></script>
<script src="http://media.other.com/path/to/js2"></script> <script src="http://media.other.com/path/to/js2"></script>
<script src="/path/to/js4"></script> <script src="/path/to/js4"></script>
@ -483,9 +483,9 @@ class FormsMediaTestCase(SimpleTestCase):
f2 = AnotherForm() f2 = AnotherForm()
self.assertEqual( self.assertEqual(
str(f1.media + f2.media), str(f1.media + f2.media),
"""<link href="http://media.example.com/static/path/to/css1" type="text/css" media="all" rel="stylesheet"> """<link href="http://media.example.com/static/path/to/css1" media="all" rel="stylesheet">
<link href="/path/to/css2" type="text/css" media="all" rel="stylesheet"> <link href="/path/to/css2" media="all" rel="stylesheet">
<link href="/path/to/css3" type="text/css" media="all" rel="stylesheet"> <link href="/path/to/css3" media="all" rel="stylesheet">
<script src="/path/to/js1"></script> <script src="/path/to/js1"></script>
<script src="http://media.other.com/path/to/js2"></script> <script src="http://media.other.com/path/to/js2"></script>
<script src="/path/to/js4"></script> <script src="/path/to/js4"></script>
@ -505,10 +505,10 @@ class FormsMediaTestCase(SimpleTestCase):
f3 = FormWithMedia() f3 = FormWithMedia()
self.assertEqual( self.assertEqual(
str(f3.media), str(f3.media),
"""<link href="http://media.example.com/static/path/to/css1" type="text/css" media="all" rel="stylesheet"> """<link href="http://media.example.com/static/path/to/css1" media="all" rel="stylesheet">
<link href="/some/form/css" type="text/css" media="all" rel="stylesheet"> <link href="/some/form/css" media="all" rel="stylesheet">
<link href="/path/to/css2" type="text/css" media="all" rel="stylesheet"> <link href="/path/to/css2" media="all" rel="stylesheet">
<link href="/path/to/css3" type="text/css" media="all" rel="stylesheet"> <link href="/path/to/css3" media="all" rel="stylesheet">
<script src="/path/to/js1"></script> <script src="/path/to/js1"></script>
<script src="/some/form/javascript"></script> <script src="/some/form/javascript"></script>
<script src="http://media.other.com/path/to/js2"></script> <script src="http://media.other.com/path/to/js2"></script>
@ -524,10 +524,10 @@ class FormsMediaTestCase(SimpleTestCase):
<script src="http://media.other.com/path/to/js2"></script> <script src="http://media.other.com/path/to/js2"></script>
<script src="/path/to/js4"></script> <script src="/path/to/js4"></script>
<script src="https://secure.other.com/path/to/js3"></script>""" <script src="https://secure.other.com/path/to/js3"></script>"""
"""<link href="http://media.example.com/static/path/to/css1" type="text/css" media="all" rel="stylesheet"> """<link href="http://media.example.com/static/path/to/css1" media="all" rel="stylesheet">
<link href="/some/form/css" type="text/css" media="all" rel="stylesheet"> <link href="/some/form/css" media="all" rel="stylesheet">
<link href="/path/to/css2" type="text/css" media="all" rel="stylesheet"> <link href="/path/to/css2" media="all" rel="stylesheet">
<link href="/path/to/css3" type="text/css" media="all" rel="stylesheet">""" <link href="/path/to/css3" media="all" rel="stylesheet">"""
) )
def test_html_safe(self): def test_html_safe(self):

4
tests/model_forms/tests.py
View File

@ -2485,8 +2485,8 @@ class OtherModelFormTests(TestCase):
f = ModelFormWithMedia() f = ModelFormWithMedia()
self.assertHTMLEqual( self.assertHTMLEqual(
str(f.media), str(f.media),
'''<link href="/some/form/css" type="text/css" media="all" rel="stylesheet"> '<link href="/some/form/css" media="all" rel="stylesheet">'
<script src="/some/form/javascript"></script>''' '<script src="/some/form/javascript"></script>'
) )
def test_choices_type(self): def test_choices_type(self):

4
tests/staticfiles_tests/test_forms.py
View File

@ -29,8 +29,8 @@ class StaticFilesFormsMediaTestCase(SimpleTestCase):
) )
self.assertEqual( self.assertEqual(
str(m), str(m),
"""<link href="https://example.com/assets/path/to/css1" type="text/css" media="all" rel="stylesheet"> """<link href="https://example.com/assets/path/to/css1" media="all" rel="stylesheet">
<link href="/path/to/css2" type="text/css" media="all" rel="stylesheet"> <link href="/path/to/css2" media="all" rel="stylesheet">
<script src="/path/to/js1"></script> <script src="/path/to/js1"></script>
<script src="http://media.other.com/path/to/js2"></script> <script src="http://media.other.com/path/to/js2"></script>
<script src="https://secure.other.com/path/to/js3"></script> <script src="https://secure.other.com/path/to/js3"></script>