eventsourcing 9.4.0a7__py3-none-any.whl → 9.4.0b1__py3-none-any.whl

eventsourcing/tests/postgres_utils.py

@@ -1,16 +1,17 @@
 import psycopg
+from psycopg.sql import SQL, Identifier
 
 from eventsourcing.persistence import PersistenceError
 from eventsourcing.postgres import PostgresDatastore
 
 
 def pg_close_all_connections(
-    name="eventsourcing",
-    host="127.0.0.1",
-    port="5432",
-    user="postgres",
-    password="postgres",  # noqa: S107
-):
+    name: str = "eventsourcing",
+    host: str = "127.0.0.1",
+    port: str = "5432",
+    user: str = "postgres",
+    password: str = "postgres",  # noqa: S107
+) -> None:
     try:
         # For local development... probably.
         pg_conn = psycopg.connect(
@@ -40,11 +41,13 @@ def pg_close_all_connections(
     """
     pg_conn_cursor = pg_conn.cursor()
     pg_conn_cursor.execute(close_all_connections)
-    return close_all_connections, pg_conn_cursor
 
 
-def drop_postgres_table(datastore: PostgresDatastore, table_name):
-    statement = f"DROP TABLE {table_name}"
+def drop_postgres_table(datastore: PostgresDatastore, table_name: str) -> None:
+    statement = SQL("DROP TABLE {0}.{1}").format(
+        Identifier(datastore.schema), Identifier(table_name)
+    )
+    # print(f"Dropping table {datastore.schema}.{table_name}")
     try:
         with datastore.transaction(commit=True) as curs:
             curs.execute(statement, prepare=False)

eventsourcing/utils.py

@@ -2,13 +2,14 @@ from __future__ import annotations
 
 import importlib
 import sys
-from collections.abc import Iterator, Mapping, Sequence
+from collections.abc import Iterator, Mapping
 from functools import wraps
 from inspect import isfunction
 from random import random
 from threading import Lock
 from time import sleep
-from typing import TYPE_CHECKING, Any, Callable, TypeVar, no_type_check, overload
+from types import ModuleType
+from typing import TYPE_CHECKING, Any, Callable, TypeVar, Union, no_type_check, overload
 
 if TYPE_CHECKING:
     from types import FunctionType, WrapperDescriptorType
@@ -20,12 +21,14 @@ class TopicError(Exception):
     """
 
 
-_type_cache: dict[type, str] = {}
-_topic_cache: dict[str, Any] = {}
+SupportsTopic = Union[type, Callable[..., Any], ModuleType]
+
+_type_cache: dict[SupportsTopic, str] = {}
+_topic_cache: dict[str, SupportsTopic] = {}
 _topic_cache_lock = Lock()
 
 
-def get_topic(cls: type) -> str:
+def get_topic(obj: SupportsTopic, /) -> str:
     """
     Returns a "topic string" that locates the given class
     in its module. The string is formed by joining the
@@ -33,11 +36,11 @@ def get_topic(cls: type) -> str:
     colon character.
     """
     try:
-        return _type_cache[cls]
+        return _type_cache[obj]
     except KeyError:
-        topic = f"{cls.__module__}:{cls.__qualname__}"
-        register_topic(topic, cls)
-        _type_cache[cls] = topic
+        topic = f"{obj.__module__}:{obj.__qualname__}"
+        register_topic(topic, obj)
+        _type_cache[obj] = topic
         return topic
 
 
@@ -97,7 +100,7 @@ def resolve_topic(topic: str) -> Any:
     return obj
 
 
-def register_topic(topic: str, obj: Any) -> None:
+def register_topic(topic: str, obj: SupportsTopic) -> None:
     """
     Registers a topic with an object, so the object will be
     returned whenever the topic is resolved.
@@ -126,7 +129,7 @@ def clear_topic_cache() -> None:
 
 
 def retry(
-    exc: type[Exception] | Sequence[type[Exception]] = Exception,
+    exc: type[Exception] | tuple[type[Exception], ...] = Exception,
     max_attempts: int = 1,
     wait: float = 0,
     stall: float = 0,
@@ -215,7 +218,9 @@ def reversed_keys(d: dict[Any, Any]) -> Iterator[Any]:
     return reversed(d.keys())
 
 
-def get_method_name(method: FunctionType | WrapperDescriptorType) -> str:
+def get_method_name(
+    method: Callable[..., Any] | FunctionType | WrapperDescriptorType,
+) -> str:
     if sys.version_info >= (3, 10):  # pragma: no cover
         return method.__qualname__
     return method.__name__  # pragma: no cover
@@ -230,18 +235,23 @@ class Environment(dict[str, str]):
         super().__init__(env or {})
         self.name = name
 
+    @overload  # type: ignore[override]
+    def get(self, __key: str) -> str | None: ...  # pragma: no cover
+
     @overload
-    def get(self, key: str) -> str | None: ...  # pragma: no cover
+    def get(self, __key: str, __default: str) -> str: ...  # pragma: no cover
 
     @overload
-    def get(self, key: str, default: str | T) -> str | T: ...  # pragma: no cover
+    def get(self, __key: str, __default: T) -> str | T: ...  # pragma: no cover
 
-    def get(self, key: str, default: str | T | None = None) -> str | T | None:
-        for _key in self.create_keys(key):
+    def get(  # pyright: ignore [reportIncompatibleMethodOverride]
+        self, __key: str, __default: str | T | None = None
+    ) -> str | T | None:
+        for _key in self.create_keys(__key):
             value = super().get(_key, None)
             if value is not None:
                 return value
-        return default
+        return __default
 
     def create_keys(self, key: str) -> list[str]:
         keys = []

{eventsourcing-9.4.0a7.dist-info → eventsourcing-9.4.0b1.dist-info}/METADATA

@@ -1,13 +1,13 @@
 Metadata-Version: 2.3
 Name: eventsourcing
-Version: 9.4.0a7
+Version: 9.4.0b1
 Summary: Event sourcing in Python
 License: BSD 3-Clause
 Keywords: event sourcing,event store,domain driven design,domain-driven design,ddd,cqrs,cqs
 Author: John Bywater
 Author-email: john.bywater@appropriatesoftware.net
 Requires-Python: >=3.9, !=2.7.*, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*, !=3.5.*, !=3.6.*, !=3.7.*, !=3.8.*
-Classifier: Development Status :: 3 - Alpha
+Classifier: Development Status :: 4 - Beta
 Classifier: Intended Audience :: Developers
 Classifier: Intended Audience :: Education
 Classifier: Intended Audience :: Science/Research

eventsourcing-9.4.0b1.dist-info/RECORD

@@ -0,0 +1,26 @@
+eventsourcing/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+eventsourcing/application.py,sha256=lVgKXCeGA36CsUW7qgkkABX0mCUBvUH-QGQFtOYwmUw,35796
+eventsourcing/cipher.py,sha256=R6bvq7Zcsd7NvV1o8WghdBcnqu0IDkOxlfxUSk1txeQ,3320
+eventsourcing/compressor.py,sha256=IdvrJUB9B2td871oifInv4lGXmHwYL9d69MbHHCr7uI,421
+eventsourcing/cryptography.py,sha256=ZsQFyeyMZysADqKy38ECV71j6EMMSbo3VQO7oRnC1h0,2994
+eventsourcing/dispatch.py,sha256=3eVnGCagnn_CENSnTKonMt2kZ1eoHm8abdK7YRVONbU,2736
+eventsourcing/domain.py,sha256=WwDwo-IxYrC3fEXu_5E2x-Vk4s1Ye9IaZSQLcUGhQqw,59889
+eventsourcing/interface.py,sha256=uCoV9ARAu229SGwp169yeSLbB8wDLKDwWcnQdvOXOQM,5141
+eventsourcing/persistence.py,sha256=hCS1vCtS5X_LUtycuDpF6d6Os7zjQ3qTnGf7W39DWV4,46139
+eventsourcing/popo.py,sha256=xBUnnPuQ_wdF0ErU9AApRPwlkB0CJePMbWCz6qn3U1M,9654
+eventsourcing/postgres.py,sha256=hHYpzvZc7nANXE1uQZ3gA-XKk5X9rB6nJ_zouOkpidk,37537
+eventsourcing/projection.py,sha256=niCF9L5LsdeA0kgbKC3sE7p65rOF5du-YpdibkAhNU0,8588
+eventsourcing/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+eventsourcing/sqlite.py,sha256=UVgG0JCmYr7xN8HHnoiMPpZtZ3d5NTfB-iq0MlZGax4,22051
+eventsourcing/system.py,sha256=tyqGaGUE6CUGPWUZf27_26-Zl3PLsm3vK017Wxn7IM0,47279
+eventsourcing/tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+eventsourcing/tests/application.py,sha256=DEncXtCsX0X6Udua9GbGpua0xTGshnDPIThFfzuiBog,18025
+eventsourcing/tests/domain.py,sha256=LkvGFYFc6jJR0PYjO2hAGPw0TNW8vUzdTuR8K5xDEQ0,3385
+eventsourcing/tests/persistence.py,sha256=DePUevT4uYNTcIzVZoO6uzyyrUI2sOK6CSioiJRcD6I,58518
+eventsourcing/tests/postgres_utils.py,sha256=0ywklGp6cXZ5PmV8ANVkwSHsZZCl5zTmOk7iG-RmrCE,1548
+eventsourcing/utils.py,sha256=1mG24CXb4oRaumB6NMaH3QqxtHEiWTiJEWzFDRBf6nc,8537
+eventsourcing-9.4.0b1.dist-info/AUTHORS,sha256=8aHOM4UbNZcKlD-cHpFRcM6RWyCqtwtxRev6DeUgVRs,137
+eventsourcing-9.4.0b1.dist-info/LICENSE,sha256=CQEQzcZO8AWXL5i3hIo4yVKrYjh2FBz6hCM7kpXWpw4,1512
+eventsourcing-9.4.0b1.dist-info/METADATA,sha256=Q4NfLZMDdQ9EKyxbXmk3_exmsHcD2PfOcSh-ldO3R-8,9796
+eventsourcing-9.4.0b1.dist-info/WHEEL,sha256=fGIA9gx4Qxk2KDKeNJCbOEwSrmLtjWCwzBz351GyrPQ,88
+eventsourcing-9.4.0b1.dist-info/RECORD,,

eventsourcing-9.4.0a7.dist-info/RECORD

@@ -1,26 +0,0 @@
-eventsourcing/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-eventsourcing/application.py,sha256=p8pBAWZ4HfHvHVZ2-enPE_WLokFqJNo6OEa6qU9_Zos,35973
-eventsourcing/cipher.py,sha256=AjgOlOv9FF6xyXiFnHwcK6NX5IJ3nPHFL5GzIyWozyg,3265
-eventsourcing/compressor.py,sha256=IdvrJUB9B2td871oifInv4lGXmHwYL9d69MbHHCr7uI,421
-eventsourcing/cryptography.py,sha256=ZsQFyeyMZysADqKy38ECV71j6EMMSbo3VQO7oRnC1h0,2994
-eventsourcing/dispatch.py,sha256=yYSpT-jqc6l_wTdqEnfPJJfvsZN2Ta8g2anrVPWIcqQ,1412
-eventsourcing/domain.py,sha256=_yacmQJBimumKbS3T-KLhvziVI0BWbDM7G5Opyh-Mu0,59578
-eventsourcing/interface.py,sha256=kObA7ouzLD4YpJMjhfPVmRUcDzhbK0bbFKXy75EscHU,5138
-eventsourcing/persistence.py,sha256=5fyJ9H7rgQY1M1cO6rfNU9VI2_GLn4KjFLia7lqXLSM,46147
-eventsourcing/popo.py,sha256=wSnpFutz24czC34v-Pd_OjMvv3RCXRjT0pk7ibkClrY,9573
-eventsourcing/postgres.py,sha256=WM23kJSmKzYvbiEU6y_E5WIuOIDMQfgLi2yHqazbj3c,36325
-eventsourcing/projection.py,sha256=x4lnqJbbnqwt_UKQN69jYSZEJkbhgvZgf-QX4c_y0lE,6774
-eventsourcing/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-eventsourcing/sqlite.py,sha256=ZiQSxaRULQMpK6RuiVQ1jD8dSMW_I-urzfAW6oL2FEk,21970
-eventsourcing/system.py,sha256=geMw08uAEySRHaNeDwYZyzD55WcduK7WP_BTy964dEU,47063
-eventsourcing/tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-eventsourcing/tests/application.py,sha256=vHF5xp5WAXdTItdY5NsHvtT2QCRGmSM-j-afwFJqKj0,17357
-eventsourcing/tests/domain.py,sha256=lHSlY6jIoSeqlcPSbrrozEPUJGvJ8bgPrznlmzTxn2w,3254
-eventsourcing/tests/persistence.py,sha256=XHoe4rk9VftCJ3Wfi30K1u3wnMLUyOjuYyI7ml9ecIQ,57096
-eventsourcing/tests/postgres_utils.py,sha256=xymcGYasUXeZTBenkHz-ykD8HtrFjVM1Z7-qRrH6OQk,1364
-eventsourcing/utils.py,sha256=1MXOacnjXauYaBhGmmGc1nOMXWcd9NnDC8uPeiop9l4,8184
-eventsourcing-9.4.0a7.dist-info/AUTHORS,sha256=8aHOM4UbNZcKlD-cHpFRcM6RWyCqtwtxRev6DeUgVRs,137
-eventsourcing-9.4.0a7.dist-info/LICENSE,sha256=CQEQzcZO8AWXL5i3hIo4yVKrYjh2FBz6hCM7kpXWpw4,1512
-eventsourcing-9.4.0a7.dist-info/METADATA,sha256=lDtJGwMp3HAxuQIFxfmAZfW7vhvBIPrUpZS3EykR9SQ,9797
-eventsourcing-9.4.0a7.dist-info/WHEEL,sha256=fGIA9gx4Qxk2KDKeNJCbOEwSrmLtjWCwzBz351GyrPQ,88
-eventsourcing-9.4.0a7.dist-info/RECORD,,