Release 2.0.1

* Fix: for trace configuration.
* Fix: issues with `_decompose`.
* Fix: Signature match in `.eventsocket`.

Author: pcisar

CHANGELOG.md

@@ -4,6 +4,14 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/)
 and this project adheres to [Semantic Versioning](http://semver.org/).
 
+## [2.0.1] - 2025-06-02
+
+### Fixed
+
+- Issue with trace configuration.
+- Issues with `_decompose`.
+- Signature match in `eventsocket`.
+
 ## [2.0.0] - 2025-04-30
 
 ### Added

docs/changelog.txt

@@ -2,6 +2,13 @@
 Changelog
 #########
 
+Version 2.0.1
+=============
+
+* Fix: for trace configuration.
+* Fix: issues with `_decompose`.
+* Fix: Signature match in `.eventsocket`.
+
 Version 2.0.0
 =============
 

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.1"

src/firebird/base/config.py

@@ -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):

src/firebird/base/signal.py

@@ -331,20 +331,18 @@ def my_handler(data: dict):
     """
     _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 @@ def __set__(self, obj, value):
         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):

src/firebird/base/trace.py

@@ -404,9 +404,8 @@ def __init__(self, name: str):
             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 @@ def __init__(self, name: str):
                        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.