mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-10-26 23:26:08 +00:00
Code Issues 32 Releases Wiki Activity

Reverted r16386 because it replaced a brittle method with another not less

Browse Source 
arbitrary method when the test client checks for the presence of the bundled
session backends+session middleware combination.

We will revisit the issue soon, probably to make these checks even less strict.

Refs #7836, #16605

git-svn-id: http://code.djangoproject.com/svn/django/trunk@17739 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Ramiro Morales
2012-03-15 02:46:07 +00:00
parent a673ec80e2
commit a935e83443
2 changed files with 3 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
django/test/client.py
View File

@@ -350,7 +350,7 @@ class Client(RequestFactory):
"""
Obtains the current session variables.
"""
if 'django.contrib.sessions.middleware.SessionMiddleware' in settings.MIDDLEWARE_CLASSES:
if 'django.contrib.sessions' in settings.INSTALLED_APPS:
engine = import_module(settings.SESSION_ENGINE)
cookie = self.cookies.get(settings.SESSION_COOKIE_NAME, None)
if cookie:
@@ -498,7 +498,7 @@ class Client(RequestFactory):
"""
user = authenticate(**credentials)
if user and user.is_active \
and 'django.contrib.sessions.middleware.SessionMiddleware' in settings.MIDDLEWARE_CLASSES:
and 'django.contrib.sessions' in settings.INSTALLED_APPS:
engine = import_module(settings.SESSION_ENGINE)
# Create a fake request to store login details.