Fix isort, black, pylint and mypy issues

oscpache · oscpache · commit 9c4b1dfc3d25 · 2024-03-08T15:30:47.000-06:00
diff --git a/mysql-connector-python/lib/mysql/connector/aio/abstracts.py b/mysql-connector-python/lib/mysql/connector/aio/abstracts.py
@@ -260,9 +260,9 @@ def __init__(
         self._in_transaction: bool = False
         self._oci_config_file: Optional[str] = None
         self._oci_config_profile: Optional[str] = None
-        self._webauthn_callback: Optional[
-            Union[str, Callable[[str], None]]
-        ] = webauthn_callback
+        self._webauthn_callback: Optional[Union[str, Callable[[str], None]]] = (
+            webauthn_callback
+        )
 
         self.converter: Optional[MySQLConverter] = None
 
diff --git a/mysql-connector-python/lib/mysql/connector/aio/plugins/authentication_kerberos_client.py b/mysql-connector-python/lib/mysql/connector/aio/plugins/authentication_kerberos_client.py
@@ -203,9 +203,11 @@ def get_store() -> dict:
         """
         krb5ccname = os.environ.get(
             "KRB5CCNAME",
-            f"/tmp/krb5cc_{os.getuid()}"
-            if os.name == "posix"
-            else Path("%TEMP%").joinpath("krb5cc"),
+            (
+                f"/tmp/krb5cc_{os.getuid()}"
+                if os.name == "posix"
+                else Path("%TEMP%").joinpath("krb5cc")
+            ),
         )
         if not krb5ccname:
             raise InterfaceError(
diff --git a/mysql-connector-python/lib/mysql/connector/aio/protocol.py b/mysql-connector-python/lib/mysql/connector/aio/protocol.py
@@ -251,7 +251,10 @@ async def read_binary_result(  # type: ignore[override]
         columns: List[DescriptionType],
         count: int = 1,
         charset: str = "utf-8",
-    ) -> Tuple[List[Tuple[BinaryProtocolType, ...]], Optional[EofPacketType],]:
+    ) -> Tuple[
+        List[Tuple[BinaryProtocolType, ...]],
+        Optional[EofPacketType],
+    ]:
         """Read MySQL binary protocol result.
 
         Reads all or given number of binary resultset rows from the socket.
@@ -280,7 +283,10 @@ async def read_binary_result(  # type: ignore[override]
     # pylint: disable=invalid-overridden-method
     async def read_text_result(  # type: ignore[override]
         self, sock: MySQLSocket, version: Tuple[int, ...], count: int = 1
-    ) -> Tuple[List[Tuple[Optional[bytes], ...]], Optional[EofPacketType],]:
+    ) -> Tuple[
+        List[Tuple[Optional[bytes], ...]],
+        Optional[EofPacketType],
+    ]:
         """Read MySQL text result.
 
         Reads all or given number of rows from the socket.
diff --git a/mysql-connector-python/lib/mysql/connector/conversion.py b/mysql-connector-python/lib/mysql/connector/conversion.py
@@ -752,10 +752,11 @@ def _vector_to_python(
         """
         if value is None or isinstance(value, array.array):
             return value
-        elif isinstance(value, (bytes, bytearray)):
+
+        if isinstance(value, (bytes, bytearray)):
             return array.array(MYSQL_VECTOR_TYPE_CODE, value)
-        else:
-            raise TypeError(f"Got unsupported type {value.__class__.__name__}")
+
+        raise TypeError(f"Got unsupported type {value.__class__.__name__}")
 
     _long_blob_to_python = _blob_to_python
     _medium_blob_to_python = _blob_to_python
diff --git a/mysql-connector-python/lib/mysql/connector/cursor_cext.py b/mysql-connector-python/lib/mysql/connector/cursor_cext.py
@@ -102,7 +102,6 @@
 
 
 class _ParamSubstitutor:
-
     """
     Substitutes parameters into SQL statement.
     """
@@ -128,7 +127,6 @@ def remaining(self) -> int:
 
 
 class CMySQLCursor(MySQLCursorAbstract):
-
     """Default cursor for interacting with MySQL using C Extension"""
 
     _raw: bool = False
@@ -746,6 +744,7 @@ def stored_results(self) -> Generator[CMySQLCursor, None, None]:
 
         Returns a iterator.
         """
+        # pylint: disable=use-yield-from
         for result in self._stored_results:
             yield result  # type: ignore[misc]
         self._stored_results = []
@@ -819,7 +818,6 @@ def __str__(self) -> str:
 
 
 class CMySQLCursorBuffered(CMySQLCursor):
-
     """Cursor using C Extension buffering results"""
 
     def __init__(self, connection: CMySQLConnection):
diff --git a/mysql-connector-python/lib/mysql/connector/custom_types.py b/mysql-connector-python/lib/mysql/connector/custom_types.py
@@ -33,7 +33,6 @@
 
 
 class HexLiteral(str):
-
     """Class holding MySQL hex literals"""
 
     charset: str = ""
diff --git a/mysql-connector-python/lib/mysql/connector/opentelemetry/instrumentation.py b/mysql-connector-python/lib/mysql/connector/opentelemetry/instrumentation.py
@@ -212,9 +212,11 @@ def with_cnx_span_attached(method: Callable) -> Callable:
 
     def wrapper(cnx: "MySQLConnectionAbstract", *args: Any, **kwargs: Any) -> Any:
         """Connection span attacher decorator."""
-        with trace.use_span(
-            cnx._span, end_on_exit=False
-        ) if cnx._span and cnx._span.is_recording() else nullcontext():
+        with (
+            trace.use_span(cnx._span, end_on_exit=False)
+            if cnx._span and cnx._span.is_recording()
+            else nullcontext()
+        ):
             return method(cnx, *args, **kwargs)
 
     return wrapper
@@ -235,12 +237,16 @@ def wrapper(cnx: TracedMySQLConnection, *args: Any, **kwargs: Any) -> Any:
             "connection_type": cnx.get_wrapped_class(),
         }
 
-        with cnx._tracer.start_as_current_span(
-            name=method.__name__.upper(),
-            kind=trace.SpanKind.CLIENT,
-            links=[trace.Link(cnx._span.get_span_context())],
-            attributes=query_span_attributes,
-        ) if cnx._span and cnx._span.is_recording() else nullcontext():
+        with (
+            cnx._tracer.start_as_current_span(
+                name=method.__name__.upper(),
+                kind=trace.SpanKind.CLIENT,
+                links=[trace.Link(cnx._span.get_span_context())],
+                attributes=query_span_attributes,
+            )
+            if cnx._span and cnx._span.is_recording()
+            else nullcontext()
+        ):
             return method(cnx, *args, **kwargs)
 
     return wrapper
diff --git a/mysql-connector-python/lib/mysql/connector/plugins/authentication_kerberos_client.py b/mysql-connector-python/lib/mysql/connector/plugins/authentication_kerberos_client.py
@@ -202,9 +202,11 @@ def get_store() -> dict:
         """
         krb5ccname = os.environ.get(
             "KRB5CCNAME",
-            f"/tmp/krb5cc_{os.getuid()}"
-            if os.name == "posix"
-            else Path("%TEMP%").joinpath("krb5cc"),
+            (
+                f"/tmp/krb5cc_{os.getuid()}"
+                if os.name == "posix"
+                else Path("%TEMP%").joinpath("krb5cc")
+            ),
         )
         if not krb5ccname:
             raise InterfaceError(
diff --git a/mysql-connector-python/lib/mysql/connector/protocol.py b/mysql-connector-python/lib/mysql/connector/protocol.py
@@ -618,7 +618,10 @@ def parse_statistics(packet: bytes, with_header: bool = True) -> StatsPacketType
 
     def read_text_result(
         self, sock: MySQLSocket, version: Tuple[int, ...], count: int = 1
-    ) -> Tuple[List[Tuple[Optional[bytes], ...]], Optional[EofPacketType],]:
+    ) -> Tuple[
+        List[Tuple[Optional[bytes], ...]],
+        Optional[EofPacketType],
+    ]:
         """Read MySQL text result
 
         Reads all or given number of rows from the socket.
@@ -821,7 +824,10 @@ def read_binary_result(
         columns: List[DescriptionType],
         count: int = 1,
         charset: str = "utf-8",
-    ) -> Tuple[List[Tuple[BinaryProtocolType, ...]], Optional[EofPacketType],]:
+    ) -> Tuple[
+        List[Tuple[BinaryProtocolType, ...]],
+        Optional[EofPacketType],
+    ]:
         """Read MySQL binary protocol result
 
         Reads all or given number of binary resultset rows from the socket.
diff --git a/mysqlx-connector-python/lib/mysqlx/constants.py b/mysqlx-connector-python/lib/mysqlx/constants.py
@@ -29,6 +29,7 @@
 """Constants."""
 
 from enum import Enum
+
 from . import tls_ciphers
 
 
diff --git a/mysqlx-connector-python/lib/mysqlx/expr.py b/mysqlx-connector-python/lib/mysqlx/expr.py
@@ -973,9 +973,9 @@ def parse_place_holder(self, token: Token) -> MessageType:
             msg_expr["position"] = self.placeholder_name_to_position[place_holder_name]
         else:
             msg_expr["position"] = self.positional_placeholder_count
-            self.placeholder_name_to_position[
-                place_holder_name
-            ] = self.positional_placeholder_count
+            self.placeholder_name_to_position[place_holder_name] = (
+                self.positional_placeholder_count
+            )
             self.positional_placeholder_count += 1
         return msg_expr
 
diff --git a/mysqlx-connector-python/lib/mysqlx/helpers.py b/mysqlx-connector-python/lib/mysqlx/helpers.py
@@ -36,7 +36,7 @@
 
 from typing import Any, Callable, List, Optional, Union
 
-from .constants import TLS_CIPHER_SUITES, SUPPORTED_TLS_VERSIONS
+from .constants import SUPPORTED_TLS_VERSIONS, TLS_CIPHER_SUITES
 from .errors import InterfaceError
 from .types import EscapeTypes, StrOrBytes
 
diff --git a/mysqlx-connector-python/lib/mysqlx/utils.py b/mysqlx-connector-python/lib/mysqlx/utils.py
@@ -31,9 +31,10 @@
 import os
 import subprocess
 import sys
+import warnings
 
 from typing import Dict, Optional, Tuple
-import warnings
+
 from .tls_ciphers import DEPRECATED_TLS_CIPHERSUITES, DEPRECATED_TLS_VERSIONS
 
 
