From 965a23a1d8299a8923b6e51a963777093850ef79 Mon Sep 17 00:00:00 2001 From: Emmie Maeda Date: Wed, 7 Feb 2024 21:43:46 -0500 Subject: [PATCH] Move ForumUserData type. --- yellowstone/request/forum_categories.py | 8 +------- yellowstone/types.py | 10 +++++++++- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/yellowstone/request/forum_categories.py b/yellowstone/request/forum_categories.py index feafba3..9902dd8 100644 --- a/yellowstone/request/forum_categories.py +++ b/yellowstone/request/forum_categories.py @@ -13,6 +13,7 @@ from ..request.site_members import USER_ID_REGEX from ..request.user import USER_SLUG_REGEX from ..scraper import find_element, get_entity_date, make_soup, regex_extract +from ..types import ForumUserData from ..wikidot import Wikidot CATEGORY_ID_REGEX = re.compile(r"\/forum\/c-(\d+)(?:\/.+)?") @@ -21,13 +22,6 @@ logger = logging.getLogger(__name__) -@dataclass -class ForumUserData: - id: int - slug: str - name: str - - @dataclass class ForumCategoryLastPostData: posted_time: datetime diff --git a/yellowstone/types.py b/yellowstone/types.py index 27dfe38..38f6620 100644 --- a/yellowstone/types.py +++ b/yellowstone/types.py @@ -1,7 +1,15 @@ """ -Contains type definitions for use in annotations. +Contains class and type definitions for use in annotations. """ +from dataclasses import dataclass from typing import Union Json = Union[None, int, float, str, list["Json"], dict[str, "Json"]] + + +@dataclass +class ForumUserData: + id: int + slug: str + name: str