Fix linting issues detected by the latest pylint version

Change-Id: I54bd251f47c65f082dce9687214b3f7c4b93ac25

Author: nmariz

lib/mysql/connector/connection_cext.py

@@ -79,12 +79,12 @@
         CMySQLCursorPreparedRaw,
         CMySQLCursorRaw,
     )
+
+    HAVE_CMYSQL = True
 except ImportError as exc:
     raise ImportError(
         f"MySQL Connector/Python C Extension not available ({exc})"
     ) from exc
-else:
-    HAVE_CMYSQL = True
 
 
 class CMySQLConnection(MySQLConnectionAbstract):

lib/mysql/connector/constants.py

@@ -776,8 +776,10 @@ def get_default_collation(cls, charset: Union[int, str]) -> Tuple[str, str, int]
             try:
                 info = cls.desc[charset]
                 return info[1], info[0], charset
-            except (IndexError, KeyError):
-                ProgrammingError(f"Character set ID '{charset}' unsupported")
+            except (IndexError, KeyError) as err:
+                raise ProgrammingError(
+                    f"Character set ID '{charset}' unsupported"
+                ) from err
 
         for cid, info in enumerate(cls.desc):
             if info is None:
@@ -811,8 +813,8 @@ def get_charset_info(
             try:
                 info = cls.desc[charset]
                 return (charset, info[0], info[1])
-            except IndexError:
-                ProgrammingError(f"Character set ID {charset} unknown")
+            except IndexError as err:
+                raise ProgrammingError(f"Character set ID {charset} unknown") from err
 
         if charset in ("utf8", "utf-8") and cls.mysql_version == (8, 0):
             charset = "utf8mb4"

lib/mysql/connector/cursor.py

@@ -434,11 +434,11 @@ def _process_params_dict(
         self, params: ParamsDictType
     ) -> Dict[bytes, Union[bytes, Decimal]]:
         """Process query parameters given as dictionary"""
+        res: Dict[bytes, Any] = {}
         try:
             to_mysql = self._connection.converter.to_mysql
             escape = self._connection.converter.escape
             quote = self._connection.converter.quote
-            res: Dict[bytes, Any] = {}
             for key, value in params.items():
                 conv = value
                 conv = to_mysql(conv)
@@ -450,20 +450,17 @@ def _process_params_dict(
             raise ProgrammingError(
                 f"Failed processing pyformat-parameters; {err}"
             ) from err
-        else:
-            return res
+        return res
 
     def _process_params(
         self, params: ParamsSequenceType
     ) -> Tuple[Union[bytes, Decimal], ...]:
         """Process query parameters."""
+        res = params[:]
         try:
-            res = params[:]
-
             to_mysql = self._connection.converter.to_mysql
             escape = self._connection.converter.escape
             quote = self._connection.converter.quote
-
             res = [to_mysql(value) for value in res]
             res = [escape(value) for value in res]
             res = [
@@ -474,8 +471,7 @@ def _process_params(
             raise ProgrammingError(
                 f"Failed processing format-parameters; {err}"
             ) from err
-        else:
-            return tuple(res)
+        return tuple(res)
 
     def _handle_noresultset(self, res: ResultType) -> None:
         """Handles result of execute() when there is no result set"""
@@ -1094,10 +1090,8 @@ def _fetch_row(self, raw: bool = False) -> Optional[RowType]:
             row = self._rows[self._next_row]
         except (IndexError, TypeError):
             return None
-        else:
-            self._next_row += 1
-            return row
-        return None
+        self._next_row += 1
+        return row
 
     def fetchone(self) -> Optional[RowType]:
         """Return next row of a query result set.

lib/mysql/connector/cursor_cext.py

@@ -806,9 +806,7 @@ def _fetch_row(self) -> Optional[RowType]:
             row = self._rows[self._next_row]
         except IndexError:
             return None
-        else:
-            self._next_row += 1
-
+        self._next_row += 1
         return row
 
     def fetchall(self) -> List[RowType]:

lib/mysql/connector/django/base.py

@@ -1,4 +1,4 @@
-# Copyright (c) 2020, 2022, Oracle and/or its affiliates.
+# Copyright (c) 2020, 2023, Oracle and/or its affiliates.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License, version 2.0, as
@@ -515,8 +515,7 @@ def is_usable(self) -> bool:
             self.connection.ping()
         except Error:
             return False
-        else:
-            return True
+        return True
 
     @cached_property
     @staticmethod

lib/mysql/connector/errors.py

@@ -1,4 +1,4 @@
-# Copyright (c) 2009, 2022, Oracle and/or its affiliates.
+# Copyright (c) 2009, 2023, Oracle and/or its affiliates.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License, version 2.0, as
@@ -287,8 +287,7 @@ def get_exception(packet: bytes) -> ErrorTypes:
             errmsg = packet.decode("utf8")
     except (IndexError, UnicodeError) as err:
         return InterfaceError(f"Failed getting Error information ({err})")
-    else:
-        return get_mysql_exception(errno, errmsg, sqlstate)  # type: ignore[arg-type]
+    return get_mysql_exception(errno, errmsg, sqlstate)
 
 
 _SQLSTATE_CLASS_EXCEPTION: Dict[str, ErrorClassTypes] = {

lib/mysql/connector/network.py

@@ -1,4 +1,4 @@
-# Copyright (c) 2012, 2022, Oracle and/or its affiliates.
+# Copyright (c) 2012, 2023, Oracle and/or its affiliates.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License, version 2.0, as
@@ -590,8 +590,8 @@ def open_connection(self) -> None:
             raise InterfaceError(
                 errno=2003, values=(self.get_address(), _strioerror(err))
             ) from err
-        else:
-            (self._family, socktype, proto, _, sockaddr) = addrinfo
+
+        (self._family, socktype, proto, _, sockaddr) = addrinfo
 
         # Instanciate the socket and connect
         try:

lib/mysqlx/connection.py

@@ -1,4 +1,4 @@
-# Copyright (c) 2016, 2022, Oracle and/or its affiliates.
+# Copyright (c) 2016, 2023, Oracle and/or its affiliates.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License, version 2.0, as
@@ -1687,8 +1687,8 @@ def queue_connection(self, cnx: PooledConnection) -> None:
             cnx.reset_session()
         try:
             self.put(cnx, block=False)
-        except queue.Full:
-            PoolError("Failed adding connection; queue is full")
+        except queue.Full as err:
+            raise PoolError("Failed adding connection; queue is full") from err
 
     def track_connection(self, connection: PooledConnection) -> None:
         """Tracks connection in order of close it when client.close() is invoke."""

lib/mysqlx/errors.py

@@ -1,4 +1,4 @@
-# Copyright (c) 2016, 2022, Oracle and/or its affiliates.
+# Copyright (c) 2016, 2023, Oracle and/or its affiliates.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License, version 2.0, as
@@ -209,8 +209,7 @@ def get_exception(packet: bytes) -> ErrorTypes:
             errmsg = packet.decode("utf8")
     except (IndexError, ValueError) as err:
         return InterfaceError(f"Failed getting Error information ({err})")
-    else:
-        return get_mysql_exception(errno, errmsg, sqlstate)  # type: ignore[arg-type]
+    return get_mysql_exception(errno, errmsg, sqlstate)
 
 
 _SQLSTATE_CLASS_EXCEPTION: Dict[str, ErrorClassTypes] = {