janware/jw-pkg
Watch
1
Code Pull requests Activity Actions

lib.Types: Restrict LoadTypes to ABC-derived classes #90

Merged
Jan Lindemann merged 1 commit from jan/feature/20260907-lib-types-restrict-loadtypes-to-abc-derived-classes into master 2026-09-07 09:21:25 +02:00 AGit
Conversation 0 Commits 1 Files changed 1 +8 -5
1 changed files with 8 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/python/jw/pkg/lib/Types.py
View file

@ -5,7 +5,7 @@ import os
import re import re
import sys import sys
from typing import TYPE_CHECKING, Any, Generic, Iterable, TypeVar, override from typing import TYPE_CHECKING, Any, Generic, Iterable, TypeGuard, TypeVar, override
from .log import ERR, OFF, log, parse_log_level from .log import ERR, OFF, log, parse_log_level
@ -15,6 +15,9 @@ if TYPE_CHECKING:
T = TypeVar('T') T = TypeVar('T')
def is_abc_class(c: type[object]) -> TypeGuard[abc.ABCMeta]:
return isinstance(c, abc.ABCMeta)
class Types(abc.ABC, Iterable[type[T]], Generic[T]): # export class Types(abc.ABC, Iterable[type[T]], Generic[T]): # export
@override @override
@ -101,11 +104,11 @@ class LoadTypes(Types[T]): # export
if rx is not None and not re.match(rx, member_name): if rx is not None and not re.match(rx, member_name):
self._debug(f'o "{name}" has wrong name') self._debug(f'o "{name}" has wrong name')
continue continue
if not is_abc_class(c):
self._debug(f'o "{name}" is not derived from ABCMeta')
continue
if inspect.isabstract(c): if inspect.isabstract(c):
abstract: frozenset[str] = getattr( self._debug(f'o "{name}" is abstract: {c.__abstractmethods__}')
c, '__abstractmethods__', frozenset()
)
self._debug(f'o "{name}" is abstract: {abstract}')
continue continue
if self.__type_filter: if self.__type_filter:
for tp in self.__type_filter: for tp in self.__type_filter: