From e094e13132d397cd935afe9c6296f10ac8ef27d9 Mon Sep 17 00:00:00 2001 From: Your Name Date: Sat, 16 Sep 2023 11:09:57 -0400 Subject: [PATCH] improve type check --- catalog/common/models.py | 2 +- journal/views/mark.py | 3 +-- requirements-dev.txt | 2 +- takahe/models.py | 15 +-------------- users/models/user.py | 4 ++-- 5 files changed, 6 insertions(+), 20 deletions(-) diff --git a/catalog/common/models.py b/catalog/common/models.py index cea95d55..949909e8 100644 --- a/catalog/common/models.py +++ b/catalog/common/models.py @@ -369,7 +369,7 @@ class Item(SoftDeleteMixin, PolymorphicModel): return o def log_action(self, changes): - LogEntry.objects.log_create( + LogEntry.objects.log_create( # type: ignore self, action=LogEntry.Action.UPDATE, changes=changes ) diff --git a/journal/views/mark.py b/journal/views/mark.py index e30d89c9..758aa362 100644 --- a/journal/views/mark.py +++ b/journal/views/mark.py @@ -21,8 +21,7 @@ from mastodon.api import ( ) from takahe.utils import Takahe -from ..forms import * -from ..models import * +from ..models import Comment, Mark, Piece, ShelfType, ShelfTypeNames, TagManager from .common import render_list, render_relogin, target_identity_required _logger = logging.getLogger(__name__) diff --git a/requirements-dev.txt b/requirements-dev.txt index 513e98fe..7dc3b160 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -6,4 +6,4 @@ djlint~=1.32.1 isort~=5.12.0 lxml-stubs pre-commit -pyright==1.1.322 +pyright==1.1.327 diff --git a/takahe/models.py b/takahe/models.py index 43cb733b..635c0331 100644 --- a/takahe/models.py +++ b/takahe/models.py @@ -920,7 +920,7 @@ class Post(models.Model): created = models.DateTimeField(auto_now_add=True) updated = models.DateTimeField(auto_now=True) - objects = PostManager() + objects: PostManager = PostManager() class Meta: # managed = False @@ -1103,19 +1103,6 @@ class Post(models.Model): mentions.add(identity) return mentions - def ensure_hashtags(self) -> None: - """ - Ensure any of the already parsed hashtags from this Post - have a corresponding Hashtag record. - """ - # Ensure hashtags - if self.hashtags: - for hashtag in self.hashtags: - tag, _ = Hashtag.objects.get_or_create( - hashtag=hashtag[: Hashtag.MAXIMUM_LENGTH], - ) - tag.transition_perform("outdated") - def calculate_stats(self, save=True): """ Recalculates our stats dict diff --git a/users/models/user.py b/users/models/user.py index a273fc82..7cc4dc0c 100644 --- a/users/models/user.py +++ b/users/models/user.py @@ -1,7 +1,7 @@ import hashlib import re from functools import cached_property -from typing import TYPE_CHECKING +from typing import TYPE_CHECKING, ClassVar from django.contrib.auth.models import AbstractUser, BaseUserManager from django.contrib.auth.validators import UnicodeUsernameValidator @@ -131,7 +131,7 @@ class User(AbstractUser): # store the latest read announcement id, # every time user read the announcement update this field read_announcement_index = models.PositiveIntegerField(default=0) - objects = UserManager() + objects: ClassVar[UserManager] = UserManager() class Meta: constraints = [