Adjust code to meet typing, linting and styling guidelines

Change-Id: Ic84a61c37159221b4dd0e18bb6a1ef3e2bfa4365

Author: oscpache

mysql-connector-python/lib/mysql/connector/_decorating.py

@@ -29,8 +29,10 @@
 """Decorators Hub."""
 
 import functools
-from typing import TYPE_CHECKING, Any, Callable
 import warnings
+
+from typing import TYPE_CHECKING, Any, Callable
+
 from .constants import RefreshOption
 
 if TYPE_CHECKING:

mysql-connector-python/lib/mysql/connector/aio/_decorating.py

@@ -29,8 +29,10 @@
 """Decorators Hub."""
 
 import functools
-from typing import TYPE_CHECKING, Any, Callable
 import warnings
+
+from typing import TYPE_CHECKING, Any, Callable
+
 from ..constants import RefreshOption
 
 if TYPE_CHECKING:

mysql-connector-python/lib/mysql/connector/aio/connection.py

@@ -99,6 +99,7 @@
     warn_ciphersuites_deprecated,
     warn_tls_version_deprecated,
 )
+from ._decorating import cmd_refresh_verify_options
 from .abstracts import MySQLConnectionAbstract, MySQLCursorAbstract, ServerInfo
 from .charsets import charsets
 from .cursor import (
@@ -118,7 +119,6 @@
 from .logger import logger
 from .network import MySQLTcpSocket, MySQLUnixSocket
 from .utils import handle_read_write_timeout
-from ._decorating import cmd_refresh_verify_options
 
 
 class MySQLConnection(MySQLConnectionAbstract):

mysql-connector-python/lib/mysql/connector/aio/network.py

@@ -570,7 +570,7 @@ async def close_connection(self) -> None:
                 if self._writer.transport is not None:
                     self._writer.transport.abort()
                 await self._writer.wait_closed()
-            except Exception as _:
+            except Exception as _:  # pylint: disable=broad-exception-caught)
                 # we can ignore issues like ConnectionRefused or ConnectionAborted
                 # as these instances might popup if the connection was closed due to timeout issues
                 pass

mysql-connector-python/lib/mysql/connector/connection.py

@@ -57,6 +57,7 @@
 )
 
 from . import version
+from ._decorating import cmd_refresh_verify_options
 from .abstracts import MySQLConnectionAbstract
 from .authentication import MySQLAuthenticator, get_auth_plugin
 from .constants import (
@@ -121,7 +122,6 @@
     warn_ciphersuites_deprecated,
     warn_tls_version_deprecated,
 )
-from ._decorating import cmd_refresh_verify_options
 
 if TYPE_CHECKING:
     from .abstracts import CMySQLPrepStmt
@@ -1635,7 +1635,7 @@ def cmd_stmt_execute(
 
     def cmd_stmt_close(
         self,
-        statement_id: int,
+        statement_id: int,  # type: ignore[override]
         **kwargs: Any,
     ) -> None:
         """Deallocate a prepared MySQL statement
@@ -1654,7 +1654,7 @@ def cmd_stmt_close(
 
     def cmd_stmt_send_long_data(
         self,
-        statement_id: int,
+        statement_id: int,  # type: ignore[override]
         param_id: int,
         data: BinaryIO,
         **kwargs: Any,
@@ -1699,7 +1699,7 @@ def cmd_stmt_send_long_data(
 
     def cmd_stmt_reset(
         self,
-        statement_id: int,
+        statement_id: int,  # type: ignore[override]
         **kwargs: Any,
     ) -> None:
         """Reset data for prepared statement sent as long data

mysql-connector-python/lib/mysql/connector/connection_cext.py

@@ -50,6 +50,7 @@
 )
 
 from . import version
+from ._decorating import cmd_refresh_verify_options
 from .abstracts import CMySQLPrepStmt, MySQLConnectionAbstract
 from .constants import (
     ClientFlag,
@@ -82,7 +83,6 @@
     warn_ciphersuites_deprecated,
     warn_tls_version_deprecated,
 )
