dcicutils 8.16.3__tar.gz → 8.16.3.1b2__tar.gz

{dcicutils-8.16.3 → dcicutils-8.16.3.1b2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dcicutils
-Version: 8.16.3
+Version: 8.16.3.1b2
 Summary: Utility package for interacting with the 4DN Data Portal and other 4DN resources
 Home-page: https://github.com/4dn-dcic/utils
 License: MIT

{dcicutils-8.16.3 → dcicutils-8.16.3.1b2}/dcicutils/datetime_utils.py

@@ -53,7 +53,10 @@ def parse_datetime_string(value: str) -> Optional[datetime]:
     if tz_hours < 0 or tz_minutes < 0:
         tz_hours, tz_minutes = get_local_timezone_hours_minutes()
     try:
-        dt = datetime.strptime(value, "%Y-%m-%d %H:%M:%S")
+        try:
+            dt = datetime.strptime(value, "%Y-%m-%d %H:%M:%S")
+        except Exception:
+            dt = datetime.strptime(value, "%Y-%m-%d %H:%M:%S.%f")
         tz = timezone(timedelta(hours=tz_hours, minutes=tz_minutes))
         return dt.replace(tzinfo=tz)
     except Exception:
@@ -214,11 +217,12 @@ def format_datetime(value: datetime,
         if utc is True:
             tz = timezone.utc
         elif not isinstance(tz, timezone):
-            tz = get_local_timezone()
             if tz is True:
                 notz = False
+                tz = get_local_timezone()
             elif tz is False:
                 notz = True
+            tz = get_local_timezone()
         if noseconds is True:
             ms = False
         value = value.astimezone(tz)

{dcicutils-8.16.3 → dcicutils-8.16.3.1b2}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "dcicutils"
-version = "8.16.3"
+version = "8.16.3.1b2"  # TODO: To become 8.16.4
 description = "Utility package for interacting with the 4DN Data Portal and other 4DN resources"
 authors = ["4DN-DCIC Team <support@4dnucleome.org>"]
 license = "MIT"