dycw-utilities 0.129.3__tar.gz → 0.129.5__tar.gz

{dycw_utilities-0.129.3 → dycw_utilities-0.129.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dycw-utilities
-Version: 0.129.3
+Version: 0.129.5
 Author-email: Derek Wan <d.wan@icloud.com>
 License-File: LICENSE
 Requires-Python: >=3.12

{dycw_utilities-0.129.3 → dycw_utilities-0.129.5}/pyproject.toml

@@ -94,7 +94,7 @@ dependencies = [
 name = "dycw-utilities"
 readme = "README.md"
 requires-python = ">= 3.12"
-version = "0.129.3"
+version = "0.129.5"
 
 [project.optional-dependencies]
 test = [
@@ -334,7 +334,7 @@ zzz-test-zoneinfo = [
 # bump-my-version
 [tool.bumpversion]
 allow_dirty = true
-current_version = "0.129.3"
+current_version = "0.129.5"
 
 [[tool.bumpversion.files]]
 filename = "src/utilities/__init__.py"

{dycw_utilities-0.129.3 → dycw_utilities-0.129.5}/src/tests/test_logging.py

@@ -421,19 +421,6 @@ class TestSetupLogging:
         expected = "int: 1, float: 12.35"
         assert record.message == expected
 
-    @skipif_windows
-    def test_new_brace_formatting(
-        self, *, tmp_path: Path, caplog: LogCaptureFixture
-    ) -> None:
-        name = str(tmp_path)
-        setup_logging(logger=name, files_dir=tmp_path)
-        logger = getLogger(name)
-        logger.info("int: {:d}, float: {:.2f}, percent: {:.2%}", 1, 12.3456, 0.123456)
-        record = one(caplog.records)
-        assert isinstance(record, _AdvancedLogRecord)
-        expected = "int: 1, float: 12.35, percent: 12.35%"
-        assert record.message == expected
-
     @skipif_windows
     def test_no_console(self, *, tmp_path: Path) -> None:
         name = str(tmp_path)
@@ -507,66 +494,55 @@ class TestSizeAndTimeRotatingFileHandler:
                 filename=tmp_path.joinpath("log.txt"), maxBytes=100, backupCount=3
             )
         )
-
-        for i in range(1, 3):
-            logger.warning("message %d", i)
-            files = list(tmp_path.iterdir())
-            assert len(files) == 1
-            assert any(p for p in files if search(r"^log\.txt$", p.name))
-
-        logger.warning(10 * "message 3")
-        files = list(tmp_path.iterdir())
-        assert len(files) == 2
-        assert any(p for p in files if search(r"^log\.txt$", p.name))
-        assert any(p for p in files if search(r"^log\.1__[\dT]+\.txt$", p.name))
-
-        for i in range(4, 6):
-            logger.warning("message %d", i)
-            files = list(tmp_path.iterdir())
-            assert len(files) == 3
-            assert any(p for p in files if search(r"^log\.txt$", p.name))
-            assert any(
-                p for p in files if search(r"^log\.1__[\dT]+__[\dT]+\.txt$", p.name)
-            )
-            assert any(p for p in files if search(r"^log\.2__[\dT]+\.txt$", p.name))
-
-        logger.warning(10 * "message 6")
-        files = list(tmp_path.iterdir())
-        assert len(files) == 4
-        assert any(p for p in files if search(r"^log\.txt$", p.name))
-        assert any(p for p in files if search(r"^log\.1__[\dT]+__[\dT]+\.txt$", p.name))
-        assert any(p for p in files if search(r"^log\.2__[\dT]+__[\dT]+\.txt$", p.name))
-        assert any(p for p in files if search(r"^log\.3__[\dT]+\.txt$", p.name))
-
-        for _ in range(2):
-            for i in range(7, 9):
-                logger.warning("message %d", i)
+        for cycle in range(1, 10):
+            for i in range(1, 4):
+                logger.warning("%s message %d", 100 * "long" if i % 3 == 0 else "", i)
                 files = list(tmp_path.iterdir())
-                assert len(files) == 4
+                assert len(files) == min(cycle, 4)
                 assert any(p for p in files if search(r"^log\.txt$", p.name))
-                assert any(
-                    p for p in files if search(r"^log\.1__[\dT]+__[\dT]+\.txt$", p.name)
-                )
-                assert any(
-                    p for p in files if search(r"^log\.2__[\dT]+__[\dT]+\.txt$", p.name)
-                )
-                assert any(
-                    p for p in files if search(r"^log\.3__[\dT]+__[\dT]+\.txt$", p.name)
-                )
-
-            logger.warning("message 9")
-            files = list(tmp_path.iterdir())
-            assert len(files) == 4
-            assert any(p for p in files if search(r"^log\.txt$", p.name))
-            assert any(
-                p for p in files if search(r"^log\.1__[\dT]+__[\dT]+\.txt$", p.name)
-            )
-            assert any(
-                p for p in files if search(r"^log\.2__[\dT]+__[\dT]+\.txt$", p.name)
-            )
-            assert any(
-                p for p in files if search(r"^log\.3__[\dT]+__[\dT]+\.txt$", p.name)
-            )
+                if cycle == 2:
+                    assert any(
+                        p for p in files if search(r"^log\.1__[\dT]+\.txt$", p.name)
+                    )
+                elif cycle == 3:
+                    assert any(
+                        p
+                        for p in files
+                        if search(r"^log\.1__[\dT]+__[\dT]+\.txt$", p.name)
+                    )
+                    assert any(
+                        p for p in files if search(r"^log\.2__[\dT]+\.txt$", p.name)
+                    )
+                elif cycle == 4:
+                    assert any(
+                        p
+                        for p in files
+                        if search(r"^log\.1__[\dT]+__[\dT]+\.txt$", p.name)
+                    )
+                    assert any(
+                        p
+                        for p in files
+                        if search(r"^log\.2__[\dT]+__[\dT]+\.txt$", p.name)
+                    )
+                    assert any(
+                        p for p in files if search(r"^log\.3__[\dT]+\.txt$", p.name)
+                    )
+                elif cycle >= 5:
+                    assert any(
+                        p
+                        for p in files
+                        if search(r"^log\.1__[\dT]+__[\dT]+\.txt$", p.name)
+                    )
+                    assert any(
+                        p
+                        for p in files
+                        if search(r"^log\.2__[\dT]+__[\dT]+\.txt$", p.name)
+                    )
+                    assert any(
+                        p
+                        for p in files
+                        if search(r"^log\.3__[\dT]+__[\dT]+\.txt$", p.name)
+                    )
 
     @mark.flaky
     @skipif_windows

{dycw_utilities-0.129.3 → dycw_utilities-0.129.5}/src/utilities/__init__.py

@@ -1,3 +1,3 @@
 from __future__ import annotations
 
-__version__ = "0.129.3"
+__version__ = "0.129.5"

{dycw_utilities-0.129.3 → dycw_utilities-0.129.5}/src/utilities/logging.py

@@ -23,7 +23,7 @@ from logging import (
 )
 from logging.handlers import BaseRotatingHandler, TimedRotatingFileHandler
 from pathlib import Path
-from re import Pattern, search
+from re import Pattern
 from sys import stdout
 from time import time
 from typing import (
@@ -160,13 +160,11 @@ class SizeAndTimeRotatingFileHandler(BaseRotatingHandler):
     def _should_rollover(self, record: LogRecord, /) -> bool:
         if self._max_bytes is not None:  # skipif-ci-and-windows
             try:
-                current = self._filename.stat().st_size
+                size = self._filename.stat().st_size
             except FileNotFoundError:
                 pass
             else:
-                delta = len(f"{self.format(record)}\n")
-                new = current + delta
-                if new >= self._max_bytes:
+                if size >= self._max_bytes:
                     return True
         return bool(self._time_handler.shouldRollover(record))  # skipif-ci-and-windows
 
@@ -751,29 +749,6 @@ class _AdvancedLogRecord(LogRecord):
         cls.time_zone = time_zone.key  # skipif-ci-and-windows
         super().__init_subclass__(**kwargs)  # skipif-ci-and-windows
 
-    @override
-    def getMessage(self) -> str:
-        """Return the message for this LogRecord."""
-        msg = str(self.msg)  # pragma: no cover
-        if self.args:  # pragma: no cover
-            try:
-                return msg % self.args  # compability for 3rd party code
-            except ValueError as error:
-                if len(error.args) == 0:
-                    raise
-                first = error.args[0]
-                if search("unsupported format character", first):
-                    return msg.format(*self.args)
-                raise
-            except TypeError as error:
-                if len(error.args) == 0:
-                    raise
-                first = error.args[0]
-                if search("not all arguments converted", first):
-                    return msg.format(*self.args)
-                raise
-        return msg  # pragma: no cover
-
     @classmethod
     def get_now(cls) -> Any:
         """Get the current zoned datetime."""