Fix for flake8-bugbear rules B017 and B028 (#985)

Author: adamchainz

src/django_mysql/cache.py

@@ -524,7 +524,7 @@ def decode(self, value: bytes, value_type: _EncodedKeyType) -> Any:
             return pickle.loads(raw_value)
 
         raise ValueError(
-            f"Unknown value_type '{value_type}' read from the cache table."
+            f"Unknown value_type {value_type!r} read from the cache table."
         )
 
     def _maybe_cull(self) -> None:

src/django_mysql/checks.py

@@ -46,7 +46,7 @@ def check_variables(
 
 def innodb_strict_mode_warning(alias: str) -> checks.Warning:
     return checks.Warning(
-        f"InnoDB Strict Mode is not set for database connection '{alias}'",
+        f"InnoDB Strict Mode is not set for database connection {alias!r}",
         hint=(
             "InnoDB Strict Mode escalates several warnings around "
             + "InnoDB-specific statements into errors. It's recommended you "
@@ -61,7 +61,7 @@ def innodb_strict_mode_warning(alias: str) -> checks.Warning:
 
 def utf8mb4_warning(alias: str) -> checks.Warning:
     return checks.Warning(
-        f"The character set is not utf8mb4 for database connection '{alias}'",
+        f"The character set is not utf8mb4 for database connection {alias!r}",
         hint=(
             "The default 'utf8' character set does not include support for "
             + "all Unicode characters. It's strongly recommended you move to "

src/django_mysql/management/commands/cull_mysql_caches.py

@@ -41,13 +41,13 @@ def handle(
             try:
                 cache = caches[alias]
             except InvalidCacheBackendError:
-                raise CommandError(f"Cache '{alias}' does not exist")
+                raise CommandError(f"Cache {alias!r} does not exist")
 
             if not isinstance(cache, MySQLCache):  # pragma: no cover
                 continue
 
             if verbosity >= 1:
-                self.stdout.write(f"Deleting from cache '{alias}'... ", ending="")
+                self.stdout.write(f"Deleting from cache {alias!r}... ", ending="")
             num_deleted = cache.cull()
             if verbosity >= 1:
                 self.stdout.write(f"{num_deleted} entries deleted.")

src/django_mysql/management/commands/dbparams.py

@@ -57,9 +57,9 @@ def handle(
         try:
             connection = connections[alias]
         except ConnectionDoesNotExist:
-            raise CommandError(f"Connection '{alias}' does not exist")
+            raise CommandError(f"Connection {alias!r} does not exist")
         if connection.vendor != "mysql":
-            raise CommandError(f"{alias} is not a MySQL database connection")
+            raise CommandError(f"{alias!r} is not a MySQL database connection")
 
         if show_mysql and show_dsn:
             raise CommandError("Pass only one of --mysql and --dsn")

src/django_mysql/management/commands/mysql_cache_migration.py

@@ -39,7 +39,7 @@ def handle(self, *args: Any, aliases: list[str], **options: Any) -> None:
             try:
                 cache = caches[alias]
             except InvalidCacheBackendError:
-                raise CommandError(f"Cache '{alias}' does not exist")
+                raise CommandError(f"Cache {alias!r} does not exist")
 
             if not isinstance(cache, MySQLCache):  # pragma: no cover
                 continue

src/django_mysql/models/aggregates.py

@@ -78,7 +78,7 @@ def as_sql(
             sql.append(self.ordering.upper())
 
         if self.separator is not None:
-            sql.append(f" SEPARATOR '{self.separator}'")
+            sql.append(f" SEPARATOR '{self.separator}'")  # noqa: B028
 
         sql.append(")")
 

src/django_mysql/models/fields/dynamic.py

@@ -170,7 +170,7 @@ def _check_spec_recursively(
             if not isinstance(key, str):
                 errors.append(
                     checks.Error(
-                        f"The key '{key}' in 'spec{path}' is not a string",
+                        f"The key {str(key)!r} in 'spec{path}' is not a string",
                         hint="'spec' keys must be of type str, "
                         "'{}' is of type {}".format(key, type(key).__name__),
                         obj=self,

src/django_mysql/models/functions.py

@@ -383,7 +383,7 @@ def __init__(self, expression: ExpressionArgument, data_type: str) -> None:
             expression = Value(expression)
 
         if data_type not in KeyTransform.TYPE_MAP and data_type != "BINARY":
-            raise ValueError(f"Invalid data_type '{data_type}'")
+            raise ValueError(f"Invalid data_type {data_type!r}")
 
         super().__init__(expression, data_type=data_type)
 

src/django_mysql/status.py

@@ -35,7 +35,7 @@ def get(self, name: str) -> int | float | bool | str:
         with self.get_cursor() as cursor:
             num_rows = cursor.execute(self.query + " LIKE %s", (name,))
             if num_rows == 0:
-                raise KeyError(f"No such status variable '{name}'")
+                raise KeyError(f"No such status variable {name!r}")
             return self._cast(cursor.fetchone()[1])
 
     def get_many(self, names: Iterable[str]) -> dict[str, int | float | bool | str]:

src/django_mysql/test/utils.py

@@ -43,7 +43,7 @@ def __call__(self, test_func: Any) -> Any:
 
         if isinstance(test_func, type):
             if not issubclass(test_func, TestCase):
-                raise Exception(
+                raise TypeError(
                     "{} only works with TestCase classes.".format(
                         self.__class__.__name__
                     )