From a6248629d4ab8c9d47859929fb10c6b58528b1aa Mon Sep 17 00:00:00 2001 From: Christian Heller Date: Thu, 25 Apr 2024 06:12:07 +0200 Subject: [PATCH] Use more meaningful variable names. --- plomtask/db.py | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/plomtask/db.py b/plomtask/db.py index bf2b79f..634862c 100644 --- a/plomtask/db.py +++ b/plomtask/db.py @@ -112,22 +112,22 @@ class DatabaseConnection: return '(' + ','.join(['?'] * len(values)) + ')' -X = TypeVar('X', int, str) -T = TypeVar('T', bound='BaseModel[Any]') +BaseModelId = TypeVar('BaseModelId', int, str) +BaseModelInstance = TypeVar('BaseModelInstance', bound='BaseModel[Any]') -class BaseModel(Generic[X]): +class BaseModel(Generic[BaseModelId]): """Template for most of the models we use/derive from the DB.""" table_name = '' to_save: list[str] = [] - id_: None | X - cache_: dict[X, Self] = {} + id_: None | BaseModelId + cache_: dict[BaseModelId, Self] = {} @classmethod - def from_table_row(cls: type[T], + def from_table_row(cls: type[BaseModelInstance], # pylint: disable=unused-argument db_conn: DatabaseConnection, - row: Row | list[Any]) -> T: + row: Row | list[Any]) -> BaseModelInstance: """Make from DB row, write to DB cache.""" obj = cls(*row) obj.cache() @@ -136,7 +136,7 @@ class BaseModel(Generic[X]): @classmethod def _by_id(cls, db_conn: DatabaseConnection, - id_: X) -> tuple[Self | None, bool]: + id_: BaseModelId) -> tuple[Self | None, bool]: """Return instance found by ID, or None, and if from cache or not.""" from_cache = False obj = cls.get_cached(id_) @@ -170,7 +170,8 @@ class BaseModel(Generic[X]): self.cache() @classmethod - def get_cached(cls: type[T], id_: X) -> T | None: + def get_cached(cls: type[BaseModelInstance], + id_: BaseModelId) -> BaseModelInstance | None: """Get object of id_ from class's cache, or None if not found.""" # pylint: disable=consider-iterating-dictionary if id_ in cls.cache_.keys(): -- 2.30.2