Add some Python 3 upgrades (#634)

* Run `pyupgrade`
* Remove `object` from class bases

Author: adamchainz

src/django_mysql/cache.py

@@ -23,7 +23,7 @@
 # command
 
 
-class Options(object):
+class Options:
     """A class that will quack like a Django model _meta class.
 
     This allows cache operations to be controlled by the router
@@ -44,10 +44,10 @@ def __init__(self, table):
 
 class BaseDatabaseCache(BaseCache):
     def __init__(self, table, params):
-        super(BaseDatabaseCache, self).__init__(params)
+        super().__init__(params)
         self._table = table
 
-        class CacheEntry(object):
+        class CacheEntry:
             _meta = Options(table)
 
         self.cache_model_class = CacheEntry
@@ -109,7 +109,7 @@ def _now(cls):
         return int(time() * 1000)
 
     def __init__(self, table, params):
-        super(MySQLCache, self).__init__(table, params)
+        super().__init__(table, params)
         options = params.get("OPTIONS", {})
         self._compress_min_length = options.get("COMPRESS_MIN_LENGTH", 5000)
         self._compress_level = options.get("COMPRESS_LEVEL", 6)
@@ -416,7 +416,7 @@ def validate_key(self, key):
             raise ValueError(
                 "Cache key is longer than the maxmimum 250 characters: {}".format(key)
             )
-        return super(MySQLCache, self).validate_key(key)
+        return super().validate_key(key)
 
     def encode(self, obj):
         """
@@ -469,7 +469,7 @@ def _maybe_cull(self):
     def get_backend_timeout(self, timeout=DEFAULT_TIMEOUT):
         if timeout is None:
             return self.FOREVER_TIMEOUT
-        timeout = super(MySQLCache, self).get_backend_timeout(timeout)
+        timeout = super().get_backend_timeout(timeout)
         return int(timeout * 1000)
 
     # Our API extensions

src/django_mysql/forms.py

@@ -23,7 +23,7 @@ class SimpleListField(forms.CharField):
 
     def __init__(self, base_field, max_length=None, min_length=None, *args, **kwargs):
         self.base_field = base_field
-        super(SimpleListField, self).__init__(*args, **kwargs)
+        super().__init__(*args, **kwargs)
         if max_length is not None:
             self.max_length = max_length
             self.validators.append(ListMaxLengthValidator(int(max_length)))
@@ -77,7 +77,7 @@ def to_python(self, value):
         return values
 
     def validate(self, value):
-        super(SimpleListField, self).validate(value)
+        super().validate(value)
         errors = []
         for i, item in enumerate(value, start=1):
             try:
@@ -100,7 +100,7 @@ def validate(self, value):
             raise ValidationError(errors)
 
     def run_validators(self, value):
-        super(SimpleListField, self).run_validators(value)
+        super().run_validators(value)
         errors = []
         for i, item in enumerate(value, start=1):
             try:
@@ -137,7 +137,7 @@ class SimpleSetField(forms.CharField):
 
     def __init__(self, base_field, max_length=None, min_length=None, *args, **kwargs):
         self.base_field = base_field
-        super(SimpleSetField, self).__init__(*args, **kwargs)
+        super().__init__(*args, **kwargs)
         if max_length is not None:
             self.max_length = max_length
             self.validators.append(SetMaxLengthValidator(int(max_length)))
@@ -200,7 +200,7 @@ def to_python(self, value):
         return values
 
     def validate(self, value):
-        super(SimpleSetField, self).validate(value)
+        super().validate(value)
         errors = []
         for item in value:
             try:
@@ -221,7 +221,7 @@ def validate(self, value):
             raise ValidationError(errors)
 
     def run_validators(self, value):
-        super(SimpleSetField, self).run_validators(value)
+        super().run_validators(value)
         errors = []
         for item in value:
             try:

src/django_mysql/locks.py

@@ -7,7 +7,7 @@
 from django_mysql.exceptions import TimeoutError
 
 
-class Lock(object):
+class Lock:
     def __init__(self, name, acquire_timeout=10.0, using=None):
         self.acquire_timeout = acquire_timeout
 
@@ -83,7 +83,7 @@ def held_with_prefix(cls, prefix, using=DEFAULT_DB_ALIAS):
             return {cls.unmake_name(using, row[0]): row[1] for row in cursor.fetchall()}
 
 
-class TableLock(object):
+class TableLock:
     def __init__(self, read=None, write=None, using=None):
         self.read = self._process_names(read)
         self.write = self._process_names(write)

src/django_mysql/models/aggregates.py

@@ -27,7 +27,7 @@ def __init__(
             # This can/will be improved to SetTextField or ListTextField
             extra["output_field"] = CharField()
 
-        super(GroupConcat, self).__init__(expression, **extra)
+        super().__init__(expression, **extra)
 
         self.distinct = distinct
         self.separator = separator

src/django_mysql/models/base.py

@@ -4,7 +4,7 @@
 
 
 class Model(models.Model):
-    class Meta(object):
+    class Meta:
         abstract = True
 
     objects = QuerySet.as_manager()

src/django_mysql/models/expressions.py

@@ -6,7 +6,7 @@
 
 class TwoSidedExpression(BaseExpression):
     def __init__(self, lhs, rhs):
-        super(TwoSidedExpression, self).__init__()
+        super().__init__()
         self.lhs = lhs
         self.rhs = rhs
 
@@ -17,7 +17,7 @@ def set_source_expressions(self, exprs):
         self.lhs, self.rhs = exprs
 
 
-class ListF(object):
+class ListF:
     def __init__(self, field_name):
         self.field_name = field_name
         self.field = F(field_name)
@@ -122,7 +122,7 @@ class PopListF(BaseExpression):
     )
 
     def __init__(self, lhs):
-        super(PopListF, self).__init__()
+        super().__init__()
         self.lhs = lhs
 
     def get_source_expressions(self):
@@ -151,7 +151,7 @@ class PopLeftListF(BaseExpression):
     )
 
     def __init__(self, lhs):
