mypy: fix mypy errors in wladmin module. Rel: #3703

weblate/billing/models.py

@@ -158,7 +158,7 @@
     projects = models.ManyToManyField(
         Project, blank=True, verbose_name=gettext_lazy("Billed projects")
     )
     owners = models.ManyToManyField(
         User, blank=True, verbose_name=gettext_lazy("Billing owners")
     )
     state = models.IntegerField(
@@ -193,7 +193,7 @@
     # with payment processor
     payment = models.JSONField(editable=False, default=dict, encoder=DjangoJSONEncoder)
 
-    objects = BillingManager.from_queryset(BillingQuerySet)()
+    objects: BillingQuerySet = BillingManager.from_queryset(BillingQuerySet)()
 
     class Meta:
         verbose_name = "Customer billing"
@@ -201,7 +201,7 @@
 
     def __str__(self) -> str:
         projects = self.projects_display
         owners = self.owners.order()
         if projects:
             base = projects
         elif owners:
@@ -356,7 +356,7 @@
     @admin.display(description=gettext_lazy("Last invoice"))
     def last_invoice(self):
         try:
             invoice = self.invoice_set.order_by("-start")[0]
         except IndexError:
             return gettext("N/A")
         return f"{invoice.start} - {invoice.end}"
@@ -397,10 +397,10 @@
         """
         end = timezone.now()
         if not now:
             end -= timedelta(days=settings.BILLING_GRACE_PERIOD)
         return (
             (self.plan.is_free and self.state == Billing.STATE_ACTIVE)
             or self.invoice_set.filter(end__gte=end).exists()
             or self.state == Billing.STATE_TRIAL
         )
 
@@ -413,7 +413,7 @@
         if self.check_expiry():
             self.expiry = None
             self.removal = timezone.now() + timedelta(
                 days=settings.BILLING_REMOVAL_PERIOD
             )
             modified = True
 
@@ -543,7 +543,7 @@
         verbose_name_plural = "Invoices"
 
     def __str__(self) -> str:
         return f"{self.start} - {self.end}: {self.billing if self.billing_id else None}"
 
     @cached_property
     def filename(self) -> str | None:
@@ -566,7 +566,7 @@
         if self.end <= self.start:
             raise ValidationError("Start has be to before end!")
 
         if not self.billing_id:
             return
 
         overlapping = Invoice.objects.filter(
@@ -609,7 +609,7 @@
         instance = instance.project
     # Collect billings to update for delete_project_bill
     instance.billings_to_update = list(
         instance.billing_set.values_list("pk", flat=True)
     )
 
 

weblate/wladmin/models.py

@@ -328,12 +328,12 @@
 
 def get_support_status(request: AuthenticatedHttpRequest) -> SupportStatusDict:
     if hasattr(request, "weblate_support_status"):
-        support_status = request.weblate_support_status
+        support_status: SupportStatusDict = request.weblate_support_status
     else:
         support_status = cache.get(SUPPORT_STATUS_CACHE_KEY)
         if support_status is None:
             support_status_instance = SupportStatus.objects.get_current()
-            support_status: SupportStatusDict = {
+            support_status = {
                 "has_support": support_status_instance.name != "community",
                 "in_limits": support_status_instance.in_limits,
             }

weblate/wladmin/sites.py

@@ -12,7 +12,7 @@
 from django.utils.translation import gettext, gettext_lazy
 
 if TYPE_CHECKING:
-    from weblate.auth.models import AuthenticatedHttpRequest
+    from django.http import HttpRequest
 
 
 class WeblateAdminSite(AdminSite):
@@ -38,7 +38,7 @@ def site_url(self):
             return settings.URL_PREFIX
         return "/"
 
-    def each_context(self, request: AuthenticatedHttpRequest):
+    def each_context(self, request: HttpRequest):
         from weblate.wladmin.models import ConfigurationError
 
         result = super().each_context(request)

weblate/wladmin/views.py

@@ -50,6 +50,7 @@
 from weblate.utils.version import GIT_LINK, GIT_REVISION
 from weblate.utils.views import show_form_errors
 from weblate.vcs.ssh import (
+    KeyType,
     add_host_key,
     can_generate_key,
     generate_ssh_key,
@@ -322,9 +323,8 @@ def performance(request: AuthenticatedHttpRequest) -> HttpResponse:
 
 @management_access
 def ssh_key(request: AuthenticatedHttpRequest) -> HttpResponse:
-    filename, data = get_key_data_raw(
-        key_type=request.GET.get("type", "rsa"), kind="private"
-    )
+    key_type = cast(KeyType, request.GET.get("type", "rsa"))
+    filename, data = get_key_data_raw(key_type=key_type, kind="private")
     if data is None:
         raise Http404
 
@@ -345,7 +345,8 @@ def ssh(request: AuthenticatedHttpRequest) -> HttpResponse:
 
     # Generate key if it does not exist yet
     if can_generate and action == "generate":
-        generate_ssh_key(request, key_type=request.POST.get("type", "rsa"))
+        key_type = cast(KeyType, request.POST.get("type", "rsa"))
+        generate_ssh_key(request, key_type=key_type)
         return redirect("manage-ssh")
 
     # Read key data if it exists
@@ -429,14 +430,14 @@ def users_check(request: AuthenticatedHttpRequest) -> HttpResponse:
     # Legacy links for care.weblate.org integration
     if "email" in data and "q" not in data:
         data = data.copy()
-        data["q"] = data["email"]
+        data.setlist("q", data.getlist("email"))
     form = AdminUserSearchForm(data)
 
     user_list = None
     if form.is_valid():
-        user_list = User.objects.search(
-            form.cleaned_data.get("q", ""), parser=form.fields["q"].parser
-        )[:2]
+        parser = getattr(form.fields["q"], "parser", "unit")
+        query = form.cleaned_data.get("q", "")
+        user_list = User.objects.search(query, parser=parser)[:2]
         if user_list.count() != 1:
             return redirect_param(
                 "manage-users", "?q={}".format(quote(form.cleaned_data["q"]))