Add support for tz_aware MongoClient

flask_session/__init__.py

@@ -75,6 +75,7 @@ def _get_interface(self, app):
         config.setdefault('SESSION_MONGODB', None)
         config.setdefault('SESSION_MONGODB_DB', 'flask_session')
         config.setdefault('SESSION_MONGODB_COLLECT', 'sessions')
+        config.setdefault('SESSION_MONGODB_TZ_AWARE', False)
         config.setdefault('SESSION_SQLALCHEMY', None)
         config.setdefault('SESSION_SQLALCHEMY_TABLE', 'sessions')
 
@@ -96,7 +97,7 @@ def _get_interface(self, app):
                 config['SESSION_MONGODB'], config['SESSION_MONGODB_DB'],
                 config['SESSION_MONGODB_COLLECT'],
                 config['SESSION_KEY_PREFIX'], config['SESSION_USE_SIGNER'],
-                config['SESSION_PERMANENT'])
+                config['SESSION_PERMANENT'], config['SESSION_MONGODB_TZ_AWARE'])
         elif config['SESSION_TYPE'] == 'sqlalchemy':
             session_interface = SqlAlchemySessionInterface(
                 app, config['SESSION_SQLALCHEMY'],

flask_session/sessions.py

@@ -9,6 +9,7 @@
     :license: BSD, see LICENSE for more details.
 """
 import sys
+import pytz
 import time
 from datetime import datetime
 from uuid import uuid4
@@ -374,21 +375,26 @@ class MongoDBSessionInterface(SessionInterface):
     :param key_prefix: A prefix that is added to all MongoDB store keys.
     :param use_signer: Whether to sign the session id cookie or not.
     :param permanent: Whether to use permanent session or not.
+    :param tz_aware: Whether to use tz_aware MongoClient or not.
     """
 
     serializer = pickle
     session_class = MongoDBSession
 
     def __init__(self, client, db, collection, key_prefix, use_signer=False,
-                 permanent=True):
+                 permanent=True, tz_aware=False):
         if client is None:
             from pymongo import MongoClient
-            client = MongoClient()
+            if tz_aware:
+                client = MongoClient(tz_aware=tz_aware)
+            else:
+                client = MongoClient()
         self.client = client
         self.store = client[db][collection]
         self.key_prefix = key_prefix
         self.use_signer = use_signer
         self.permanent = permanent
+        self.tz_aware = tz_aware
 
     def open_session(self, app, request):
         sid = request.cookies.get(app.session_cookie_name)
@@ -408,7 +414,14 @@ def open_session(self, app, request):
 
         store_id = self.key_prefix + sid
         document = self.store.find_one({'id': store_id})
-        if document and document.get('expiration') <= datetime.utcnow():
+
+        # Workaround for tz_aware MongoClient
+        if self.tz_aware:
+            utc_now = datetime.utcnow().replace(tzinfo=pytz.UTC)
+        else:
+            utc_now = datetime.utcnow()
+
+        if document and document.get('expiration') <= utc_now:
             # Delete expired session
             self.store.remove({'id': store_id})
             document = None

setup.py

@@ -29,7 +29,8 @@
     include_package_data=True,
     platforms='any',
     install_requires=[
-        'Flask>=0.8'
+        'Flask>=0.8',
+        'pytz'
     ],
     test_suite='test_session',
     classifiers=[