Fix mypy errors

Author: mfosterw

config/urls.py

@@ -52,7 +52,7 @@
     # Admin site is only enabled during development
     urlpatterns += [path(settings.ADMIN_URL, admin.site.urls)]
     # Overwrite view site link because it points to the production url instead of local
-    admin.AdminSite.site_url = reverse_lazy("webiscite:index")
+    admin.AdminSite.site_url = reverse_lazy("webiscite:index")  # type: ignore[assignment]
 
     # This allows the error pages to be debugged during development, just visit
     # these url in browser to see how these error pages look like.

democrasite/activitypub/tests/test_models.py

@@ -12,6 +12,8 @@ def test_str(self, person: Person):
         follower.follow(person)
 
         follow = follower.following_set.first()
+
+        assert follow is not None
         assert follow.following == person
         assert str(follow) == f"{follower} followed {person} on {follow.created}"
 

democrasite/activitypub/tests/test_views.py

@@ -7,6 +7,7 @@
 from django.contrib.messages import get_messages
 from django.contrib.messages.middleware import MessageMiddleware
 from django.contrib.sessions.middleware import SessionMiddleware
+from django.http import HttpRequest
 from django.http import HttpResponseRedirect
 from django.test import Client
 from django.test import RequestFactory
@@ -36,11 +37,14 @@ def test_queryset(self, client: Client):
 
 
 class TestUserProfileMixin:
+    def dummy_get_response(self, request: HttpRequest):
+        pass
+
     def test_no_auth(self, rf: RequestFactory):
         request = rf.get("/fake-url/")
 
-        SessionMiddleware(lambda r: None).process_request(request)
-        MessageMiddleware(lambda r: None).process_request(request)
+        SessionMiddleware(self.dummy_get_response).process_request(request)
+        MessageMiddleware(self.dummy_get_response).process_request(request)
         request.user = AnonymousUser()
 
         view = views.UserProfileMixin()
@@ -60,8 +64,8 @@ def test_no_auth(self, rf: RequestFactory):
     def test_no_person(self, rf: RequestFactory, user: User):
         request = rf.get("/fake-url/")
 
-        SessionMiddleware(lambda r: None).process_request(request)
-        MessageMiddleware(lambda r: None).process_request(request)
+        SessionMiddleware(self.dummy_get_response).process_request(request)
+        MessageMiddleware(self.dummy_get_response).process_request(request)
         request.user = user
 
         view = views.UserProfileMixin()
@@ -143,6 +147,7 @@ def test_form_valid(self, person: Person, rf: RequestFactory):
 
         new_note = Note.objects.get(content=content)
         assert new_note.author == person
+        assert isinstance(response, HttpResponseRedirect)
         assert response.status_code == HTTPStatus.FOUND
         assert response.url == new_note.get_absolute_url()
 
@@ -163,6 +168,7 @@ def test_form_valid(self, person: Person, note: Note, rf: RequestFactory):
         reply_note = Note.objects.get(content=content)
         assert reply_note.author == person
         assert reply_note.in_reply_to == note
+        assert isinstance(response, HttpResponseRedirect)
         assert response.status_code == HTTPStatus.FOUND
         assert response.url == reply_note.get_absolute_url()
 
@@ -208,11 +214,14 @@ def test_get_context_data(self, person: Person, rf: RequestFactory):
 
 
 class TestPersonCreateView:
+    def dummy_get_response(self, request: HttpRequest):
+        pass
+
     def test_unauthenticated(self, rf: RequestFactory):
         # Unauthenticated
         request = rf.post("/fake-url/")
-        SessionMiddleware(lambda r: None).process_request(request)
-        MessageMiddleware(lambda r: None).process_request(request)
+        SessionMiddleware(self.dummy_get_response).process_request(request)
+        MessageMiddleware(self.dummy_get_response).process_request(request)
         request.user = AnonymousUser()
 
         response = views.person_create_view(request)
@@ -229,8 +238,8 @@ def test_unauthenticated(self, rf: RequestFactory):
 
     def test_person_exists(self, rf: RequestFactory, person: Person):
         request = rf.post("/fake-url/")
-        SessionMiddleware(lambda r: None).process_request(request)
-        MessageMiddleware(lambda r: None).process_request(request)
+        SessionMiddleware(self.dummy_get_response).process_request(request)
+        MessageMiddleware(self.dummy_get_response).process_request(request)
         request.user = person.user
 
         response = views.person_create_view(request)
@@ -283,13 +292,14 @@ def test_update_person(self, person: Person, rf: RequestFactory):
 
         person.refresh_from_db()
         assert person.bio == new_bio
