mapres 2.4.dev2__tar.gz → 2.4.dev4__tar.gz

{mapres-2.4.dev2/src/mapres.egg-info → mapres-2.4.dev4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mapres
-Version: 2.4.dev2
+Version: 2.4.dev4
 Summary: A powerfull mapping utility
 Author: iFamished
 License: MIT

{mapres-2.4.dev2 → mapres-2.4.dev4}/pyproject.toml

@@ -7,7 +7,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "mapres"
-version = "2.4-dev.2"
+version = "2.4-dev.4"
 description = "A powerfull mapping utility"
 readme = "README.md"
 requires-python = ">=3.9"

{mapres-2.4.dev2 → mapres-2.4.dev4}/src/mapres/datamap.py

@@ -39,7 +39,7 @@ def datamap(
     _cls = None,
     *,
     syntax: str = syntax.braces,
-    mode: bool | None = None,
+    mode: bool | str | None = None,
 ):
     '''@datamap decorator with optional values'''
     def wrap(cls):

{mapres-2.4.dev2 → mapres-2.4.dev4}/src/mapres/maps/time.py

@@ -1,35 +1,36 @@
-from datetime import datetime
+from datetime import datetime, timezone
 from zoneinfo import ZoneInfo
 from mapres.datamap import datamap, syntax
 
 
-@datamap(syntax=syntax.percents, mode='dynamic')
-class TimeMap:
-    # default timezone
+def safe_zoneinfo(tz: str):
     try:
-        _default_tz = ZoneInfo("America/Chicago")
+        return ZoneInfo(tz)
     except Exception:
-        from datetime import timezone
-        _default_tz = timezone.utc
-
-    # dynamic fields
-    hh: str = None
-    h: str = None
-    h12: str = None
-    hh12: str = None
-    ampm: str = None
-    mm: str = None
-    m: str = None
-    ss: str = None
-    s: str = None
-    ms: str = None
-    YYYY: str = None
-    MM: str = None
-    DD: str = None
-    weekday: str = None
+        return timezone.utc
+
+
+@datamap(syntax=syntax.percents, mode='dynamic')
+class TimeMap:
+    _default_tz = safe_zoneinfo("America/Chicago")
+
+    hh: str | None = None
+    h: str | None = None
+    h12: str | None = None
+    hh12: str | None = None
+    ampm: str | None = None
+    mm: str | None = None
+    m: str | None = None
+    ss: str | None = None
+    s: str | None = None
+    ms: str | None = None
+    YYYY: str | None = None
+    MM: str | None = None
+    DD: str | None = None
+    weekday: str | None = None
 
     def __init__(self, tz: str | None = None):
-        self.TZ = ZoneInfo(tz) if tz else self._default_tz
+        self.TZ = safe_zoneinfo(tz) if tz else self._default_tz
 
     @property
     def providers(self):

{mapres-2.4.dev2 → mapres-2.4.dev4/src/mapres.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mapres
-Version: 2.4.dev2
+Version: 2.4.dev4
 Summary: A powerfull mapping utility
 Author: iFamished
 License: MIT