Merge branch 'main' into dependabot/github_actions/all-dependencies-1f777302ca

Author: methane

ruff.toml

@@ -0,0 +1,13 @@
+[lint]
+ignore = [
+    "BLE001",
+    "DTZ001",
+    "EXE001",
+    "FLY002",
+    "N999",
+    "RUF012",
+    "S102",
+    "SIM115",
+    "TRY002",
+    "UP031",
+]

setup.py

@@ -2,10 +2,9 @@
 import os
 import subprocess
 import sys
-
-import setuptools
 from configparser import ConfigParser
 
+import setuptools
 
 release_info = {}
 with open("src/MySQLdb/release.py", encoding="utf-8") as f:
@@ -70,11 +69,11 @@ def get_config_posix(options=None):
         ("__version__", release_info["__version__"]),
     ]
 
-    ext_options = dict(
-        extra_compile_args=cflags,
-        extra_link_args=ldflags,
-        define_macros=define_macros,
-    )
+    ext_options = {
+        "extra_compile_args": cflags,
+        "extra_link_args": ldflags,
+        "define_macros": define_macros,
+    }
     # newer versions of gcc require libstdc++ if doing a static build
     if static:
         ext_options["language"] = "c++"
@@ -120,14 +119,14 @@ def get_config_win32(options):
         ("__version__", release_info["__version__"]),
     ]
 
-    ext_options = dict(
-        library_dirs=library_dirs,
-        libraries=libraries,
-        extra_link_args=extra_link_args,
-        include_dirs=include_dirs,
-        extra_objects=extra_objects,
-        define_macros=define_macros,
-    )
+    ext_options = {
+        "library_dirs": library_dirs,
+        "libraries": libraries,
+        "extra_link_args": extra_link_args,
+        "include_dirs": include_dirs,
+        "extra_objects": extra_objects,
+        "define_macros": define_macros,
+    }
     return ext_options
 
 

src/MySQLdb/__init__.py

@@ -13,8 +13,8 @@
 MySQLdb.converters module.
 """
 
-from .release import version_info
 from . import _mysql
+from .release import version_info
 
 if version_info != _mysql.version_info:
     raise ImportError(
@@ -24,32 +24,33 @@
     )
 
 
-from ._mysql import (
-    NotSupportedError,
-    OperationalError,
-    get_client_info,
-    ProgrammingError,
-    Error,
-    InterfaceError,
-    debug,
-    IntegrityError,
-    string_literal,
-    MySQLError,
-    DataError,
-    DatabaseError,
-    InternalError,
-    Warning,
-)
 from MySQLdb.constants import FIELD_TYPE
 from MySQLdb.times import (
     Date,
-    Time,
-    Timestamp,
     DateFromTicks,
+    Time,
     TimeFromTicks,
+    Timestamp,
     TimestampFromTicks,
 )
 
+from ._mysql import (
+    DatabaseError,
+    DataError,
+    Error,
+    IntegrityError,
+    InterfaceError,
+    InternalError,
+    MySQLError,
+    NotSupportedError,
+    OperationalError,
+    ProgrammingError,
+    Warning,
+    debug,
+    get_client_info,
+    string_literal,
+)
+
 threadsafety = 1
 apilevel = "2.0"
 paramstyle = "format"
@@ -95,7 +96,7 @@ def __eq__(self, other):
 
 
 def test_DBAPISet_set_equality():
-    assert STRING == STRING
+    assert STRING == STRING  # noqa
 
 
 def test_DBAPISet_set_inequality():
@@ -125,33 +126,33 @@ def Connect(*args, **kwargs):
 
 __all__ = [
     "BINARY",
+    "DATE",
+    "FIELD_TYPE",
+    "NUMBER",
+    "ROWID",
+    "STRING",
+    "TIME",
+    "TIMESTAMP",
     "Binary",
     "Connect",
     "Connection",
-    "DATE",
-    "Date",
-    "Time",
-    "Timestamp",
-    "DateFromTicks",
-    "TimeFromTicks",
-    "TimestampFromTicks",
+    "DBAPISet",
     "DataError",
     "DatabaseError",
+    "Date",
+    "DateFromTicks",
     "Error",
-    "FIELD_TYPE",
     "IntegrityError",
     "InterfaceError",
     "InternalError",
     "MySQLError",
-    "NUMBER",
     "NotSupportedError",
-    "DBAPISet",
     "OperationalError",
     "ProgrammingError",
-    "ROWID",
-    "STRING",
-    "TIME",
-    "TIMESTAMP",
+    "Time",
+    "TimeFromTicks",
+    "Timestamp",
+    "TimestampFromTicks",
     "Warning",
     "apilevel",
     "connect",

src/MySQLdb/connections.py

@@ -7,18 +7,18 @@
 
 import re
 
-from . import cursors, _mysql
+from . import _mysql, cursors
 from ._exceptions import (
-    Warning,
-    Error,
-    InterfaceError,
-    DataError,
     DatabaseError,
-    OperationalError,
+    DataError,
+    Error,
     IntegrityError,
+    InterfaceError,
     InternalError,
     NotSupportedError,
+    OperationalError,
     ProgrammingError,
+    Warning,
 )
 
 # Mapping from MySQL charset name to Python codec name
@@ -164,7 +164,7 @@ class object, used to create cursors (keyword only)
         documentation for the MySQL C API for some hints on what they do.
         """
         from MySQLdb.constants import CLIENT, FIELD_TYPE
