Ticket #8713: test-client.diff

django/test/client.py

@@ -7 +7 @@
     from StringIO import StringIO
 
 from django.conf import settings
-from django.contrib.auth import authenticate, login
 from django.core.handlers.base import BaseHandler
 from django.core.handlers.wsgi import WSGIRequest
 from django.core.signals import got_request_exception
@@ -289 +288 @@
         Sets the Client to appear as if it has successfully logged into a site.
 
         Returns True if login is possible; False if the provided credentials
-        are incorrect, or the user is inactive, or if the sessions framework is
-        not available.
+        are incorrect, or the user is inactive, or if the sessions or auth
+        framework is not available.
         """
+        if 'django.contrib.auth' not in settings.INSTALLED_APPS \
+        or 'django.contrib.sessions' not in settings.INSTALLED_APPS:
+            return False
+        from django.contrib.auth import authenticate, login
         user = authenticate(**credentials)
-        if user and user.is_active \
-                and 'django.contrib.sessions' in settings.INSTALLED_APPS:
+        if user and user.is_active:
             engine = __import__(settings.SESSION_ENGINE, {}, {}, [''])
 
             # Create a fake request to store login details.