Some changes needed for Python 2.{6,7}. Works in Python 2.7, but there may still be some issues in 2.6.

Author: oschwald

geoip2/errors.py

@@ -5,13 +5,13 @@ class GeoIP2Error(RuntimeError):
 class GeoIP2HTTPError(GeoIP2Error):
     """There was an error when making your HTTP request."""
     def __init__(self, message, http_status=None, uri=None):
-        super().__init__(message)
+        super(GeoIP2HTTPError, self).__init__(message)
         self.http_status = http_status
         self.uri = uri
 
 
 class GeoIP2WebServiceError(GeoIP2HTTPError):
     """The GeoIP2 web service returned an error."""
     def __init__(self, message, code=None, http_status=None, uri=None):
-        super().__init__(message, http_status, uri)
+        super(GeoIP2WebServiceError, self).__init__(message, http_status, uri)
         self.code = code

geoip2/models.py

@@ -21,7 +21,7 @@ def __init__(self, raw_response, languages=None):
 
 class City(Country):
     def __init__(self, raw_response, languages=None):
-        super().__init__(raw_response, languages)
+        super(City, self).__init__(raw_response, languages)
         self.city = \
             geoip2.records.City(languages, **raw_response.get('city', {}))
         self.location = \

geoip2/records.py

@@ -5,7 +5,8 @@ class Record(object):
     __metaclass__ = ABCMeta
 
     def __init__(self, **args):
-        self.__dict__.update({k: args.get(k) for k in self._valid_attributes})
+        valid_args = dict((k, args.get(k)) for k in self._valid_attributes)
+        self.__dict__.update(valid_args)
 
     def __setattr__(self, name, value):
         raise NotImplementedError(name + ' is read-only.')
@@ -20,7 +21,7 @@ def __init__(self, languages=None, **args):
             languages = []
         object.__setattr__(self, 'languages', languages)
         args['names'] = args.pop('name', [])
-        super().__init__(**args)
+        super(PlaceRecord, self).__init__(**args)
 
     @property
     def name(self):
@@ -29,42 +30,43 @@ def name(self):
 
 
 class City(PlaceRecord):
-    _valid_attributes = {'confidence', 'geoname_id', 'names'}
+    _valid_attributes = set(['confidence', 'geoname_id', 'names'])
 
 
 class Continent(PlaceRecord):
-    _valid_attributes = {'continent_code', 'geoname_id', 'names'}
+    _valid_attributes = set(['continent_code', 'geoname_id', 'names'])
 
 
 class Country(PlaceRecord):
-    _valid_attributes = {'confidence', 'geoname_id', 'iso_3166_1_alpha_2',
-                         'iso_3166_1_alpha_3', 'names'}
+    _valid_attributes = set(['confidence', 'geoname_id', 'iso_3166_1_alpha_2',
+                             'iso_3166_1_alpha_3', 'names'])
 
 
 class Location(Record):
-    _valid_attributes = {'accuracy_radius', 'latitude', 'longitude'
-                         'metro_code', 'postal_code', 'postal_confidence',
-                         'time_zone'}
+    _valid_attributes = set(['accuracy_radius', 'latitude', 'longitude'
+                             'metro_code', 'postal_code', 'postal_confidence',
+                             'time_zone'])
 
 
 class Region(PlaceRecord):
-    _valid_attributes = {'confidence', 'geoname_id', 'iso_3166_2', 'names'}
+    _valid_attributes = set(['confidence', 'geoname_id', 'iso_3166_2',
+                             'names'])
 
 
 class Traits(Record):
-    _valid_attributes = {'autonomous_system_number',
-                         'autonomous_system_organization',
-                         'domain',
-                         'is_anonymous_proxy',
-                         'is_satellite_provider',
-                         'is_transparent_proxy',
-                         'isp',
-                         'ip_address',
-                         'organization',
-                         'user_type'}
+    _valid_attributes = set(['autonomous_system_number',
+                             'autonomous_system_organization',
+                             'domain',
+                             'is_anonymous_proxy',
+                             'is_satellite_provider',
+                             'is_transparent_proxy',
+                             'isp',
+                             'ip_address',
+                             'organization',
+                             'user_type'])
 
     def __init__(self, languages=None, **args):
         for k in ['is_anonymous_proxy', 'is_satellite_provider',
                   'is_transparent_proxy']:
             args[k] = bool(args.get(k, False))
-        super().__init__(**args)
+        super(Traits, self).__init__(**args)