Support naive datetimes in json encoder

Author: amol-

beaker/util.py

@@ -462,11 +462,23 @@ def dumps(self, data):
 
 
 class JsonSerializer(object):
+    DATETIME_PREFIX = "$DATETIME$"
+    DATETIME_FORMAT = "%Y-%m-%dT%H:%M:%S"
+
     def loads(self, data_string):
-        return json.loads(zlib.decompress(data_string).decode('utf-8'))
+        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
 
     def dumps(self, data):
-        return zlib.compress(json.dumps(data).encode('utf-8'))
+        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'))
 
 
 def serialize(data, method):

setup.py

@@ -51,7 +51,7 @@
         import sqlite3
     except ImportError:
         TESTS_REQUIRE.append('pysqlite')
-    TESTS_REQUIRE.extend(['pylibmc', 'python-memcached'])
+    TESTS_REQUIRE.extend(['python-memcached'])
 
 
 setup(name='Beaker',

tests/test_cookie_expires.py

@@ -1,5 +1,5 @@
 from beaker.middleware import SessionMiddleware
-from beaker.session import Session
+from beaker.session import Session, CookieSession
 import datetime
 import re
 
@@ -75,3 +75,31 @@ def test_set_cookie_expires():
     assert cookie_expiration(session) is False
     session._set_cookie_expires(True)
     assert cookie_expiration(session) is True
+
+def test_cookiesession_expires_values():
+    BASE_OPTIONS = {
+        'invalidate_corrupt': True,
+        'type': 'cookie',
+        'data_dir': None,
+        'key': 'ckan',
+        'timeout': None,
+        'save_accessed_time': True,
+        'secret': '12341234',
+        'log_file': None,
+        'data_serializer': 'json',
+        'validate_key': 'asdfasdf',
+        'httponly': True,
+        'secure': False,
+        'samesite': 'Strict',
+        'auto': False,
+        'cookie_domain': None
+    }
+
+    for cookie_expires in (True, False, datetime.timedelta(seconds=10)):
+        options = dict(BASE_OPTIONS, cookie_expires=cookie_expires)
+        cookie_session = CookieSession(
+            {},
+            **options,
+        )
+        cookie_session.save()
+        cookie_session.save()