summaryrefslogtreecommitdiff
path: root/django
diff options
context:
space:
mode:
authorTim Graham <timograham@gmail.com>2015-01-18 13:36:32 -0500
committerTim Graham <timograham@gmail.com>2015-01-18 13:36:32 -0500
commit4548a282a1c64bb2ed414da3d08617d869cd3740 (patch)
tree5299b9257fe7521758932ab9aab366b9d476e7bf /django
parentba27f895878bb155fefb8c1b9beee2c9f3d85b3f (diff)
Removed contrib.sites.models.RequestSite/get_current_site() aliases.
Per deprecation timeline; refs #21680.
Diffstat (limited to 'django')
-rw-r--r--django/contrib/sites/models.py20
1 files changed, 0 insertions, 20 deletions
diff --git a/django/contrib/sites/models.py b/django/contrib/sites/models.py
index 96b89011b0..440cfb8b11 100644
--- a/django/contrib/sites/models.py
+++ b/django/contrib/sites/models.py
@@ -1,18 +1,13 @@
from __future__ import unicode_literals
import string
-import warnings
from django.core.exceptions import ImproperlyConfigured, ValidationError
from django.db import models
from django.db.models.signals import pre_save, pre_delete
-from django.utils.deprecation import RemovedInDjango19Warning
from django.utils.encoding import python_2_unicode_compatible
from django.utils.translation import ugettext_lazy as _
-from .requests import RequestSite as RealRequestSite
-from .shortcuts import get_current_site as real_get_current_site
-
SITE_CACHE = {}
@@ -93,21 +88,6 @@ class Site(models.Model):
return self.domain
-class RequestSite(RealRequestSite):
- def __init__(self, *args, **kwargs):
- warnings.warn(
- "Please import RequestSite from django.contrib.sites.requests.",
- RemovedInDjango19Warning, stacklevel=2)
- super(RequestSite, self).__init__(*args, **kwargs)
-
-
-def get_current_site(request):
- warnings.warn(
- "Please import get_current_site from django.contrib.sites.shortcuts.",
- RemovedInDjango19Warning, stacklevel=2)
- return real_get_current_site(request)
-
-
def clear_site_cache(sender, **kwargs):
"""
Clears the cache (if primed) each time a site is saved or deleted