Switch to Python 3 metaclasses

Author: oschwald

geoip2/mixins.py

@@ -4,11 +4,9 @@
 from typing import Any
 
 
-class SimpleEquality(object):
+class SimpleEquality(metaclass=ABCMeta):
     """Naive __dict__ equality mixin"""
 
-    __metaclass__ = ABCMeta
-
     def __eq__(self, other: Any) -> bool:
         return isinstance(other, self.__class__) and self.__dict__ == other.__dict__
 

geoip2/models.py

@@ -323,11 +323,9 @@ class Enterprise(City):
     """
 
 
-class SimpleModel(SimpleEquality):
+class SimpleModel(SimpleEquality, metaclass=ABCMeta):
     """Provides basic methods for non-location models"""
 
-    __metaclass__ = ABCMeta
-
     raw: Dict[str, Union[bool, str, int]]
     ip_address: str
 

geoip2/records.py

@@ -15,22 +15,19 @@
 from geoip2.mixins import SimpleEquality
 
 
-class Record(SimpleEquality):
+class Record(SimpleEquality, metaclass=ABCMeta):
     """All records are subclasses of the abstract class ``Record``."""
 
-    __metaclass__ = ABCMeta
-
     def __repr__(self) -> str:
         args = ", ".join("%s=%r" % x for x in self.__dict__.items())
         return "{module}.{class_name}({data})".format(
             module=self.__module__, class_name=self.__class__.__name__, data=args
         )
 
 
-class PlaceRecord(Record):
+class PlaceRecord(Record, metaclass=ABCMeta):
     """All records with :py:attr:`names` subclass :py:class:`PlaceRecord`."""
 
-    __metaclass__ = ABCMeta
     names: Dict[str, str]
     _locales: List[str]