navigator-session 0.6.1__py3-none-any.whl → 0.6.4__py3-none-any.whl

navigator_session/data.py

@@ -1,9 +1,8 @@
 import uuid
 import time
 from typing import Union, Optional, Any
-from datetime import datetime
+from datetime import datetime, timezone
 from collections.abc import Iterator, Mapping, MutableMapping
-import pendulum
 import jsonpickle
 from jsonpickle.unpickler import loadclass
 from aiohttp import web
@@ -25,11 +24,7 @@ class ModelHandler(jsonpickle.handlers.BaseHandler):
     def restore(self, obj):
         module_and_type = obj['py/object']
         mdl = loadclass(module_and_type)
-        if hasattr(mdl, '__new__'):
-            cls = mdl.__new__(mdl)
-        else:
-            cls = object.__new__(mdl)
-
+        cls = mdl.__new__(mdl) if hasattr(mdl, '__new__') else object.__new__(mdl)
         cls.__dict__ = self.context.restore(obj['__dict__'], reset=False)
         return cls
 
@@ -53,33 +48,29 @@ class SessionData(MutableMapping[str, Any]):
         self._changed = False
         self._data = {}
         # Unique ID:
-        self._id_ = data.get(SESSION_ID, None) if data else id
-        if not self._id_:
-            self._id_ = uuid.uuid4().hex
+        self._id_ = (data.get(SESSION_ID, None) if data else id) or uuid.uuid4().hex
         # Session Identity
-        self._identity = data.get(SESSION_KEY, None) if data else identity
-        if not self._identity:
-            self._identity = self._id_
+        self._identity = (
+            data.get(SESSION_KEY, None) if data else identity
+        ) or self._id_
         self._new = new if data != {} else True
-        self._max_age = max_age if max_age else None
+        self._max_age = max_age or None
         created = data.get('created', None) if data else None
-        self._now = pendulum.now('UTC')  # time for this instance creation
+        self._now = datetime.now(timezone.utc)
         self.__created__ = self._now
-        now = int(self._now.int_timestamp)
+        now = int(self._now.timestamp())
         self._now = now  # time for this instance creation
         age = now - created if created else now
         if max_age is not None and age > max_age:
             data = None
-        if self._new or created is None:
-            self._created = now
-        else:
-            self._created = created
+        self._created = now if self._new or created is None else created
         ## Data updating.
         if data is not None:
             self._data.update(data)
         # Other mark timestamp for this session:
-        dt = pendulum.now('UTC')
-        self._dow = dt.day_of_week
+        dt = datetime.now(timezone.utc)
+        self._dow = dt.weekday()
+        self._doy = dt.timetuple().tm_yday
         self._time = dt.time()
         self.args = args
 

navigator_session/version.py

@@ -1,11 +1,13 @@
 """Navigator Session Meta information.
    Navigator Session allows us to store user-specific data into session object.
 """
-
 __title__ = 'navigator_session'
-__description__ = ('Navigator Session allows us to store user-specific data '
-                   'into session object.')
-__version__ = '0.6.1'
+__description__ = (
+   'Navigator Session allows us to store user-specific data '
+   'into session object.'
+)
+__version__ = '0.6.4'
+__copyright__ = 'Copyright (c) 2023 Jesus Lara'
 __author__ = 'Jesus Lara'
 __author_email__ = 'jesuslarag@gmail.com'
 __license__ = 'Apache-2.0'

{navigator_session-0.6.1.dist-info → navigator_session-0.6.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: navigator-session
-Version: 0.6.1
+Version: 0.6.4
 Summary: Navigator Session allows us to store user-specific data into session object.
 Home-page: https://github.com/phenobarbital/navigator-session
 Author: Jesus Lara
@@ -24,11 +24,10 @@ Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Framework :: AsyncIO
 Classifier: Framework :: aiohttp
-Requires-Python: >=3.9.16
+Requires-Python: >=3.9.13
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: aiohttp>=3.9.5
-Requires-Dist: uvloop==0.20.0
 Requires-Dist: asyncio==3.4.3
 Requires-Dist: jsonpickle>=3.0.2
 Requires-Dist: redis>=5.0.4

{navigator_session-0.6.1.dist-info → navigator_session-0.6.4.dist-info}/RECORD

@@ -1,15 +1,15 @@
 navigator_session/__init__.py,sha256=U1MtM30ccs5N6c_lzUYFRS5NURz6kheDC8jZmRL_2yc,3056
 navigator_session/conf.py,sha256=Pe8qsukmt5cXXPc3hwFphSWF5xCIpZfeFQ8JhICEnow,1695
-navigator_session/data.py,sha256=9bNj_tBGvyqOpcYP8MSKt--5DG5TlTIrYwbQYK7cfAM,6037
+navigator_session/data.py,sha256=z4OULrvzA7Y8x25O7AQBXJ5dywJKxjgkiWGFj6MhKBA,5867
 navigator_session/middleware.py,sha256=_bQKfD81BxNZTGuyGTc4yh7y1Rb95I-y2hM1ihE4wCk,1944
 navigator_session/session.py,sha256=CG-TjsmQqjuk6N7GCYNgQTCkrXptgq-swHDiemgHmKI,2398
-navigator_session/version.py,sha256=bLAeol-M_2wgKYBII2KhUeoKwGiyUbWzbTUsd9cghpk,394
+navigator_session/version.py,sha256=93b9k4RHPyeN6xUHoCLHLvSUScFlozKK7sRLHFiQO6M,430
 navigator_session/storages/__init__.py,sha256=kTcHfqps5LmnDpFAktxevPuSIwRbnrcMmB7Uygq4axQ,34
 navigator_session/storages/abstract.py,sha256=wTv0yWMVXTwrzA_bjexcwI7c6_W3tzosXlMOIZIQrBM,6503
 navigator_session/storages/cookie.py,sha256=VILzVCatKlDhMoQDoE2y0u6s7lp4wbdep5Oc0NfIJcg,2474
 navigator_session/storages/redis.py,sha256=W-3I_hpabDToLOl7nVrIupV3Taf_IQUO_t8BP6EscYk,11506
-navigator_session-0.6.1.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-navigator_session-0.6.1.dist-info/METADATA,sha256=It6PEyQL6vLklsGQsMRCtxYhC7-Ls9fyBHqbckasW5s,2332
-navigator_session-0.6.1.dist-info/WHEEL,sha256=UvcQYKBHoFqaQd6LKyqHw9fxEolWLQnlzP0h_LgJAfI,91
-navigator_session-0.6.1.dist-info/top_level.txt,sha256=ZpOEy3wLKGsxG2rc0nHqcqJCV3HIOG_XCfE6mtsYYYY,18
-navigator_session-0.6.1.dist-info/RECORD,,
+navigator_session-0.6.4.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+navigator_session-0.6.4.dist-info/METADATA,sha256=ZSGBdgOw9hxNvg_CD6qUAeM-RDlXv_P671ONTSSnbZw,2302
+navigator_session-0.6.4.dist-info/WHEEL,sha256=UvcQYKBHoFqaQd6LKyqHw9fxEolWLQnlzP0h_LgJAfI,91
+navigator_session-0.6.4.dist-info/top_level.txt,sha256=ZpOEy3wLKGsxG2rc0nHqcqJCV3HIOG_XCfE6mtsYYYY,18
+navigator_session-0.6.4.dist-info/RECORD,,