vortexpy 4.0.16__tar.gz → 4.0.19__tar.gz

{vortexpy-4.0.16 → vortexpy-4.0.19}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: vortexpy
-Version: 4.0.16
+Version: 4.0.19
 Summary: Synertys observable, routable, data serialisation and transport code.
 Author-email: Synerty <contact@synerty.com>
 Project-URL: Homepage, https://github.com/Synerty/vortexpy

{vortexpy-4.0.16 → vortexpy-4.0.19}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "vortexpy"
-version = "4.0.16"
+version = "4.0.19"
 authors = [{name = "Synerty", email = "contact@synerty.com"}]
 description = "Synertys observable, routable, data serialisation and transport code."
 keywords = [

{vortexpy-4.0.16 → vortexpy-4.0.19}/vortex/SerialiseUtil.py

@@ -6,12 +6,14 @@
  * Website : http://www.synerty.com
  * Support : support@synerty.com
 """
+
 import decimal
 import logging
 from base64 import b64encode, b64decode
 from collections import defaultdict
 from datetime import datetime, date
 
+import pytz
 from sqlalchemy.orm.collections import InstrumentedList
 
 logger = logging.getLogger(__name__)
@@ -59,6 +61,9 @@ V_TRUE = "1"
 V_FALSE = "0"
 
 ISO8601_ORA = "YYYY-MM-DD HH24:MI:SS.FF6"
+
+# This will print a date using TO_CHAR(), in the format fromStr() below expects
+ISO8601_ORA_WITH_TZ = "YYYY-MM-DD HH24:MI:SS.FF6TZHTZM"
 ISO8601 = "%Y-%m-%d %H:%M:%S.%f%z"
 ISO8601_JS_REGEXP = r"^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}\.\d{3}[Z]{1}"
 ISO8601_JS_FORMAT = "%Y-%m-%dT%H:%M:%S.%fZ"
@@ -210,11 +215,16 @@ def fromStr(val: str, typeName: str):
     if typeName == T_DATETIME:
         # TODO: Check with ISO8601_JS_REGEXP
         if len(val) == len("2017-06-06T09:40:37.097Z"):
-            return datetime.strptime(val, ISO8601_JS_FORMAT)
+            return datetime.strptime(val, ISO8601_JS_FORMAT).replace(
+                tzinfo=pytz.UTC
+            )
 
         if len(val) <= len("2017-06-06 09:40:37.097068"):
-            logger.warning("Parsing date time with no timezone: %s", val)
-            return datetime.strptime(val, ISO8601_NOTZ)
+            logger.warning(
+                "Parsing date time with no timezone: %s Setting TZ to UTC",
+                val,
+            )
+            return datetime.strptime(val, ISO8601_NOTZ).replace(tzinfo=pytz.UTC)
 
         return datetime.strptime(val, ISO8601)
 

{vortexpy-4.0.16 → vortexpy-4.0.19}/vortex/__init__.py

@@ -7,4 +7,4 @@
  * Support : support@synerty.com
 """
 
-__version__ = '4.0.16'
+__version__ = '4.0.19'

{vortexpy-4.0.16 → vortexpy-4.0.19}/vortexpy.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: vortexpy
-Version: 4.0.16
+Version: 4.0.19
 Summary: Synertys observable, routable, data serialisation and transport code.
 Author-email: Synerty <contact@synerty.com>
 Project-URL: Homepage, https://github.com/Synerty/vortexpy