+        assert isinstance(response, HttpResponseRedirect)
         assert response.status_code == HTTPStatus.FOUND
         assert response.url == person.get_absolute_url()
 
 
 class TestPersonFollowingNotesView:
     def test_get_queryset(self, person: Person, rf: RequestFactory):
-        person_followed = PersonFactory()
+        person_followed = PersonFactory.create()
         person.follow(person_followed)
 
         note_from_followed = NoteFactory(author=person_followed)

democrasite/users/api/views.py

@@ -25,7 +25,9 @@ class UserViewSet(RetrieveModelMixin, ListModelMixin, UpdateModelMixin, GenericV
     lookup_field = "username"
 
     def get_queryset(self, *args, **kwargs):
-        return self.queryset.filter(id=self.request.user.id)
+        user_id = self.request.user.id
+        assert user_id is not None
+        return self.queryset.filter(id=user_id)
 
     @action(detail=False)
     def me(self, request):

democrasite/users/forms.py

@@ -18,7 +18,7 @@ class Meta(admin_forms.UserChangeForm.Meta):  # type: ignore[name-defined]
         model = User
 
 
-class UserAdminCreationForm(admin_forms.AdminUserCreationForm):  # type: ignore[name-defined]
+class UserAdminCreationForm(admin_forms.AdminUserCreationForm):
     """Override UserCreationForm to use custom User model."""
 
     class Meta(admin_forms.UserCreationForm.Meta):  # type: ignore[name-defined]

democrasite/users/tests/api/test_views.py

@@ -26,7 +26,7 @@ def test_me(self, api_rf: APIRequestFactory, user: User, view: UserViewSet):
 
         view.request = request
 
-        response = view.me(request)  # type: ignore[call-arg,arg-type]
+        response = view.me(request)  # type: ignore[call-arg,arg-type,misc]
 
         assert response.data == {
             "username": user.username,

democrasite/users/tests/factories.py

@@ -11,7 +11,7 @@ class UserFactory(DjangoModelFactory[User]):
     name = Faker("name")
 
     @post_generation
-    def password(obj: User, create: bool, extracted: str, **kwargs):  # type: ignore[misc] # noqa: N805, FBT001
+    def password(obj: User, create: bool, extracted: str, **kwargs):  # noqa: N805, FBT001
         password = extracted or Faker(
             "password",
             length=42,

democrasite/users/tests/test_views.py

@@ -5,6 +5,8 @@
 from django.contrib.messages import get_messages
 from django.contrib.messages.middleware import MessageMiddleware
 from django.contrib.sessions.middleware import SessionMiddleware
+from django.http import HttpRequest
+from django.template.response import TemplateResponse
 from django.test import RequestFactory
 from factory.faker import faker
 
@@ -17,6 +19,9 @@
 
 
 class TestUserUpdateView:
+    def dummy_get_response(self, request: HttpRequest):
+        pass
+
     def test_get_success_url(self, user: User, rf: RequestFactory):
         view = UserUpdateView()
         request = rf.get("/fake-url/")
@@ -40,8 +45,8 @@ def test_form_valid(self, user: User, rf: RequestFactory):
         request = rf.get("/fake-url/")
 
         # Add the session/message middleware to the request
-        SessionMiddleware(lambda r: None).process_request(request)
-        MessageMiddleware(lambda r: None).process_request(request)
+        SessionMiddleware(self.dummy_get_response).process_request(request)
+        MessageMiddleware(self.dummy_get_response).process_request(request)
         request.user = user
 
         view.request = request
@@ -88,7 +93,7 @@ def test_authenticated(self, user: User, rf: RequestFactory):
     def test_github_authenticated(self, user: User, rf: RequestFactory):
         request = rf.get("/fake-url/")
         request.user = user
-        user.socialaccount_set.add(
+        user.socialaccount_set.add(  # type: ignore[attr-defined]
             SocialAccount.objects.create(
                 user=user,
                 provider="github",
@@ -98,7 +103,9 @@ def test_github_authenticated(self, user: User, rf: RequestFactory):
 
         response = user_detail_view(request, username=user.username)
 
+        assert isinstance(response, TemplateResponse)
         assert response.status_code == HTTPStatus.OK
+        assert response.context_data is not None
         assert (
             response.context_data["empty_message"]
             == "You haven't proposed any bills yet."

requirements/base.txt

@@ -9,6 +9,7 @@ django-celery-beat==2.8.1  # https://github.com/celery/django-celery-beat
 flower==2.0.1  # https://github.com/mher/flower
 PyGithub==2.8.1  # https://github.com/PyGithub/PyGithub
 unidiff==0.7.5  # https://github.com/matiasb/python-unidiff
+types-requests==2.32.4.20260107  # https://github.com/python/typeshed
 
 # Django
 # ------------------------------------------------------------------------------