python-utils 4.2.0__py3-none-any.whl → 4.2.2__py3-none-any.whl

python_utils/import_.py

@@ -113,24 +113,44 @@ def import_global(  # noqa: C901
                 globals_ = frame.f_globals
 
         try:
-            # Relative imports are supported (from .spam import eggs)
+            # Relative imports are supported (from .spam import eggs). Each
+            # leading dot counts as one level, so ``..spam`` goes up two.
+            # An empty or dots-only name keeps the one-level path it had in
+            # 4.2.0, and with it the IndexError or ModuleNotFoundError.
+            multi_dot: bool = False
             if not name_parts[0]:
-                name_parts = name_parts[1:]
-                level = 1
-
-            # raise IOError((name, level))
-            module = __import__(
-                name=name_parts[0] or '.',
-                globals=globals_,
-                locals=locals_,
-                fromlist=name_parts[1:],
-                level=max(level, 0),
-            )
-
-            # Make sure we get the right part of a dotted import (i.e.
-            # spam.eggs should return eggs, not spam)
-            for attr in name_parts[1:]:
-                module = _get_attribute(module, attr, '.'.join(name_parts))
+                remainder: str = name.lstrip('.')
+                dots: int = len(name) - len(remainder)
+                if dots > 1 and remainder:
+                    multi_dot = True
+                    level = dots
+                    name_parts = remainder.split('.')
+                else:
+                    name_parts = name_parts[1:]
+                    level = 1
+
+            try:
+                module = __import__(
+                    name=name_parts[0] or '.',
+                    globals=globals_,
+                    locals=locals_,
+                    fromlist=name_parts[1:],
+                    level=max(level, 0),
+                )
+
+                # Make sure we get the right part of a dotted import (i.e.
+                # spam.eggs should return eggs, not spam)
+                for attr in name_parts[1:]:
+                    module = _get_attribute(module, attr, '.'.join(name_parts))
+            except ImportError as error:
+                # Every multi-dot name failed with ModuleNotFoundError in
+                # 4.2.0. Python raises a plain ImportError for some of them,
+                # such as going above the top-level package, which
+                # `except ModuleNotFoundError` misses. The subclass is
+                # caught by both.
+                if not multi_dot or isinstance(error, ModuleNotFoundError):
+                    raise
+                raise ModuleNotFoundError(str(error), name=name) from error
 
             # If no list of modules is given, autodetect from either __all__
             # or a dir() of the module

python_utils/time.py

@@ -110,6 +110,49 @@ def delta_to_seconds_or_none(
         return delta_to_seconds(interval)
 
 
+def _format_wall_clock(
+    timestamp: datetime.datetime, precision: datetime.timedelta
+) -> str | None:
+    """Truncate a naive datetime by exact arithmetic, None when it cannot.
+
+    Windows cannot convert pre-epoch naive dates to timestamps, and no
+    platform converts the datetime bounds. Wall-clock arithmetic relative
+    to the naive epoch handles both. Aware datetimes, subclasses (whose
+    own arithmetic and ``__str__`` may differ), precisions that are not a
+    usable timedelta and results outside the datetime range give None, so
+    the caller keeps the 4.2.1 outcome for them.
+    """
+    if (
+        type(timestamp) is not datetime.datetime
+        or timestamp.tzinfo is not None
+    ):
+        return None
+    try:
+        return str(timestamp - (timestamp - epoch) % precision)
+    except (ArithmeticError, TypeError, ValueError):
+        return None
+
+
+def _format_datetime(
+    timestamp: datetime.datetime, precision: datetime.timedelta
+) -> str:
+    """Format a datetime even outside the platform's timestamp range."""
+    try:
+        since_epoch = datetime.timedelta(seconds=timestamp.timestamp())
+        seconds = (since_epoch - since_epoch % precision).total_seconds()
+    except (OverflowError, OSError, ValueError):
+        # 4.2.1 raised here, which stays the answer without a wall clock.
+        wall_clock: str | None = _format_wall_clock(timestamp, precision)
+        if wall_clock is None:
+            raise
+        return wall_clock
+    try:
+        return str(datetime.datetime.fromtimestamp(seconds))
+    except (OverflowError, OSError, ValueError):
+        wall_clock = _format_wall_clock(timestamp, precision)
+        return str(datetime.datetime.max) if wall_clock is None else wall_clock
+
+
 def format_time(
     timestamp: _aliases.timestamp_type,
     precision: datetime.timedelta = datetime.timedelta(seconds=1),
@@ -124,6 +167,8 @@ def format_time(
     '0:00:01'
     >>> format_time(datetime.datetime(2000, 1, 2, 3, 4, 5, 6))
     '2000-01-02 03:04:05'
+    >>> format_time(datetime.datetime(1900, 1, 2, 3, 4, 5))
+    '1900-01-02 03:04:05'
     >>> format_time(datetime.date(2000, 1, 2))
     '2000-01-02'
     >>> format_time(datetime.timedelta(seconds=3661))
@@ -152,23 +197,8 @@ def format_time(
         # whole microseconds, which keeps the modulo exact. In float seconds
         # `1.0 % 0.1` is just under 0.1 and the result drops a whole step.
         return str(timestamp - timestamp % precision)
-    elif isinstance(timestamp, datetime.datetime):  # pragma: no cover
-        # Python 2 doesn't have the timestamp method
-        if hasattr(timestamp, 'timestamp'):
-            seconds = timestamp.timestamp()
-        else:
-            seconds = timedelta_to_seconds(timestamp - epoch)
-
-        # Truncate the number to the given precision, in whole microseconds
-        # for the same reason as above
-        since_epoch: datetime.timedelta = datetime.timedelta(seconds=seconds)
-        seconds = (since_epoch - since_epoch % precision).total_seconds()
-
-        try:  # pragma: no cover
-            dt = datetime.datetime.fromtimestamp(seconds)
-        except (ValueError, OSError):  # pragma: no cover
-            dt = datetime.datetime.max
-        return str(dt)
+    elif isinstance(timestamp, datetime.datetime):
+        return _format_datetime(timestamp, precision)
     elif isinstance(timestamp, datetime.date):
         return str(timestamp)
     elif timestamp is None:

{python_utils-4.2.0.dist-info → python_utils-4.2.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python-utils
-Version: 4.2.0
+Version: 4.2.2
 Summary: Python Utils is a module with some convenient utilities not included with the standard Python install
 Keywords: utils,utilities,helpers,typing,typed,async,lazy-imports
 Author: Rick van Hattem
@@ -37,6 +37,7 @@ Project-URL: Documentation, https://python-utils.readthedocs.io/
 Project-URL: Repository, https://github.com/WoLpH/python-utils
 Project-URL: Changelog, https://github.com/WoLpH/python-utils/releases
 Project-URL: Funding, https://github.com/sponsors/wolph
+Project-URL: Issues, https://github.com/wolph/python-utils/issues
 Provides-Extra: docs
 Provides-Extra: loguru
 Provides-Extra: tests

{python_utils-4.2.0.dist-info → python_utils-4.2.2.dist-info}/RECORD

@@ -8,14 +8,14 @@ python_utils/decorators.py,sha256=UyVuV7Phf8kjAt38uA-F9MFH2o8zM4t-fmlgt3KL5cc,82
 python_utils/exceptions.py,sha256=B5wljs3Id6eQ9eRaur-ZMPGGmhHNwh9F08Sfw6fuLX4,1230
 python_utils/formatters.py,sha256=rvbeP7H3h8Hll573PZkWsJPuHETjEHpWleb0tFck8MM,7031
 python_utils/generators.py,sha256=dw-x72fitGgdeqLS4_xyspS81ayqExvT77THHoZBA5I,8307
-python_utils/import_.py,sha256=xabWnas9OnFs7ks52D7yqpeKg8SvkBdHZIfTmuk5yJ8,6308
+python_utils/import_.py,sha256=pR7CwgAa2-vyMV3WWdfVx-n3IsEWzbbFWQ7TPZA4xc0,7434
 python_utils/logger.py,sha256=-QuF7Zfo7pxc4nTmAPc9Pm-oz5wsxXIX7NeCnYEPI6I,14043
 python_utils/loguru.py,sha256=qsap-aXByGXsd4KrYmtneTSUARVIdeVu9xgmrFPtqSI,2696
 python_utils/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 python_utils/terminal.py,sha256=GL3n2_rT98LBNmxy-amY-hezGKStCo-9_d_pR-TMgv8,6823
-python_utils/time.py,sha256=fZz00bpTeLXFFhbAo03LiMLWuzSJU4iPbyGSe7PYshU,16979
+python_utils/time.py,sha256=YjZAj8YDFfCRWqKKtCu0eeyMG0egdVRfsryeNbBnjdk,18137
 python_utils/types.py,sha256=VQLrKDRerOuhYxMhCaWWbUBnDXJhFx_G20gIfyolgug,4682
-python_utils-4.2.0.dist-info/licenses/LICENSE,sha256=_Zrs9NZu-G6_aZT2g3Jv5_JREJQfhRNBC61EH6WDH-o,1501
-python_utils-4.2.0.dist-info/WHEEL,sha256=MWx7psoF7KNST9G72pGtiBYuaXRXQXBk9pw5R6FzYko,80
-python_utils-4.2.0.dist-info/METADATA,sha256=b5rgvrejxzOa3qwhB3eernFS84IR-8IsYM2VBliBDqo,16039
-python_utils-4.2.0.dist-info/RECORD,,
+python_utils-4.2.2.dist-info/licenses/LICENSE,sha256=_Zrs9NZu-G6_aZT2g3Jv5_JREJQfhRNBC61EH6WDH-o,1501
+python_utils-4.2.2.dist-info/WHEEL,sha256=3OmCxFA0ffBIsX4x0o8CdfSvZAOvO3mzEG8U_z5TvV4,80
+python_utils-4.2.2.dist-info/METADATA,sha256=aM0GImOcrZLXPo25hDyAGT9A1hYSGaxZuokTFPNH9EU,16105
+python_utils-4.2.2.dist-info/RECORD,,

{python_utils-4.2.0.dist-info → python_utils-4.2.2.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: uv 0.13.7
+Generator: uv 0.13.8
 Root-Is-Purelib: true
 Tag: py3-none-any