Fix new pylint errors and run latest YAPF on code

Author: oschwald

geoip2/database.py

@@ -6,18 +6,17 @@
 """
 import inspect
 
-import geoip2
-import geoip2.models
-import geoip2.errors
 import maxminddb
-
 # pylint: disable=unused-import
 from maxminddb import (MODE_AUTO, MODE_MMAP, MODE_MMAP_EXT, MODE_FILE,
                        MODE_MEMORY)
 
+import geoip2
+import geoip2.models
+import geoip2.errors
 
-class Reader(object):
 
+class Reader(object):
     """GeoIP2 database Reader object.
 
     Instances of this class provide a reader for the GeoIP2 database format.
@@ -119,8 +118,7 @@ def anonymous_ip(self, ip_address):
 
         """
         return self._flat_model_for(geoip2.models.AnonymousIP,
-                                    'GeoIP2-Anonymous-IP',
-                                    ip_address)
+                                    'GeoIP2-Anonymous-IP', ip_address)
 
     def connection_type(self, ip_address):
         """Get the ConnectionType object for the IP address
@@ -131,8 +129,7 @@ def connection_type(self, ip_address):
 
         """
         return self._flat_model_for(geoip2.models.ConnectionType,
-                                    'GeoIP2-Connection-Type',
-                                    ip_address)
+                                    'GeoIP2-Connection-Type', ip_address)
 
     def domain(self, ip_address):
         """Get the Domain object for the IP address
@@ -142,8 +139,7 @@ def domain(self, ip_address):
         :returns: :py:class:`geoip2.models.Domain` object
 
         """
-        return self._flat_model_for(geoip2.models.Domain,
-                                    'GeoIP2-Domain',
+        return self._flat_model_for(geoip2.models.Domain, 'GeoIP2-Domain',
                                     ip_address)
 
     def isp(self, ip_address):
@@ -154,8 +150,7 @@ def isp(self, ip_address):
         :returns: :py:class:`geoip2.models.ISP` object
 
         """
