diff --git a/django/conf/urls/shortcut.py b/django/conf/urls/shortcut.py deleted file mode 100644 index 827c56dde4..0000000000 --- a/django/conf/urls/shortcut.py +++ /dev/null @@ -1,11 +0,0 @@ -import warnings - -from django.conf.urls import patterns -from django.utils.deprecation import RemovedInDjango18Warning - -warnings.warn("django.conf.urls.shortcut will be removed in Django 1.8.", - RemovedInDjango18Warning) - -urlpatterns = patterns('django.views', - (r'^(?P\d+)/(?P.*)/$', 'defaults.shortcut'), -) diff --git a/django/views/defaults.py b/django/views/defaults.py index 77e09185eb..c33284e756 100644 --- a/django/views/defaults.py +++ b/django/views/defaults.py @@ -1,9 +1,6 @@ -import warnings - from django import http from django.template import (Context, RequestContext, loader, Template, TemplateDoesNotExist) -from django.utils.deprecation import RemovedInDjango18Warning from django.views.decorators.csrf import requires_csrf_token @@ -81,12 +78,3 @@ def permission_denied(request, template_name='403.html'): except TemplateDoesNotExist: return http.HttpResponseForbidden('

403 Forbidden

', content_type='text/html') return http.HttpResponseForbidden(template.render(RequestContext(request))) - - -def shortcut(request, content_type_id, object_id): - warnings.warn( - "django.views.defaults.shortcut will be removed in Django 1.8. " - "Import it from django.contrib.contenttypes.views instead.", - RemovedInDjango18Warning, stacklevel=2) - from django.contrib.contenttypes.views import shortcut as real_shortcut - return real_shortcut(request, content_type_id, object_id)