Skip to content

Commit 91f91c2

Browse files
committed
fix linting
1 parent ff0965e commit 91f91c2

File tree

5 files changed

+15
-35
lines changed

5 files changed

+15
-35
lines changed

eventsourcingdb/client.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,7 @@
33
from types import TracebackType
44
from typing import TypeVar
55

6-
from eventsourcingdb.abstract_base_client import AbstractBaseClient
7-
6+
from .abstract_base_client import AbstractBaseClient
87
from .event.event import Event
98
from .event.event_candidate import EventCandidate
109
from .event.event_context import EventContext

eventsourcingdb/http_client/http_client.py

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -35,37 +35,30 @@ async def __aexit__(
3535
) -> None:
3636
await self.close()
3737

38-
# Keep for backward compatibility
3938
async def initialize(self) -> None:
4039
self.__session = aiohttp.ClientSession()
4140

42-
# Keep for backward compatibility
4341
async def close(self):
4442
if self.__session is not None:
4543
await self.__session.close()
4644
self.__session = None
47-
return None
4845

4946
async def post(self, path: str, request_body: str) -> Response:
5047
if self.__session is None:
5148
raise CustomError()
5249

5350
async def request_executor() -> Response:
54-
# Vorbereitung
5551
url_path = url.join_segments(self.__base_url, path)
5652
headers = get_post_headers(self.__api_token)
5753

58-
# Request ausführen
5954
async_response = await self.__session.post( # type: ignore
6055
url_path,
6156
data=request_body,
6257
headers=headers,
6358
)
6459

65-
# Response erstellen
6660
response = Response(async_response)
6761

68-
# Split try block to have only one statement
6962
validated_response = None
7063
try:
7164
validated_response = await validate_response(response)
@@ -86,20 +79,16 @@ async def get(
8679
raise CustomError()
8780

8881
async def request_executor() -> Response:
89-
# Vorbereitung
9082
url_path = url.join_segments(self.__base_url, path)
9183
headers = get_get_headers(self.__api_token, with_authorization)
9284

93-
# Request ausführen
9485
async_response = await self.__session.get( # type: ignore
9586
url_path,
9687
headers=headers,
9788
)
9889

99-
# Response erstellen
10090
response = Response(async_response)
10191

102-
# Split try block to have only one statement
10392
validated_response = None
10493
try:
10594
validated_response = await validate_response(response)

tests/shared/event/assert_event.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
from eventsourcingdb.event.event import Event
1+
from typing import Any
22

33
# pylint: disable=R0917
44
# Reason: This method is expected to have many parameters
@@ -8,7 +8,7 @@
88

99

1010
def assert_event_equals(
11-
event: Event,
11+
event: Any, # Use Any instead of "Event" for type annotation
1212
source: str,
1313
subject: str,
1414
type_: str,

tests/shared/start_local_http_server.py

Lines changed: 8 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -43,30 +43,24 @@ async def start_local_http_server(attach_handlers: AttachHandlers) -> tuple[Clie
4343
server = multiprocessing.Process(target=LocalHttpServer.start, args=(local_http_server, ))
4444
server.start()
4545

46-
# Warte auf den Server, bis er bereit ist
4746
async def ping_app():
48-
retry_count = 0
4947
max_retries = 5
5048
retry_delay = 0.5
5149

5250
async with aiohttp.ClientSession() as session:
53-
while retry_count < max_retries:
51+
for _ in range(max_retries):
52+
url = f"http://localhost:{local_http_server.port}/__python_test__/api/v1/ping"
53+
response = None
5454
try:
55-
await session.get(
56-
f"http://localhost:{local_http_server.port}/__python_test__/api/v1/ping",
57-
)
58-
# Wenn die Anfrage erfolgreich ist, brechen wir die Schleife ab
59-
return True
55+
response = await session.get(url)
6056
except (aiohttp.ClientError, asyncio.TimeoutError):
61-
retry_count += 1
6257
await asyncio.sleep(retry_delay)
63-
64-
# Wenn alle Versuche fehlschlagen, geben wir False zurück
58+
continue
59+
if response:
60+
return True
6561
return False
6662

67-
# Versuche, den Server zu erreichen
68-
server_ready = await ping_app()
69-
if not server_ready:
63+
if not await ping_app():
7064
server.terminate()
7165
server.join()
7266
raise RuntimeError(f"Failed to start HTTP server on port {local_http_server.port}")

tests/test_register_event_schema.py

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,6 @@ async def test_throws_error_if_schema_conflicts_with_existing_events(
4646
)
4747
])
4848

49-
# Update the error pattern to match the actual error message about missing 'properties'
5049
with pytest.raises(ClientError, match="missing properties: 'properties'"):
5150
await client.register_event_schema(
5251
"com.gornisht.ekht",
@@ -89,7 +88,6 @@ async def test_throws_error_if_schema_is_invalid(
8988
):
9089
client = database.with_authorization.client
9190

92-
# Update the error pattern to match the actual error message about invalid type
9391
with pytest.raises(ClientError, match="value must be \"object\""):
9492
await client.register_event_schema(
9593
"com.gornisht.ekht",
@@ -117,7 +115,7 @@ def handle_register_event_schema(response: Response) -> Response:
117115
client = await get_client(attach_handlers)
118116

119117
with pytest.raises(ServerError):
120-
await client.register_event_schema("com.foo.bar", '{"type":"object"}')
118+
await client.register_event_schema("com.foo.bar", {"type": "object"})
121119

122120
@staticmethod
123121
@pytest.mark.asyncio
@@ -136,7 +134,7 @@ def handle_register_event_schema(response: Response) -> Response:
136134
client = await get_client(attach_handlers)
137135

138136
with pytest.raises(ClientError):
139-
await client.register_event_schema("com.foo.bar", '{"type":"object"}')
137+
await client.register_event_schema("com.foo.bar", {"type": "object"})
140138

141139
@staticmethod
142140
@pytest.mark.asyncio
@@ -154,7 +152,7 @@ def handle_register_event_schema(response: Response) -> Response:
154152
client = await get_client(attach_handlers)
155153

156154
with pytest.raises(ClientError):
157-
await client.register_event_schema("com.foo.bar", '{"type":"object"}')
155+
await client.register_event_schema("com.foo.bar", {"type": "object"})
158156

159157
@staticmethod
160158
@pytest.mark.asyncio
@@ -174,4 +172,4 @@ def handle_register_event_schema(response: Response) -> Response:
174172
client = await get_client(attach_handlers)
175173

176174
with pytest.raises(ServerError):
177-
await client.register_event_schema("com.foo.bar", '{"type":"object"}')
175+
await client.register_event_schema("com.foo.bar", {"type": "object"})

0 commit comments

Comments
 (0)