zstdlib 0.3.0__tar.gz → 0.3.2__tar.gz

{zstdlib-0.3.0 → zstdlib-0.3.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: zstdlib
-Version: 0.3.0
+Version: 0.3.2
 Summary: A set of useful python utilities
 License: GPLv3
 Project-URL: Homepage, https://github.com/zwimer/zstdlib

{zstdlib-0.3.0 → zstdlib-0.3.2}/pyproject.toml

@@ -50,7 +50,7 @@ disable = [
 
 [tool.black]
 line-length = 110
-target-version = ["py313"]   # py314 when available
+target-version = ["py314"]
 
 [tool.ruff]
 line-length = 110

{zstdlib-0.3.0 → zstdlib-0.3.2}/tests/test_frozen.py

@@ -1,4 +1,5 @@
 # pylint: disable=missing-module-docstring,missing-class-docstring,missing-function-docstring,unused-variable,attribute-defined-outside-init
+from sys import version_info
 import unittest
 
 from zstdlib.frozen import Freezable, frozen
@@ -104,10 +105,15 @@ class TestFrozen(unittest.TestCase):
         f1 = F1()
         self.assertEqual(f1.__init__.__doc__.strip(), "init doc")
         self.assertEqual(f1.__init__.__name__, "__init__")
-        self.assertEqual(f1.__init__.__qualname__, "TestFrozen.test_metadata.<locals>.F2.__init__")
+        self.assertEqual(f1.__init__.__qualname__, "TestFrozen.test_metadata.<locals>.F1.__init__")
         self.assertTupleEqual(f1.__init__.__defaults__, (1,))
         self.assertDictEqual(f1.__init__.__kwdefaults__, {"b": False})
-        self.assertDictEqual(f1.__init__.__annotations__, {"a": int, "b": bool, "return": None})
+        if version_info <= (3, 13) or hasattr(f1.__init__, "__annotations__"):
+            self.assertDictEqual(f1.__init__.__annotations__, {"a": int, "b": bool, "return": None})
+        else:  # annotations changed in 3.14, .__annotations__ *might* not exist
+            from annotationlib import get_annotations
+
+            self.assertDictEqual(get_annotations(f1.__init__), {"a": int, "b": bool, "return": None})
 
     def test_frozen_custom(self):
         @frozen("custom")

{zstdlib-0.3.0 → zstdlib-0.3.2}/zstdlib/__init__.py

@@ -1,4 +1,4 @@
-__version__ = "0.3.0"
+__version__ = "0.3.2"
 
 from .not_set import NotSetType, NotSet
 from .frozen import Freezable, frozen

{zstdlib-0.3.0 → zstdlib-0.3.2}/zstdlib/ansi.py

@@ -39,15 +39,43 @@ class RawColor:
         self.background = background
         self.value = self.color.value + (10 if self.background else 0) + (60 if self.bright else 0)
 
+    @classmethod
+    @cache
+    def _parse_color(cls, item: str) -> str:
+        """Construct a color following the rules defined by Color"""
+        item = item.lower()
+        if "bright_bg" in item:
+            raise ValueError("bg_ must precede bright_ in color specification")
+        pat = f"(:?bright_)?({'|'.join(list(PureColor.__members__))})"
+        shx = re.findall(f"(bg_){pat}", item)
+        if len(shx) > 1:
+            raise ValueError(f"Multiple background colors specified in {item}")
+        bg = None
+        if len(shx) == 1:
+            item = item.replace("".join(shx[0]), "")
+            bg = cls(shx[0][-1], bright="bright_" in shx[0], background=True)
+        shx = re.findall(pat, item)
+        if len(shx) > 1:
+            raise ValueError(f"Multiple foreground colors specified in {item}")
+        fg = None
+        if len(shx) == 1:
+            item = item.replace("".join(shx[0]), "")
+            fg = cls(shx[0][-1], bright="bright_" in shx[0])
+        # Determine modifiers and construct the color
+        attrs = [i for i in item.split("_") if i]
+        if any(bad := [i for i in attrs if i not in MODIFIERS]):
+            raise ValueError(f"Unknown modifiers(s): {', '.join(bad)}")
+        return _generate_code(fg, bg, {i: True for i in MODIFIERS if i in attrs})
+
 
 class _ColorMeta(type):
     """
     A metaclass that implements __getattr__ at the class level for Color
     """
 
-    def __getattr__(cls, item: str) -> "Color":
+    def __getattr__(cls, item: str) -> Color:
         try:
-            return cls(code=_parse_color(item))
+            return cls(code=RawColor._parse_color(item))
         except ValueError as e:
             raise AttributeError(str(e)) from e
 
@@ -91,7 +119,7 @@ class Color(metaclass=_ColorMeta):
         elif isinstance(fmt, RawColor):
             self.code = f"{_PREFIX}{fmt.value}m"
         else:
-            self.code = _parse_color(fmt) if isinstance(fmt, str) else fmt.code
+            self.code = RawColor._parse_color(fmt) if isinstance(fmt, str) else fmt.code
 
     def __call__(self, string: str) -> str:
         """
@@ -145,34 +173,3 @@ def _generate_code(
     if background:
         ints.append(background.value)
     return f"{_PREFIX}{';'.join(map(str, ints))}m"
-
-
-@cache
-def _parse_color(item: str) -> str:
-    """
-    Construct a color following the rules defined by Color
-    This method is not a classmethod since python3.13 deprecates mixing classmethod and cache
-    """
-    item = item.lower()
-    if "bright_bg" in item:
-        raise ValueError("bg_ must precede bright_ in color specification")
-    pat = f"(:?bright_)?({'|'.join(list(PureColor.__members__))})"
-    shx = re.findall(f"(bg_){pat}", item)
-    if len(shx) > 1:
-        raise ValueError(f"Multiple background colors specified in {item}")
-    bg: RawColor | None = None
-    if len(shx) == 1:
-        item = item.replace("".join(shx[0]), "")
-        bg = RawColor(shx[0][-1], bright="bright_" in shx[0], background=True)
-    shx = re.findall(pat, item)
-    if len(shx) > 1:
-        raise ValueError(f"Multiple foreground colors specified in {item}")
-    fg: RawColor | None = None
-    if len(shx) == 1:
-        item = item.replace("".join(shx[0]), "")
-        fg = RawColor(shx[0][-1], bright="bright_" in shx[0])
-    # Determine modifiers and construct the color
-    attrs = [i for i in item.split("_") if i]
-    if any(bad := [i for i in attrs if i not in MODIFIERS]):
-        raise ValueError(f"Unknown modifiers(s): {', '.join(bad)}")
-    return _generate_code(fg, bg, {i: True for i in MODIFIERS if i in attrs})

{zstdlib-0.3.0 → zstdlib-0.3.2}/zstdlib/enum.py

@@ -1,5 +1,5 @@
 from collections.abc import Iterator
-from typing import ForwardRef, Any
+from typing import Any
 import annotationlib
 
 
@@ -41,7 +41,7 @@ class EnumType(type):
         mcs,
         attrs: dict,
         dupes_ok: bool,
-        ans: dict[str, type | ForwardRef],
+        ans: dict[str, type | None],
     ) -> dict[str, tuple[type | None, Any]]:
         """
         Generate enum entries from attrs, checking for duplicates and missing annotations

{zstdlib-0.3.0 → zstdlib-0.3.2}/zstdlib/log/cute.py

@@ -1,4 +1,3 @@
-from __future__ import annotations
 from logging import CRITICAL, ERROR, WARNING, INFO, DEBUG, Formatter
 from collections import defaultdict
 from typing import TYPE_CHECKING

{zstdlib-0.3.0 → zstdlib-0.3.2}/zstdlib.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: zstdlib
-Version: 0.3.0
+Version: 0.3.2
 Summary: A set of useful python utilities
 License: GPLv3
 Project-URL: Homepage, https://github.com/zwimer/zstdlib