summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--django/contrib/webdesign/__init__.py12
-rw-r--r--django/contrib/webdesign/apps.py7
-rw-r--r--django/contrib/webdesign/templatetags/__init__.py0
-rw-r--r--django/contrib/webdesign/templatetags/webdesign.py6
-rw-r--r--docs/ref/contrib/index.txt9
-rw-r--r--docs/ref/contrib/webdesign.txt12
-rw-r--r--docs/ref/templates/builtins.txt4
-rw-r--r--docs/spelling_wordlist1
-rw-r--r--tests/apps/tests.py4
-rwxr-xr-xtests/runtests.py5
-rw-r--r--tests/webdesign_tests/__init__.py0
-rw-r--r--tests/webdesign_tests/tests.py14
12 files changed, 2 insertions, 72 deletions
diff --git a/django/contrib/webdesign/__init__.py b/django/contrib/webdesign/__init__.py
deleted file mode 100644
index b8e6ba1e2a..0000000000
--- a/django/contrib/webdesign/__init__.py
+++ /dev/null
@@ -1,12 +0,0 @@
-import warnings
-
-from django.utils.deprecation import RemovedInDjango110Warning
-
-
-default_app_config = 'django.contrib.webdesign.apps.WebDesignConfig'
-
-warnings.warn(
- "django.contrib.webdesign will be removed in Django 1.10. The "
- "{% lorem %} tag is now included in the built-in tags.",
- RemovedInDjango110Warning
-)
diff --git a/django/contrib/webdesign/apps.py b/django/contrib/webdesign/apps.py
deleted file mode 100644
index 9a332a2234..0000000000
--- a/django/contrib/webdesign/apps.py
+++ /dev/null
@@ -1,7 +0,0 @@
-from django.apps import AppConfig
-from django.utils.translation import ugettext_lazy as _
-
-
-class WebDesignConfig(AppConfig):
- name = 'django.contrib.webdesign'
- verbose_name = _("Web Design")
diff --git a/django/contrib/webdesign/templatetags/__init__.py b/django/contrib/webdesign/templatetags/__init__.py
deleted file mode 100644
index e69de29bb2..0000000000
--- a/django/contrib/webdesign/templatetags/__init__.py
+++ /dev/null
diff --git a/django/contrib/webdesign/templatetags/webdesign.py b/django/contrib/webdesign/templatetags/webdesign.py
deleted file mode 100644
index d7842df534..0000000000
--- a/django/contrib/webdesign/templatetags/webdesign.py
+++ /dev/null
@@ -1,6 +0,0 @@
-from django import template
-from django.template.defaulttags import lorem
-
-register = template.Library()
-
-register.tag(lorem)
diff --git a/docs/ref/contrib/index.txt b/docs/ref/contrib/index.txt
index b2b331476e..498a2e48c8 100644
--- a/docs/ref/contrib/index.txt
+++ b/docs/ref/contrib/index.txt
@@ -35,7 +35,6 @@ those packages have.
sites
staticfiles
syndication
- webdesign
admin
=====
@@ -137,14 +136,6 @@ A framework for generating syndication feeds, in RSS and Atom, quite easily.
See the :doc:`syndication documentation </ref/contrib/syndication>`.
-webdesign
-=========
-
-Helpers and utilities targeted primarily at Web *designers* rather than
-Web *developers*.
-
-See the :doc:`Web design helpers documentation </ref/contrib/webdesign>`.
-
Other add-ons
=============
diff --git a/docs/ref/contrib/webdesign.txt b/docs/ref/contrib/webdesign.txt
deleted file mode 100644
index f3c8ebe402..0000000000
--- a/docs/ref/contrib/webdesign.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-========================
-django.contrib.webdesign
-========================
-
-.. module:: django.contrib.webdesign
- :synopsis: Helpers and utilities targeted primarily at Web *designers*
- rather than Web *developers*.
-
-.. deprecated:: 1.8
-
- The package contained only a single template tag and it has been moved
- to the built-in tags (:ttag:`lorem`).
diff --git a/docs/ref/templates/builtins.txt b/docs/ref/templates/builtins.txt
index d032d7b1cc..359907d261 100644
--- a/docs/ref/templates/builtins.txt
+++ b/docs/ref/templates/builtins.txt
@@ -721,10 +721,6 @@ more information.
lorem
^^^^^
-.. versionadded:: 1.8
-
- The tag was previously located in :mod:`django.contrib.webdesign`.
-
Displays random "lorem ipsum" Latin text. This is useful for providing sample
data in templates.
diff --git a/docs/spelling_wordlist b/docs/spelling_wordlist
index dda4028ca2..efba30a8c3 100644
--- a/docs/spelling_wordlist
+++ b/docs/spelling_wordlist
@@ -937,7 +937,6 @@ virtualenvs
virtualized
Votizen
webapps
-webdesign
webkit
WebKit
Weblog
diff --git a/tests/apps/tests.py b/tests/apps/tests.py
index 9e34773a77..c226bf5010 100644
--- a/tests/apps/tests.py
+++ b/tests/apps/tests.py
@@ -118,7 +118,7 @@ class AppsTests(SimpleTestCase):
self.assertEqual(app_config.name, 'django.contrib.staticfiles')
with self.assertRaises(LookupError):
- apps.get_app_config('webdesign')
+ apps.get_app_config('admindocs')
msg = "No installed app with label 'django.contrib.auth'. Did you mean 'myauth'"
with self.assertRaisesMessage(LookupError, msg):
@@ -132,7 +132,7 @@ class AppsTests(SimpleTestCase):
self.assertTrue(apps.is_installed('django.contrib.admin'))
self.assertTrue(apps.is_installed('django.contrib.auth'))
self.assertTrue(apps.is_installed('django.contrib.staticfiles'))
- self.assertFalse(apps.is_installed('django.contrib.webdesign'))
+ self.assertFalse(apps.is_installed('django.contrib.admindocs'))
@override_settings(INSTALLED_APPS=SOME_INSTALLED_APPS)
def test_get_model(self):
diff --git a/tests/runtests.py b/tests/runtests.py
index 4c31090615..0726fbb51d 100755
--- a/tests/runtests.py
+++ b/tests/runtests.py
@@ -171,11 +171,6 @@ def setup(verbosity, test_labels, parallel):
warnings.filterwarnings(
'ignore',
- 'django.contrib.webdesign will be removed in Django 1.10.',
- RemovedInDjango110Warning
- )
- warnings.filterwarnings(
- 'ignore',
'The GeoManager class is deprecated.',
RemovedInDjango20Warning
)
diff --git a/tests/webdesign_tests/__init__.py b/tests/webdesign_tests/__init__.py
deleted file mode 100644
index e69de29bb2..0000000000
--- a/tests/webdesign_tests/__init__.py
+++ /dev/null
diff --git a/tests/webdesign_tests/tests.py b/tests/webdesign_tests/tests.py
deleted file mode 100644
index 0f8508c1a8..0000000000
--- a/tests/webdesign_tests/tests.py
+++ /dev/null
@@ -1,14 +0,0 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
-from django.template import Context, Template
-from django.test import SimpleTestCase, modify_settings
-
-
-@modify_settings(INSTALLED_APPS={'append': 'django.contrib.webdesign'})
-class WebdesignTest(SimpleTestCase):
-
- def test_lorem_tag(self):
- t = Template("{% load webdesign %}{% lorem 3 w %}")
- self.assertEqual(t.render(Context({})),
- 'lorem ipsum dolor')