浏览代码

Refs #22789 -- Removed contrib.webdesign per deprecation timeline.

Tim Graham 9 年之前
父节点
当前提交
3af9b70028

+ 0 - 12
django/contrib/webdesign/__init__.py

@@ -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
-)

+ 0 - 7
django/contrib/webdesign/apps.py

@@ -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")

+ 0 - 0
django/contrib/webdesign/templatetags/__init__.py


+ 0 - 6
django/contrib/webdesign/templatetags/webdesign.py

@@ -1,6 +0,0 @@
-from django import template
-from django.template.defaulttags import lorem
-
-register = template.Library()
-
-register.tag(lorem)

+ 0 - 9
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
 =============
 

+ 0 - 12
docs/ref/contrib/webdesign.txt

@@ -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`).

+ 0 - 4
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.
 

+ 0 - 1
docs/spelling_wordlist

@@ -937,7 +937,6 @@ virtualenvs
 virtualized
 Votizen
 webapps
-webdesign
 webkit
 WebKit
 Weblog

+ 2 - 2
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):

+ 0 - 5
tests/runtests.py

@@ -169,11 +169,6 @@ def setup(verbosity, test_labels, parallel):
         handler = logging.StreamHandler()
         logger.addHandler(handler)
 
-    warnings.filterwarnings(
-        'ignore',
-        'django.contrib.webdesign will be removed in Django 1.10.',
-        RemovedInDjango110Warning
-    )
     warnings.filterwarnings(
         'ignore',
         'The GeoManager class is deprecated.',

+ 0 - 0
tests/webdesign_tests/__init__.py


+ 0 - 14
tests/webdesign_tests/tests.py

@@ -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')