From 5d17c305571f51befec9a2c3ffe97ad667d2bb8b Mon Sep 17 00:00:00 2001 From: Cliff Hill Date: Mon, 4 Oct 2021 15:17:53 -0400 Subject: [PATCH] Fixing stuff. Signed-off-by: Cliff Hill --- src/playlist/data/base.py | 11 +++++++---- tests/data/test_settings.py | 3 ++- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/src/playlist/data/base.py b/src/playlist/data/base.py index 19c42fb..88abe05 100644 --- a/src/playlist/data/base.py +++ b/src/playlist/data/base.py @@ -11,7 +11,7 @@ import marshmallow DataSub = typing.TypeVar("DataSub", bound="BaseData") -DataDict = typing.NewType("DataDict", dict[str, object]) +DataDict = typing.TypeVar("DataDict") class DataMeta(type): @@ -45,9 +45,12 @@ class DataMeta(type): for name, type_ in cls.__annotations__.items() if name != "id" } - return typing.TypedDict( # type: ignore [no-any-return,operator] - f"{cls.__name__}Dict", - fields, + return typing.cast( + DataDict, + typing.TypedDict( # type: ignore [operator] + f"{cls.__name__}Dict", + fields, + ), ) diff --git a/tests/data/test_settings.py b/tests/data/test_settings.py index 3ba2cec..df9af8e 100644 --- a/tests/data/test_settings.py +++ b/tests/data/test_settings.py @@ -1,5 +1,6 @@ """Tests for validating the Settings object.""" import pathlib +import random import pytest @@ -12,7 +13,7 @@ def example_settings() -> settings.Settings: return settings.Settings( creds=settings.CredentialSettings( baseurl="http://nowhere.huh", - token="Fake Token", # noqa: S106 + token=str(random.randint(0, 1000000)), ), )