From eaf8fd4bde04475a156b1ecac96c081d8fd05464 Mon Sep 17 00:00:00 2001 From: Adam Johnson Date: Tue, 30 Aug 2022 10:57:13 +0100 Subject: [PATCH] more fixes --- src/django_mysql/models/fields/lists.py | 5 ++--- src/django_mysql/models/query.py | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/django_mysql/models/fields/lists.py b/src/django_mysql/models/fields/lists.py index dc3b3058..cdb85b24 100644 --- a/src/django_mysql/models/fields/lists.py +++ b/src/django_mysql/models/fields/lists.py @@ -7,7 +7,6 @@ from django.db.models import CharField, Field, IntegerField, Lookup, Model, TextField from django.db.models.expressions import BaseExpression from django.db.models.sql.compiler import SQLCompiler -from django.forms import Field as FormField from django.utils.translation import gettext_lazy as _ from django_mysql.forms import SimpleListField @@ -66,7 +65,7 @@ def check(self, **kwargs: Any) -> list[checks.CheckMessage]: return errors @property - def description(self) -> Any: + def description(self) -> str: return _("List of %(base_description)s") % { "base_description": self.base_field.description } @@ -146,7 +145,7 @@ def value_to_string(self, obj: Any) -> str: vals = self.value_from_object(obj) return self.get_prep_value(vals) - def formfield(self, **kwargs: Any) -> FormField: + def formfield(self, **kwargs: Any) -> Any: defaults = { "form_class": SimpleListField, "base_field": self.base_field.formfield(), diff --git a/src/django_mysql/models/query.py b/src/django_mysql/models/query.py index fb79fc8f..c3707d9d 100644 --- a/src/django_mysql/models/query.py +++ b/src/django_mysql/models/query.py @@ -699,7 +699,7 @@ def approx_count(queryset: models.QuerySet) -> int: ) # N.B. when we support more complex QuerySets they should be estimated # with 'EXPLAIN SELECT' - approx_count = cursor.fetchone()[0] + approx_count: int = cursor.fetchone()[0] return approx_count