CookieSession.save() should update expiration

Author: amol-

beaker/session.py

@@ -16,7 +16,7 @@
 weekdays = ("Mon", "Tue", "Wed", "Thu", "Fri", "Sat", "Sun")
 
 
-__all__ = ['SignedCookie', 'Session', 'InvalidSignature']
+__all__ = ['SignedCookie', 'Session', 'CookieSession', 'InvalidSignature']
 
 
 class _InvalidSignatureType(object):
@@ -697,11 +697,6 @@ def save(self, accessed_only=False):
             self.update(self.accessed_dict)
         self._create_cookie()
 
-    def expire(self):
-        """Delete the 'expires' attribute on this Session, if any."""
-
-        self.pop('_expires', None)
-
     def _create_cookie(self):
         if '_creation_time' not in self:
             self['_creation_time'] = time.time()
@@ -715,14 +710,7 @@ def _create_cookie(self):
 
         self.cookie[self.key] = val
 
-        if '_expires' in self:
-            expires = self['_expires']
-        else:
-            expires = None
-        expires = self._set_cookie_expires(expires)
-        if expires is not None:
-            self['_expires'] = expires
-
+        self._set_cookie_expires(None)
         if self.domain:
             self.cookie[self.key]['domain'] = self.domain
         if self.secure:

beaker/util.py

@@ -462,23 +462,11 @@ def dumps(self, data):
 
 
 class JsonSerializer(object):
-    DATETIME_PREFIX = "$DATETIME$"
-    DATETIME_FORMAT = "%Y-%m-%dT%H:%M:%S"
-
     def loads(self, data_string):
-        loaded_data = json.loads(zlib.decompress(data_string).decode('utf-8'))
-        for k, v in loaded_data.items():
-            if isinstance(v, str) and v.startswith(self.DATETIME_PREFIX):
-                v = v[len(self.DATETIME_PREFIX):]
-                loaded_data[k] = datetime.strptime(v, self.DATETIME_FORMAT)
-        return loaded_data
+        return json.loads(zlib.decompress(data_string).decode('utf-8'))
 
     def dumps(self, data):
-        dumpable_data = data.copy()
-        for k, v in dumpable_data.items():
-            if isinstance(v, datetime):
-                dumpable_data[k] = self.DATETIME_PREFIX + v.strftime(self.DATETIME_FORMAT)
-        return zlib.compress(json.dumps(dumpable_data).encode('utf-8'))
+        return zlib.compress(json.dumps(data).encode('utf-8'))
 
 
 def serialize(data, method):

tests/test_cookie_expires.py

@@ -101,5 +101,19 @@ def test_cookiesession_expires_values():
             {},
             **options,
         )
+        # Check the cookie has expire
+        #   True = expire when browser is closed, so no Expire=
         cookie_session.save()
-        cookie_session.save()
+        if cookie_expires != True:
+            assert "expires" in cookie_session.cookie.output()
+
+        # Check we can save it again.
+        cookie_session.save()
+        if cookie_expires != True:
+            assert "expires" in cookie_session.cookie.output()
+
+        # Check we can load it back.
+        loaded_back = CookieSession({"cookie": cookie_session.cookie}, **options)
+        loaded_back.save()
+        if cookie_expires != True:
+            assert "expires" in cookie_session.cookie.output()