firebird-base 2.0.0__tar.gz → 2.0.2__tar.gz

{firebird_base-2.0.0 → firebird_base-2.0.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: firebird-base
-Version: 2.0.0
+Version: 2.0.2
 Summary: Firebird base modules for Python
 Project-URL: Home, https://github.com/FirebirdSQL/python3-base
 Project-URL: Documentation, https://firebird-base.rtfd.io

{firebird_base-2.0.0 → firebird_base-2.0.2}/src/firebird/base/__about__.py

@@ -1,4 +1,4 @@
 # SPDX-FileCopyrightText: 2020-present The Firebird Projects <www.firebirdsql.org>
 #
 # SPDX-License-Identifier: MIT
-__version__ = "2.0.0"
+__version__ = "2.0.2"

{firebird_base-2.0.0 → firebird_base-2.0.2}/src/firebird/base/config.py

@@ -101,7 +101,7 @@ from configparser import (
     NoSectionError,
 )
 from decimal import Decimal, DecimalException
-from enum import Enum, Flag
+from enum import Enum, Flag, _high_bit
 from inspect import Parameter, Signature, signature
 from pathlib import Path
 from typing import Any, Generic, TypeVar, cast, get_type_hints
@@ -148,32 +148,25 @@ def _eq(a: Any, b: Any) -> bool:
 
 # --- Internal helpers for FlagOption copied from stdlib enum (pre-Python 3.11) ---
 def _decompose(flag, value):
-    "Extract all members from the value (internal helper for FlagOption)."
+    """Extract all members from the value.
+    """
     # _decompose is only called if the value is not named
     not_covered = value
     negative = value < 0
-    # issue29167: wrap accesses to _value2member_map_ in a list to avoid race
-    #             conditions between iterating over it and having more pseudo-
-    #             members added to it
-    if negative:
-        # only check for named flags
-        flags_to_check = [
-                (m, v)
-                for v, m in list(flag._value2member_map_.items())
-                if m.name is not None
-                ]
-    else:
-        # check for named flags and powers-of-two flags
-        flags_to_check = [
-                (m, v)
-                for v, m in list(flag._value2member_map_.items())
-                if m.name is not None or _power_of_two(v)
-                ]
     members = []
-    for member, member_value in flags_to_check:
+    for member in flag:
+        member_value = member.value
         if member_value and member_value & value == member_value:
             members.append(member)
             not_covered &= ~member_value
+    if not negative:
+        tmp = not_covered
+        while tmp:
+            flag_value = 2 ** _high_bit(tmp)
+            if flag_value in flag._value2member_map_:
+                members.append(flag._value2member_map_[flag_value])
+                not_covered &= ~flag_value
+            tmp &= ~flag_value
     if not members and value in flag._value2member_map_:
         members.append(flag._value2member_map_[value])
     members.sort(key=lambda m: m._value_, reverse=True)
@@ -2608,8 +2601,8 @@ class DataclassOption(Option[Any]):
         @dataclass
         class DBInfo:
             host: str
-            port: int = 5432 # Field with default
             user: str
+            port: int = 5432 # Field with default
             ssl_mode: bool = field(default=False)
 
         class AppSettings(Config):

{firebird_base-2.0.0 → firebird_base-2.0.2}/src/firebird/base/signal.py

@@ -331,20 +331,18 @@ class eventsocket: # noqa: N801
     """
     _empty: _EventSocket = _EventSocket()
     def __init__(self, fget: Callable, doc: str | None=None):
-        s = Signature.from_callable(fget)
-        # Remove 'self' from list of parameters
-        self._sig: Signature = s.replace(parameters=[v for k,v in s.parameters.items()
-                                                     if k.lower() != 'self'])
+        # Store callable for later signature inspection
+        self._callable = fget
         # Key: instance of class where this eventsocket instance is used to define a property
         # Value: _EventSocket
         self._map = WeakKeyDictionary()
         if doc is None and fget is not None:
             doc = fget.__doc__
         self.__doc__ = doc
-    def _kw_test(self, sig: Signature) -> bool:
-        p = sig.parameters
+    def _kw_test(self, given: Signature, expected: Signature) -> bool:
+        p = given.parameters
         result = False
-        for k in set(p).difference(set(self._sig.parameters)):
+        for k in set(p).difference(set(expected.parameters)):
             result = True
             if p[k].default is Signature.empty:
                 return False
@@ -361,10 +359,15 @@ class eventsocket: # noqa: N801
         if not callable(value):
             raise ValueError(f"Connection to non-callable '{value.__class__.__name__}' object failed")
         # Verify signatures
-        sig = Signature.from_callable(value)
-        if str(sig) != str(self._sig):
+        expected_sig: Signature = Signature.from_callable(self._callable, eval_str=True)
+        # Remove 'self' from list of parameters
+        expected_sig = expected_sig.replace(parameters=[v for k,v in expected_sig.parameters.items()
+                                                        if k.lower() != 'self'])
+
+        given_sig = Signature.from_callable(value, eval_str=True)
+        if str(given_sig) != str(expected_sig):
             # Check if the difference is only in keyword arguments with defaults.
-            if not self._kw_test(sig):
+            if not self._kw_test(given_sig, expected_sig):
                 raise ValueError("Callable signature does not match the event signature")
         self._map[obj] = _EventSocket(value)
     def __delete__(self, obj):

{firebird_base-2.0.0 → firebird_base-2.0.2}/src/firebird/base/trace.py

@@ -404,9 +404,8 @@ class TracedClassConfig(BaseTraceConfig):
             ListOption('methods', str, "Names of traced class methods")
         #: Configuration sections with extended config of traced class methods
         self.special: ConfigListOption = \
-            ConfigListOption('special',
-                             "Configuration sections with extended config of traced class methods",
-                             TracedMethodConfig)
+            ConfigListOption('special', TracedMethodConfig,
+                             "Configuration sections with extended config of traced class methods")
         #: Wherher configuration should be applied also to all registered descendant classes [default: True].
         self.apply_to_descendants: BoolOption = \
             BoolOption('apply_to_descendants',
@@ -428,9 +427,9 @@ class TraceConfig(BaseTraceConfig):
                        default=True)
         #: Configuration sections with traced Python classes [required].
         self.classes: ConfigListOption = \
-            ConfigListOption('classes',
+            ConfigListOption('classes', TracedClassConfig,
                              "Configuration sections with traced Python classes",
-                             TracedClassConfig, required=True)
+                             required=True)
 
 class TraceManager:
     """Trace manager.
@@ -460,6 +459,7 @@ class TraceManager:
     def clear(self) -> None:
         """Removes all trace specifications.
         """
+        cls: TracedClass
         for cls in self._traced:
             cls.traced.clear()
     def register(self, cls: type) -> None:
@@ -524,6 +524,7 @@ class TraceManager:
             if strict:
                 raise TypeError(f"Class '{obj.__class__.__name__}' not registered for trace!")
             return obj
+        item: TracedItem
         for item in entry.traced:
             setattr(obj, item.method, item.decorator(*item.args, **item.kwargs)(getattr(obj, item.method)))
         return obj
@@ -583,6 +584,7 @@ class TraceManager:
             cls_kwargs = {}
             cls_kwargs.update(global_kwargs)
             cls_kwargs.update(build_kwargs(cls_cfg))
+            cls_desc: TracedClass
             if (cls_desc := self._traced.find(partial(with_name, cls_name))) is None:
                 if cfg.autoregister.value:
                     cls = load(':'.join(cls_name.rsplit('.', 1)))