-from ._decorating import cmd_refresh_verify_options
 
 HAVE_CMYSQL = False
 
@@ -671,7 +671,7 @@ def fetch_eof_status(self) -> Optional[CextEofPacketType]:
 
         return None
 
-    def cmd_stmt_prepare(  # type: ignore[override]
+    def cmd_stmt_prepare(
         self,
         statement: bytes,
         **kwargs: Any,
@@ -688,7 +688,7 @@ def cmd_stmt_prepare(  # type: ignore[override]
             raise InterfaceError(str(err)) from err
 
     @with_context_propagation
-    def cmd_stmt_execute(  # type: ignore[override]
+    def cmd_stmt_execute(
         self,
         statement_id: CMySQLPrepStmt,
         *args: Any,

mysql-connector-python/lib/mysql/connector/network.py

@@ -162,7 +162,7 @@ def _send_pkt(self, sock: socket.socket, address: str, pkt: bytes) -> None:
         """Write packet to the comm channel."""
         try:
             sock.sendall(pkt)
-        except (socket.timeout, TimeoutError) as err:
+        except TimeoutError as err:
             raise WriteTimeoutError(errno=3024) from err
         except IOError as err:
             raise OperationalError(
@@ -241,8 +241,8 @@ def recv(self, sock: socket.socket, address: str) -> bytearray:
 
             # Read the payload, and return packet
             return header + self._recv_chunk(sock, size=payload_len)
-        except (socket.timeout, TimeoutError) as err:
-            raise ReadTimeoutError(errno=3024, msg=err) from err
+        except TimeoutError as err:
+            raise ReadTimeoutError(errno=3024, msg=err.strerror) from err
         except IOError as err:
             raise OperationalError(
                 errno=2055, values=(address, _strioerror(err))
@@ -427,7 +427,7 @@ def recv(self, sock: socket.socket, address: str) -> bytearray:
                     struct.unpack("<I", header[4:7] + b"\x00")[0],
                 )
                 self._recv_compressed_pkt(sock, compressed_pll, uncompressed_pll)
-            except (socket.timeout, TimeoutError) as err:
+            except TimeoutError as err:
                 raise ReadTimeoutError(errno=3024) from err
             except IOError as err:
                 raise OperationalError(
@@ -700,7 +700,7 @@ def open_connection(self) -> None:
             )
             self.sock.settimeout(self._connection_timeout)
             self.sock.connect(self.unix_socket)
-        except (socket.timeout, TimeoutError) as err:
+        except TimeoutError as err:
             raise ConnectionTimeoutError(
                 errno=2002,
                 values=(
@@ -795,7 +795,7 @@ def open_connection(self) -> None:
             self.sock = socket.socket(self._family, socktype, proto)
             self.sock.settimeout(self._connection_timeout)
             self.sock.connect(sockaddr)
-        except (socket.timeout, TimeoutError) as err:
+        except TimeoutError as err:
             raise ConnectionTimeoutError(
                 errno=2003,
                 values=(

mysql-connector-python/lib/mysql/connector/optionfiles.py

@@ -70,8 +70,10 @@ def read_option_files(**config: Union[str, List[str]]) -> Dict[str, Any]:
         )
         del config["option_files"]
 
-        config_from_file = option_parser.get_groups_as_dict_with_priority(*groups)
-        config_options: Dict[str, Tuple[str, int]] = {}
+        config_from_file: Dict[str, Any] = (
+            option_parser.get_groups_as_dict_with_priority(*groups)
+        )
+        config_options: Dict[str, Tuple[str, int, str]] = {}
         for group in groups:
             try:
                 for option, value in config_from_file[group].items():

pyproject.toml

@@ -46,6 +46,8 @@ skip_glob = [
     'mysql-connector-python/lib/mysql/connector/locales/eng',
     'mysqlx-connector-python/lib/mysqlx/locales/eng',
     'mysqlx-connector-python/lib/mysqlx/protobuf',
+    'mysqlx-connector-python/lib/mysqlx/tls_ciphers.py',
+    'mysql-connector-python/lib/mysql/tls_ciphers.py',
     'venv/*',
 ]