Author: russellm
Date: 2010-08-14 07:11:02 -0500 (Sat, 14 Aug 2010)
New Revision: 13579

Modified:
   django/trunk/django/contrib/sessions/tests.py
Log:
Fixed #14096 -- Corrected Python 2.4 syntax issue. Thanks to PaulM for the 
report.

Modified: django/trunk/django/contrib/sessions/tests.py
===================================================================
--- django/trunk/django/contrib/sessions/tests.py       2010-08-14 12:07:25 UTC 
(rev 13578)
+++ django/trunk/django/contrib/sessions/tests.py       2010-08-14 12:11:02 UTC 
(rev 13579)
@@ -207,32 +207,32 @@
         # 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())
+                self.session.set_expiry(None)
+                self.assertTrue(self.session.get_expire_at_browser_close())
 
-        except:
-            raise
-
+            except:
+                raise
         finally:
             settings.SESSION_EXPIRE_AT_BROWSER_CLOSE = 
original_expire_at_browser_close
 

-- 
You received this message because you are subscribed to the Google Groups 
"Django updates" group.
To post to this group, send email to django-upda...@googlegroups.com.
To unsubscribe from this group, send email to 
django-updates+unsubscr...@googlegroups.com.
For more options, visit this group at 
http://groups.google.com/group/django-updates?hl=en.

Reply via email to