Refs #18974 -- Removed @models.permalink() decorator per deprecation timeline.

5 files changed, 0 insertions, 67 deletions

diff --git a/tests/model_permalink/__init__.py b/tests/model_permalink/__init__.py
deleted file mode 100644
index e69de29bb2..0000000000
--- a/tests/model_permalink/__init__.py
+++ /dev/null
diff --git a/tests/model_permalink/models.py b/tests/model_permalink/models.py
deleted file mode 100644
index 9074837a8b..0000000000
--- a/tests/model_permalink/models.py
+++ /dev/null
@@ -1,30 +0,0 @@
-import warnings
-
-from django.db import models
-from django.utils.deprecation import RemovedInDjango21Warning
-
-
-def set_attr(name, value):
-    def wrapper(function):
-        setattr(function, name, value)
-        return function
-    return wrapper
-
-
-with warnings.catch_warnings():
-    warnings.simplefilter('ignore', category=RemovedInDjango21Warning)
-
-    class Guitarist(models.Model):
-        name = models.CharField(max_length=50)
-        slug = models.CharField(max_length=50)
-
-        @models.permalink
-        def url(self):
-            "Returns the URL for this guitarist."
-            return ('guitarist_detail', [self.slug])
-
-        @models.permalink
-        @set_attr('attribute', 'value')
-        def url_with_attribute(self):
-            "Returns the URL for this guitarist and holds an attribute"
-            return ('guitarist_detail', [self.slug])
diff --git a/tests/model_permalink/tests.py b/tests/model_permalink/tests.py
deleted file mode 100644
index 3bc59d930f..0000000000
--- a/tests/model_permalink/tests.py
+++ /dev/null
@@ -1,25 +0,0 @@
-from django.test import SimpleTestCase, override_settings
-
-from .models import Guitarist
-
-
-@override_settings(ROOT_URLCONF='model_permalink.urls')
-class PermalinkTests(SimpleTestCase):
-
-    def test_permalink(self):
-        g = Guitarist(name='Adrien Moignard', slug='adrienmoignard')
-        self.assertEqual(g.url(), '/guitarists/adrienmoignard/')
-
-    def test_wrapped_docstring(self):
-        "Methods using the @permalink decorator retain their docstring."
-        g = Guitarist(name='Adrien Moignard', slug='adrienmoignard')
-        self.assertEqual(g.url.__doc__, "Returns the URL for this guitarist.")
-
-    def test_wrapped_attribute(self):
-        """
-        Methods using the @permalink decorator can have attached attributes
-        from other decorators
-        """
-        g = Guitarist(name='Adrien Moignard', slug='adrienmoignard')
-        self.assertTrue(hasattr(g.url_with_attribute, 'attribute'))
-        self.assertEqual(g.url_with_attribute.attribute, 'value')
diff --git a/tests/model_permalink/urls.py b/tests/model_permalink/urls.py
deleted file mode 100644
index be973aada5..0000000000
--- a/tests/model_permalink/urls.py
+++ /dev/null
@@ -1,7 +0,0 @@
-from django.conf.urls import url
-
-from . import views
-
-urlpatterns = [
-    url(r'^guitarists/(\w{1,50})/$', views.empty_view, name='guitarist_detail'),
-]
diff --git a/tests/model_permalink/views.py b/tests/model_permalink/views.py
deleted file mode 100644
index 50e23d1782..0000000000
--- a/tests/model_permalink/views.py
+++ /dev/null
@@ -1,5 +0,0 @@
-from django.http import HttpResponse
-
-
-def empty_view(request, *args, **kwargs):
-    return HttpResponse('')