mirror of https://github.com/django/django.git
Cleaned up a couple of mistakes (a handful of bugs in the test client) that I missed in [6333].
git-svn-id: http://code.djangoproject.com/svn/django/trunk@6338 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
parent
bcf7e9a9fe
commit
c3a489d817
|
@ -133,7 +133,7 @@ class Client:
|
||||||
engine = __import__(settings.SESSION_ENGINE, {}, {}, [''])
|
engine = __import__(settings.SESSION_ENGINE, {}, {}, [''])
|
||||||
cookie = self.cookies.get(settings.SESSION_COOKIE_NAME, None)
|
cookie = self.cookies.get(settings.SESSION_COOKIE_NAME, None)
|
||||||
if cookie:
|
if cookie:
|
||||||
return engine.SessionClass(cookie.value)
|
return engine.SessionStore(cookie.value)
|
||||||
return {}
|
return {}
|
||||||
session = property(_session)
|
session = property(_session)
|
||||||
|
|
||||||
|
@ -250,7 +250,7 @@ class Client:
|
||||||
|
|
||||||
# Create a fake request to store login details
|
# Create a fake request to store login details
|
||||||
request = HttpRequest()
|
request = HttpRequest()
|
||||||
request.session = engine.SessionClass()
|
request.session = engine.SessionStore()
|
||||||
login(request, user)
|
login(request, user)
|
||||||
|
|
||||||
# Set the cookie to represent the session
|
# Set the cookie to represent the session
|
||||||
|
@ -273,9 +273,6 @@ class Client:
|
||||||
|
|
||||||
Causes the authenticated user to be logged out.
|
Causes the authenticated user to be logged out.
|
||||||
"""
|
"""
|
||||||
try:
|
session = __import__(settings.SESSION_ENGINE, {}, {}, ['']).SessionStore()
|
||||||
Session.objects.get(session_key=self.cookies['sessionid'].value).delete()
|
session.delete(session_key=self.cookies['sessionid'].value)
|
||||||
except KeyError:
|
|
||||||
pass
|
|
||||||
|
|
||||||
self.cookies = SimpleCookie()
|
self.cookies = SimpleCookie()
|
||||||
|
|
Loading…
Reference in New Issue