-        from MySQLdb.converters import conversions, _bytes_or_str
+        from MySQLdb.converters import _bytes_or_str, conversions
 
         kwargs2 = kwargs.copy()
 
@@ -173,11 +173,7 @@ class object, used to create cursors (keyword only)
         if "passwd" in kwargs2:
             kwargs2["password"] = kwargs2.pop("passwd")
 
-        if "conv" in kwargs:
-            conv = kwargs["conv"]
-        else:
-            conv = conversions
-
+        conv = kwargs.get("conv", conversions)
         conv2 = {}
         for k, v in conv.items():
             if isinstance(k, int) and isinstance(v, list):
@@ -207,11 +203,7 @@ class object, used to create cursors (keyword only)
         super().__init__(*args, **kwargs2)
 
         self.cursorclass = cursorclass
-        self.encoders = {
-            k: v
-            for k, v in conv.items()
-            if type(k) is not int  # noqa: E721
-        }
+        self.encoders = {k: v for k, v in conv.items() if type(k) is not int}
         self._server_version = tuple(
             [numeric_part(n) for n in self.get_server_info().split(".")[:2]]
         )
@@ -240,9 +232,8 @@ class object, used to create cursors (keyword only)
             self.converter[FIELD_TYPE.JSON] = str
 
         self._transactional = self.server_capabilities & CLIENT.TRANSACTIONS
-        if self._transactional:
-            if autocommit is not None:
-                self.autocommit(autocommit)
+        if self._transactional and autocommit is not None:
+            self.autocommit(autocommit)
         self.messages = []
 
     def _set_attributes(
@@ -314,9 +305,7 @@ def literal(self, o):
         """
         if isinstance(o, str):
             s = self.string_literal(o.encode(self.encoding))
-        elif isinstance(o, bytearray):
-            s = self._bytes_literal(o)
-        elif isinstance(o, bytes):
+        elif isinstance(o, (bytes, bytearray)):
             s = self._bytes_literal(o)
         elif isinstance(o, (tuple, list)):
             s = self._tuple_literal(o)

src/MySQLdb/constants/ER.py

@@ -18,8 +18,7 @@
         m = re.match(r"^\s*#define\s+((ER|WARN)_[A-Z0-9_]+)\s+(\d+)\s*", line)
         if m:
             name = m.group(1)
-            if name.startswith("ER_"):
-                name = name[3:]
+            name = name.removeprefix("ER_")
             value = int(m.group(3))
             if name == "ERROR_LAST":
                 if error_last is None or error_last < value:

src/MySQLdb/constants/__init__.py

@@ -1 +1 @@
-__all__ = ["CR", "FIELD_TYPE", "CLIENT", "ER", "FLAG"]
+__all__ = ["CLIENT", "CR", "ER", "FIELD_TYPE", "FLAG"]

src/MySQLdb/converters.py

@@ -31,23 +31,22 @@
 MySQL.connect().
 """
 
+import array
 from decimal import Decimal
 
+from MySQLdb._exceptions import ProgrammingError
 from MySQLdb._mysql import string_literal
 from MySQLdb.constants import FIELD_TYPE, FLAG
 from MySQLdb.times import (
     Date,
-    DateTimeType,
+    Date_or_None,
     DateTime2literal,
-    DateTimeDeltaType,
-    DateTimeDelta2literal,
     DateTime_or_None,
+    DateTimeDelta2literal,
+    DateTimeDeltaType,
+    DateTimeType,
     TimeDelta_or_None,
-    Date_or_None,
 )
-from MySQLdb._exceptions import ProgrammingError
-
-import array
 
 NoneType = type(None)
 

src/MySQLdb/cursors.py

@@ -345,6 +345,7 @@ def __getattr__(self, name):
         # DB-API 2.0 optional extension says these errors can be accessed
         # via Connection object. But MySQLdb had defined them on Cursor object.
         import warnings
+
         from . import _exceptions as err
 
         if name in (

src/MySQLdb/times.py

@@ -5,8 +5,9 @@
 Use Python datetime module to handle date and time columns.
 """
 
-from time import localtime
 from datetime import date, datetime, time, timedelta
+from time import localtime
+
 from MySQLdb._mysql import string_literal
 
 Date = date

tests/capabilities.py

@@ -6,15 +6,16 @@
 
 """
 
-from time import time
 import unittest
+from time import time
+
 from configdb import connection_factory
 
 
 class DatabaseTest(unittest.TestCase):
     db_module = None
     connect_args = ()
-    connect_kwargs = dict()
+    connect_kwargs = {}
     create_table_extra = ""
     rows = 10
     debug = False
@@ -162,7 +163,7 @@ def generator(row, col):
             pass
         else:
             self.fail(
-                "Over-long column did not generate warnings/exception with single insert"  # noqa: E501
+                "Over-long column did not generate warnings/exception with single insert"
             )
 
         self.connection.rollback()
@@ -177,7 +178,7 @@ def generator(row, col):
             pass
         else:
             self.fail(
-                "Over-long columns did not generate warnings/exception with execute()"  # noqa: E501
+                "Over-long columns did not generate warnings/exception with execute()"
             )
 
         self.connection.rollback()
@@ -192,7 +193,7 @@ def generator(row, col):
             pass
         else:
             self.fail(
-                "Over-long columns did not generate warnings/exception with executemany()"  # noqa: E501
+                "Over-long columns did not generate warnings/exception with executemany()"
             )
 
         self.connection.rollback()