-        return self._flat_model_for(geoip2.models.ISP,
-                                    'GeoIP2-ISP',
+        return self._flat_model_for(geoip2.models.ISP, 'GeoIP2-ISP',
                                     ip_address)
 
     def _get(self, database_type, ip_address):

geoip2/errors.py

@@ -6,7 +6,6 @@
 
 
 class GeoIP2Error(RuntimeError):
-
     """There was a generic error in GeoIP2.
 
     This class represents a generic error. It extends :py:exc:`RuntimeError`
@@ -16,17 +15,14 @@ class GeoIP2Error(RuntimeError):
 
 
 class AddressNotFoundError(GeoIP2Error):
-
     """The address you were looking up was not found."""
 
 
 class AuthenticationError(GeoIP2Error):
-
     """There was a problem authenticating the request."""
 
 
 class HTTPError(GeoIP2Error):
-
     """There was an error when making your HTTP request.
 
     This class represents an HTTP transport error. It extends
@@ -44,10 +40,8 @@ def __init__(self, message, http_status=None, uri=None):
 
 
 class InvalidRequestError(GeoIP2Error):
-
     """The request was invalid."""
 
 
 class OutOfQueriesError(GeoIP2Error):
-
     """Your account is out of funds for the service queried."""

geoip2/mixins.py

@@ -4,14 +4,13 @@
 
 
 class SimpleEquality(object):
-
     """Naive __dict__ equality mixin"""
 
     __metaclass__ = ABCMeta
 
     def __eq__(self, other):
-        return (isinstance(other, self.__class__)
-                and self.__dict__ == other.__dict__)
+        return (isinstance(other, self.__class__) and
+                self.__dict__ == other.__dict__)
 
     def __ne__(self, other):
         return not self.__eq__(other)

geoip2/models.py

@@ -18,7 +18,6 @@
 
 
 class Country(SimpleEquality):
-
     """Model for the GeoIP2 Precision: Country and the GeoIP2 Country database
 
     This class provides the following attributes:
@@ -100,7 +99,6 @@ def __repr__(self):
 
 
 class City(Country):
-
     """Model for the GeoIP2 Precision: City and the GeoIP2 City database
     .. attribute:: city
 
@@ -176,7 +174,6 @@ def __init__(self, raw_response, locales=None):
 
 
 class Insights(City):
-
     """Model for the GeoIP2 Precision: Insights web service endpoint
 
     .. attribute:: city
@@ -241,7 +238,6 @@ class Insights(City):
 
 
 class SimpleModel(SimpleEquality):
-
     """Provides basic methods for non-location models"""
 
     __metaclass__ = ABCMeta
@@ -255,7 +251,6 @@ def __repr__(self):
 
 
 class AnonymousIP(SimpleModel):
-
     """Model class for the GeoIP2 Anonymous IP
 
     This class provides the following attribute:
@@ -309,7 +304,6 @@ def __init__(self, raw):
 
 
 class ConnectionType(SimpleModel):
-
     """Model class for the GeoIP2 Connection-Type
 
     This class provides the following attribute:
@@ -341,7 +335,6 @@ def __init__(self, raw):
 
 
 class Domain(SimpleModel):
-
     """Model class for the GeoIP2 Domain
 
     This class provides the following attribute:
@@ -367,7 +360,6 @@ def __init__(self, raw):
 
 
 class ISP(SimpleModel):
-
     """Model class for the GeoIP2 ISP
 
     This class provides the following attribute:

geoip2/records.py

@@ -11,11 +11,10 @@
 
 
 class Record(SimpleEquality):
-
     """All records are subclasses of the abstract class ``Record``"""
     __metaclass__ = ABCMeta
 
-    _valid_attributes = None
+    _valid_attributes = set()
 
     def __init__(self, **kwargs):
         valid_args = dict((k, kwargs.get(k)) for k in self._valid_attributes)
@@ -33,7 +32,6 @@ def __repr__(self):
 
 
 class PlaceRecord(Record):
-
     """All records with :py:attr:`names` subclass :py:class:`PlaceRecord`"""
     __metaclass__ = ABCMeta
 
@@ -49,12 +47,12 @@ def __init__(self, locales=None, **kwargs):
     def name(self):
         """Dict with locale codes as keys and localized name as value"""
         # pylint:disable=E1101
-        return next((self.names.get(x) for x in self._locales if x in
-                     self.names), None)
+        return next(
+            (self.names.get(x) for x in self._locales
+             if x in self.names), None)
 
 
 class City(PlaceRecord):
-
     """Contains data for the city record associated with an IP address
 
     This class contains the city-level data associated with an IP address.
@@ -96,7 +94,6 @@ class City(PlaceRecord):
 
 
 class Continent(PlaceRecord):
-
     """Contains data for the continent record associated with an IP address
 
     This class contains the continent-level data associated with an IP
@@ -137,7 +134,6 @@ class Continent(PlaceRecord):
 
 
 class Country(PlaceRecord):
-
     """Contains data for the country record associated with an IP address
 
     This class contains the country-level data associated with an IP address.
@@ -186,7 +182,6 @@ class Country(PlaceRecord):
 
 
 class RepresentedCountry(Country):
-
     """Contains data for the represented country associated with an IP address
 
     This class contains the country-level data associated with an IP address
@@ -241,12 +236,11 @@ class RepresentedCountry(Country):
       :type: unicode
 
     """
-    _valid_attributes = set(['confidence', 'geoname_id', 'iso_code',
-                             'names', 'type'])
+    _valid_attributes = set(['confidence', 'geoname_id', 'iso_code', 'names',
+                             'type'])
 
 
 class Location(Record):
-
     """Contains data for the location record associated with an IP address
 
     This class contains the location data associated with an IP address.
@@ -314,7 +308,6 @@ class Location(Record):
 
 
 class MaxMind(Record):
-
     """Contains data related to your MaxMind account
 
     Attributes:
@@ -331,7 +324,6 @@ class MaxMind(Record):
 
 
 class Postal(Record):
-
     """Contains data for the postal record associated with an IP address
 
     This class contains the postal data associated with an IP address.
@@ -361,7 +353,6 @@ class Postal(Record):
 
 
 class Subdivision(PlaceRecord):
-
     """Contains data for the subdivisions associated with an IP address
 
     This class contains the subdivision data associated with an IP address.
@@ -411,7 +402,6 @@ class Subdivision(PlaceRecord):
 
 
 class Subdivisions(tuple):
-
     """A tuple-like collection of subdivisions associated with an IP address
 
     This class contains the subdivisions of the country associated with the
@@ -422,6 +412,7 @@ class Subdivisions(tuple):
 
     This attribute is returned by ``city`` and ``insights``.
     """
+
     def __new__(cls, locales, *subdivisions):
         subdivisions = [Subdivision(locales, **x) for x in subdivisions]
         obj = super(cls, Subdivisions).__new__(cls, subdivisions)
@@ -447,7 +438,6 @@ def most_specific(self):
 
 
 class Traits(Record):
-
     """ Contains data for the traits record associated with an IP address
 
     This class contains the traits data associated with an IP address.
@@ -558,15 +548,10 @@ class Traits(Record):
       :type: unicode
 
 """
-    _valid_attributes = set(['autonomous_system_number',
-                             'autonomous_system_organization',
-                             'domain',
-                             'is_anonymous_proxy',
-                             'is_satellite_provider',
-                             'isp',
-                             'ip_address',
-                             'organization',
-                             'user_type'])
+    _valid_attributes = set(
+        ['autonomous_system_number', 'autonomous_system_organization',
+         'domain', 'is_anonymous_proxy', 'is_satellite_provider', 'isp',
+         'ip_address', 'organization', 'user_type'])
 
     def __init__(self, **kwargs):
         for k in ['is_anonymous_proxy', 'is_satellite_provider']: