Commit 9ffab9ce authored by Aymeric Augustin's avatar Aymeric Augustin
Browse files

Moved RequestSite and get_current_site. 

Following the app-loading refactor, these objects must live outside of
django.contrib.sites.models because they must be available without
importing the django.contrib.sites.models module when
django.contrib.sites isn't installed.

Refs #21680. Thanks Carl and Loic for reporting this issue.
parent ca95f8e4

django/contrib/auth/forms.py

+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ from django.contrib.auth import authenticate, get_user_model 
from django.contrib.auth.models import User

from django.contrib.auth.hashers import UNUSABLE_PASSWORD_PREFIX, identify_hasher

from django.contrib.auth.tokens import default_token_generator

from django.contrib.sites.models import get_current_site

from django.contrib.sites.shortcuts import get_current_site





UNMASKED_DIGITS_TO_SHOW = 6

django/contrib/auth/tests/test_views.py

+2 −1
Original line number Diff line number Diff line
@@ -4,7 +4,8 @@ import os 
import re



from django.conf import global_settings, settings

from django.contrib.sites.models import Site, RequestSite

from django.contrib.sites.models import Site

from django.contrib.sites.requests import RequestSite

from django.contrib.admin.models import LogEntry

from django.contrib.auth.models import User

from django.core import mail

django/contrib/auth/views.py

+1 −1
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ from django.contrib.auth import REDIRECT_FIELD_NAME, login as auth_login, logout 
from django.contrib.auth.decorators import login_required

from django.contrib.auth.forms import AuthenticationForm, PasswordResetForm, SetPasswordForm, PasswordChangeForm

from django.contrib.auth.tokens import default_token_generator

from django.contrib.sites.models import get_current_site

from django.contrib.sites.shortcuts import get_current_site





@sensitive_post_parameters()

django/contrib/comments/feeds.py

+1 −1
Original line number Diff line number Diff line 
from django.contrib.syndication.views import Feed

from django.contrib.sites.models import get_current_site

from django.contrib.sites.shortcuts import get_current_site

from django.contrib import comments

from django.utils.translation import ugettext as _

django/contrib/comments/moderation.py

+1 −1
Original line number Diff line number Diff line
@@ -62,7 +62,7 @@ from django.contrib.comments import signals 
from django.db.models.base import ModelBase

from django.template import Context, loader

from django.contrib import comments

from django.contrib.sites.models import get_current_site

from django.contrib.sites.shortcuts import get_current_site

from django.utils import timezone



class AlreadyModerated(Exception):