-        super(PopLeftListF, self).__init__()
+        super().__init__()
         self.lhs = lhs
 
     def get_source_expressions(self):
@@ -167,7 +167,7 @@ def as_sql(self, compiler, connection):
         return sql, tuple(field_params)
 
 
-class SetF(object):
+class SetF:
     def __init__(self, field_name):
         self.field = F(field_name)
 

src/django_mysql/models/fields/bit.py

@@ -2,7 +2,7 @@
 from django.db.models import BooleanField, NullBooleanField
 
 
-class Bit1Mixin(object):
+class Bit1Mixin:
     def db_type(self, connection):
         return "bit(1)"
 

src/django_mysql/models/fields/dynamic.py

@@ -35,10 +35,10 @@ def __init__(self, *args, **kwargs):
         if "blank" not in kwargs:
             kwargs["blank"] = True
         self.spec = kwargs.pop("spec", {})
-        super(DynamicField, self).__init__(*args, **kwargs)
+        super().__init__(*args, **kwargs)
 
     def check(self, **kwargs):
-        errors = super(DynamicField, self).check(**kwargs)
+        errors = super().check(**kwargs)
         errors.extend(self._check_mariadb_dyncol())
         errors.extend(self._check_mariadb_version())
         errors.extend(self._check_character_set())
@@ -165,7 +165,7 @@ def db_type(self, connection):
         return "mediumblob"
 
     def get_transform(self, name):
-        transform = super(DynamicField, self).get_transform(name)
+        transform = super().get_transform(name)
         if transform:
             return transform
         if name in self.spec:
@@ -204,7 +204,7 @@ def from_db_value(self, value, expression, connection, context):
             return self.to_python(value)
 
     def get_prep_value(self, value):
-        value = super(DynamicField, self).get_prep_value(value)
+        value = super().get_prep_value(value)
         if isinstance(value, dict):
             self.validate_spec(self.spec, value)
             return mariadb_dyncol.pack(value)
@@ -237,7 +237,7 @@ def value_to_string(self, obj):
         return json.dumps(self.value_from_object(obj))
 
     def deconstruct(self):
