Make __eq__ code more DRY

Author: oschwald

geoip2/mixins.py

@@ -0,0 +1,17 @@
+"""This package contains utility mixins"""
+# pylint: disable=too-few-public-methods
+from abc import ABCMeta
+
+
+class SimpleEquality(object):
+
+    """Naive __dict__ equality mixin"""
+
+    __metaclass__ = ABCMeta
+
+    def __eq__(self, other):
+        return (isinstance(other, self.__class__)
+                and self.__dict__ == other.__dict__)
+
+    def __ne__(self, other):
+        return not self.__eq__(other)

geoip2/models.py

@@ -14,9 +14,10 @@
 from abc import ABCMeta
 
 import geoip2.records
+from geoip2.mixins import SimpleEquality
 
 
-class Country(object):
+class Country(SimpleEquality):
 
     """Model for the GeoIP2 Precision: Country and the GeoIP2 Country database
 
@@ -90,9 +91,6 @@ def __init__(self, raw_response, locales=None):
         self.traits = geoip2.records.Traits(**raw_response.get('traits', {}))
         self.raw = raw_response
 
-    def __eq__(self, other):
-        return self.__dict__ == other.__dict__
-
     def __repr__(self):
         return '{module}.{class_name}({data}, {locales})'.format(
             module=self.__module__,
@@ -242,15 +240,12 @@ class Insights(City):
     """
 
 
-class SimpleModel(object):
+class SimpleModel(SimpleEquality):
 
     """Provides basic methods for non-location models"""
 
     __metaclass__ = ABCMeta
 
-    def __eq__(self, other):
-        return self.__dict__ == other.__dict__
-
     def __repr__(self):
         # pylint: disable=no-member
         return '{module}.{class_name}({data})'.format(

geoip2/records.py

@@ -7,8 +7,10 @@
 # pylint:disable=R0903
 from abc import ABCMeta
 
+from geoip2.mixins import SimpleEquality
 
-class Record(object):
+
+class Record(SimpleEquality):
 
     """All records are subclasses of the abstract class ``Record``"""
     __metaclass__ = ABCMeta
@@ -22,9 +24,6 @@ def __init__(self, **kwargs):
     def __setattr__(self, name, value):
         raise AttributeError("can't set attribute")
 
-    def __eq__(self, other):
-        return self.__dict__ == other.__dict__
-
     def __repr__(self):
         args = ', '.join('%s=%r' % x for x in self.__dict__.items())
         return '{module}.{class_name}({data})'.format(