From 597e03cd741b5c732317a5384185d70520a76cde Mon Sep 17 00:00:00 2001 From: Russell Keith-Magee Date: Sat, 14 Aug 2010 12:11:02 +0000 Subject: [PATCH] Fixed #14096 -- Corrected Python 2.4 syntax issue. Thanks to PaulM for the report. git-svn-id: http://code.djangoproject.com/svn/django/trunk@13579 bcc190cf-cafb-0310-a4f2-bffc1f526a37 --- django/contrib/sessions/tests.py | 36 ++++++++++++++++---------------- 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/django/contrib/sessions/tests.py b/django/contrib/sessions/tests.py index d958d4a778..e645b73817 100644 --- a/django/contrib/sessions/tests.py +++ b/django/contrib/sessions/tests.py @@ -207,32 +207,32 @@ class SessionTestsMixin(object): # Tests get_expire_at_browser_close with different settings and different # set_expiry calls try: - original_expire_at_browser_close = settings.SESSION_EXPIRE_AT_BROWSER_CLOSE - settings.SESSION_EXPIRE_AT_BROWSER_CLOSE = False + try: + original_expire_at_browser_close = settings.SESSION_EXPIRE_AT_BROWSER_CLOSE + settings.SESSION_EXPIRE_AT_BROWSER_CLOSE = False - self.session.set_expiry(10) - self.assertFalse(self.session.get_expire_at_browser_close()) + self.session.set_expiry(10) + self.assertFalse(self.session.get_expire_at_browser_close()) - self.session.set_expiry(0) - self.assertTrue(self.session.get_expire_at_browser_close()) + self.session.set_expiry(0) + self.assertTrue(self.session.get_expire_at_browser_close()) - self.session.set_expiry(None) - self.assertFalse(self.session.get_expire_at_browser_close()) + self.session.set_expiry(None) + self.assertFalse(self.session.get_expire_at_browser_close()) - settings.SESSION_EXPIRE_AT_BROWSER_CLOSE = True + settings.SESSION_EXPIRE_AT_BROWSER_CLOSE = True - self.session.set_expiry(10) - self.assertFalse(self.session.get_expire_at_browser_close()) + self.session.set_expiry(10) + self.assertFalse(self.session.get_expire_at_browser_close()) - self.session.set_expiry(0) - self.assertTrue(self.session.get_expire_at_browser_close()) + self.session.set_expiry(0) + self.assertTrue(self.session.get_expire_at_browser_close()) - self.session.set_expiry(None) - self.assertTrue(self.session.get_expire_at_browser_close()) - - except: - raise + self.session.set_expiry(None) + self.assertTrue(self.session.get_expire_at_browser_close()) + except: + raise finally: settings.SESSION_EXPIRE_AT_BROWSER_CLOSE = original_expire_at_browser_close