code cleanup and reformat (#423)

.travis.yml

@@ -59,7 +59,20 @@ jobs:
       script:
         - cd django-${DJANGO_VERSION}/tests/
         - ./runtests.py --parallel=1 --settings=test_mysql
-
+    - name: flake8
+      python: "3.8"
+      install:
+        - pip install -U pip
+        - pip install flake8
+      script:
+        - flake8 --ignore=E203,E501,W503 --max-line-length=88 .
+    - name: black
+      python: "3.8"
+      install:
+        - pip install -U pip
+        - pip install black
+      script:
+        - black --check --exclude=doc/ .
     #- &django_3_0
     #  <<: *django_2_2
     #  name: "Django 3.0 test (Python 3.8)"

MySQLdb/__init__.py

@@ -13,28 +13,57 @@
 MySQLdb.converters module.
 """
 
-from MySQLdb.release import __version__, version_info, __author__
-
-from . import _mysql
-
-if version_info != _mysql.version_info:
-    raise ImportError("this is MySQLdb version %s, but _mysql is version %r\n_mysql: %r" %
-                      (version_info, _mysql.version_info, _mysql.__file__))
-
-threadsafety = 1
-apilevel = "2.0"
-paramstyle = "format"
-
-from ._mysql import *
+try:
+    from MySQLdb.release import version_info
+    from . import _mysql
+
+    assert version_info == _mysql.version_info
+except Exception:
+    raise ImportError(
+        "this is MySQLdb version {}, but _mysql is version {!r}\n_mysql: {!r}".format(
+            version_info, _mysql.version_info, _mysql.__file__
+        )
+    )
+
+
+from ._mysql import (
+    NotSupportedError,
+    OperationalError,
+    get_client_info,
+    ProgrammingError,
+    Error,
+    InterfaceError,
+    debug,
+    IntegrityError,
+    string_literal,
+    MySQLError,
+    DataError,
+    escape,
+    escape_string,
+    DatabaseError,
+    InternalError,
+    Warning,
+)
 from MySQLdb.constants import FIELD_TYPE
-from MySQLdb.times import Date, Time, Timestamp, \
-    DateFromTicks, TimeFromTicks, TimestampFromTicks
+from MySQLdb.times import (
+    Date,
+    Time,
+    Timestamp,
+    DateFromTicks,
+    TimeFromTicks,
+    TimestampFromTicks,
+)
 
 try:
     frozenset
 except NameError:
     from sets import ImmutableSet as frozenset
 
+threadsafety = 1
+apilevel = "2.0"
+paramstyle = "format"
+
+
 class DBAPISet(frozenset):
     """A special type of set for which A == x is true if A is a
     DBAPISet and x is a member of that set."""
@@ -45,49 +74,106 @@ def __eq__(self, other):
         return other in self
 
 
-STRING    = DBAPISet([FIELD_TYPE.ENUM, FIELD_TYPE.STRING,
-                     FIELD_TYPE.VAR_STRING])
-BINARY    = DBAPISet([FIELD_TYPE.BLOB, FIELD_TYPE.LONG_BLOB,
-                     FIELD_TYPE.MEDIUM_BLOB, FIELD_TYPE.TINY_BLOB])
-NUMBER    = DBAPISet([FIELD_TYPE.DECIMAL, FIELD_TYPE.DOUBLE, FIELD_TYPE.FLOAT,
-                     FIELD_TYPE.INT24, FIELD_TYPE.LONG, FIELD_TYPE.LONGLONG,
-                     FIELD_TYPE.TINY, FIELD_TYPE.YEAR, FIELD_TYPE.NEWDECIMAL])
-DATE      = DBAPISet([FIELD_TYPE.DATE])
-TIME      = DBAPISet([FIELD_TYPE.TIME])
+STRING = DBAPISet([FIELD_TYPE.ENUM, FIELD_TYPE.STRING, FIELD_TYPE.VAR_STRING])
+BINARY = DBAPISet(
+    [
+        FIELD_TYPE.BLOB,
+        FIELD_TYPE.LONG_BLOB,
+        FIELD_TYPE.MEDIUM_BLOB,
+        FIELD_TYPE.TINY_BLOB,
+    ]
+)
+NUMBER = DBAPISet(
+    [
+        FIELD_TYPE.DECIMAL,
+        FIELD_TYPE.DOUBLE,
+        FIELD_TYPE.FLOAT,
+        FIELD_TYPE.INT24,
+        FIELD_TYPE.LONG,
+        FIELD_TYPE.LONGLONG,
+        FIELD_TYPE.TINY,
+        FIELD_TYPE.YEAR,
+        FIELD_TYPE.NEWDECIMAL,
+    ]
+)
+DATE = DBAPISet([FIELD_TYPE.DATE])
+TIME = DBAPISet([FIELD_TYPE.TIME])
 TIMESTAMP = DBAPISet([FIELD_TYPE.TIMESTAMP, FIELD_TYPE.DATETIME])
-DATETIME  = TIMESTAMP
-ROWID     = DBAPISet()
+DATETIME = TIMESTAMP
+ROWID = DBAPISet()
+
 
 def test_DBAPISet_set_equality():
     assert STRING == STRING
 
+
 def test_DBAPISet_set_inequality():
     assert STRING != NUMBER
 
+
 def test_DBAPISet_set_equality_membership():
     assert FIELD_TYPE.VAR_STRING == STRING
 
+
 def test_DBAPISet_set_inequality_membership():
     assert FIELD_TYPE.DATE != STRING
 
+
 def Binary(x):
     return bytes(x)
 
+
 def Connect(*args, **kwargs):
     """Factory function for connections.Connection."""
     from MySQLdb.connections import Connection
+
     return Connection(*args, **kwargs)
 
-connect = Connection = Connect
 
-__all__ = [ 'BINARY', 'Binary', 'Connect', 'Connection', 'DATE',
-    'Date', 'Time', 'Timestamp', 'DateFromTicks', 'TimeFromTicks',
-    'TimestampFromTicks', 'DataError', 'DatabaseError', 'Error',
-    'FIELD_TYPE', 'IntegrityError', 'InterfaceError', 'InternalError',
-    'MySQLError', 'NUMBER', 'NotSupportedError', 'DBAPISet',
-    'OperationalError', 'ProgrammingError', 'ROWID', 'STRING', 'TIME',
-    'TIMESTAMP', 'Warning', 'apilevel', 'connect', 'connections',
-    'constants', 'converters', 'cursors', 'debug', 'escape',
-    'escape_string', 'get_client_info',
-    'paramstyle', 'string_literal', 'threadsafety', 'version_info']
+connect = Connection = Connect
 
+__all__ = [
+    "BINARY",
+    "Binary",
+    "Connect",
+    "Connection",
+    "DATE",
+    "Date",
+    "Time",
+    "Timestamp",
+    "DateFromTicks",
+    "TimeFromTicks",
+    "TimestampFromTicks",
+    "DataError",
+    "DatabaseError",
+    "Error",
+    "FIELD_TYPE",
+    "IntegrityError",
+    "InterfaceError",
+    "InternalError",
+    "MySQLError",
+    "NUMBER",
+    "NotSupportedError",
+    "DBAPISet",
+    "OperationalError",
+    "ProgrammingError",
+    "ROWID",
+    "STRING",
+    "TIME",
+    "TIMESTAMP",
+    "Warning",
+    "apilevel",
+    "connect",
+    "connections",
+    "constants",
+    "converters",
+    "cursors",
+    "debug",
+    "escape",
+    "escape_string",
+    "get_client_info",
+    "paramstyle",
+    "string_literal",
+    "threadsafety",
+    "version_info",
+]

MySQLdb/_exceptions.py

@@ -5,6 +5,7 @@
     https://www.python.org/dev/peps/pep-0249/
 """
 
+
 class MySQLError(Exception):
     """Exception related to operation with MySQL."""