-        name, path, args, kwargs = super(DynamicField, self).deconstruct()
+        name, path, args, kwargs = super().deconstruct()
 
         bad_paths = (
             "django_mysql.models.fields.dynamic.DynamicField",
@@ -289,7 +289,7 @@ class KeyTransform(Transform):
 
     def __init__(self, key_name, data_type, *args, **kwargs):
         subspec = kwargs.pop("subspec", None)
-        super(KeyTransform, self).__init__(*args, **kwargs)
+        super().__init__(*args, **kwargs)
         self.key_name = key_name
         self.data_type = data_type
 
@@ -311,7 +311,7 @@ def as_sql(self, compiler, connection):
         )
 
 
-class KeyTransformFactory(object):
+class KeyTransformFactory:
     def __init__(self, key_name, data_type, subspec=None):
         self.key_name = key_name
         self.data_type = data_type

src/django_mysql/models/fields/enum.py

@@ -32,10 +32,10 @@ def __init__(self, *args, **kwargs):
         # maximum string length
         kwargs["max_length"] = int(2 ** 32)
 
-        super(EnumField, self).__init__(*args, **kwargs)
+        super().__init__(*args, **kwargs)
 
     def deconstruct(self):
-        name, path, args, kwargs = super(EnumField, self).deconstruct()
+        name, path, args, kwargs = super().deconstruct()
 
         bad_paths = (
             "django_mysql.models.fields.enum.EnumField",

src/django_mysql/models/fields/json.py

@@ -33,10 +33,10 @@ def __init__(self, *args, **kwargs):
             kwargs["default"] = dict
         self.json_encoder = kwargs.pop("encoder", self._default_json_encoder)
         self.json_decoder = kwargs.pop("decoder", self._default_json_decoder)
-        super(JSONField, self).__init__(*args, **kwargs)
+        super().__init__(*args, **kwargs)
 
     def check(self, **kwargs):
-        errors = super(JSONField, self).check(**kwargs)
+        errors = super().check(**kwargs)
         errors.extend(self._check_default())
         errors.extend(self._check_mysql_version())
         errors.extend(self._check_json_encoder_decoder())
@@ -116,7 +116,7 @@ def _check_json_encoder_decoder(self):
         return errors
 
     def deconstruct(self):
-        name, path, args, kwargs = super(JSONField, self).deconstruct()
+        name, path, args, kwargs = super().deconstruct()
 
         bad_paths = (
             "django_mysql.models.fields.json.JSONField",
@@ -131,7 +131,7 @@ def db_type(self, connection):
         return "json"
 
     def get_transform(self, name):
-        transform = super(JSONField, self).get_transform(name)
+        transform = super().get_transform(name)
         if transform:
             return transform  # pragma: no cover
         return KeyTransformFactory(name)
@@ -181,15 +181,15 @@ def get_lookup(self, lookup_name):
             raise NotImplementedError(
                 "Lookup '{}' doesn't work with JSONField".format(lookup_name)
             )
-        return super(JSONField, self).get_lookup(lookup_name)
+        return super().get_lookup(lookup_name)
 
     def value_to_string(self, obj):
         return self.value_from_object(obj)
 
     def formfield(self, **kwargs):
         defaults = {"form_class": forms.JSONField}
         defaults.update(kwargs)
-        return super(JSONField, self).formfield(**defaults)
+        return super().formfield(**defaults)
 
 
 class JSONLength(Transform):
@@ -215,7 +215,7 @@ class JSONLength(Transform):
 
 class KeyTransform(Transform):
     def __init__(self, key_name, *args, **kwargs):
-        super(KeyTransform, self).__init__(*args, **kwargs)
+        super().__init__(*args, **kwargs)
         self.key_name = key_name
 
     def as_sql(self, compiler, connection):
@@ -243,7 +243,7 @@ def compile_json_path(self, key_transforms):
         return "".join(path)
 
 
-class KeyTransformFactory(object):
+class KeyTransformFactory:
     def __init__(self, key_name):
         self.key_name = key_name