diff --git a/django/contrib/admin/tests/__init__.py b/django/contrib/admin/tests/__init__.py index ca064cbbf9..ba00426123 100644 --- a/django/contrib/admin/tests/__init__.py +++ b/django/contrib/admin/tests/__init__.py @@ -1,5 +1,5 @@ -from django.contrib.admin.tests import widgets +from django.contrib.admin.tests.widgets import WIDGET_TESTS __test__ = { - 'WIDGET_TESTS': widgets, + 'WIDGET_TESTS': WIDGET_TESTS, } diff --git a/django/contrib/admin/tests/widgets.py b/django/contrib/admin/tests/widgets.py index e2c8c68916..0b204418c4 100644 --- a/django/contrib/admin/tests/widgets.py +++ b/django/contrib/admin/tests/widgets.py @@ -1,4 +1,6 @@ -""" +from django.conf import settings + +WIDGET_TESTS = """ >>> from datetime import datetime >>> from django.utils.html import escape, conditional_escape >>> from django.contrib.admin.widgets import FilteredSelectMultiple, AdminSplitDateTime @@ -16,7 +18,7 @@ HTML escaped. >>> w = FilteredSelectMultiple('test', False) >>> print conditional_escape(w.render('test', 'test')) + >>> w = AdminSplitDateTime() @@ -25,11 +27,14 @@ HTML escaped. >>> w = AdminFileWidget() >>> print conditional_escape(w.render('test', 'test')) -Currently: test
Change: +Currently: test
Change: >>> rel = LogEntry._meta.get_field('user').rel >>> w = ForeignKeyRawIdWidget(rel) >>> print conditional_escape(w.render('test', 'test', attrs={})) - Lookup + Lookup -""" +""" % { + 'ADMIN_MEDIA_PREFIX': settings.ADMIN_MEDIA_PREFIX, + 'MEDIA_URL': settings.MEDIA_URL +}