Small pep8 fixes

Author: Paul Tagliamonte

ChangeLog

@@ -3,6 +3,8 @@
 * sunlight/services/congress.py:
  - Add **kwargs for each method, and pass them along to all requests. This
    helps prevent cases where we add an argument and older versions break.
+* sunlight/services/*.py:
+ - Fixed some outstanding pep8 issues.
 
 2012-06-29  James Turk  <[email protected]>
 

sunlight/__init__.py

@@ -28,6 +28,7 @@
 import sunlight.config
 import sunlight.service
 
+
 def _attempt_to_load_apikey():
     """
     This function (which will be auto-called on import of :mod:`sunlight`),
@@ -49,7 +50,7 @@ def _attempt_to_load_apikey():
                 sunlight.config.KEY_LOCATION, str(e)))
     try:
         sunlight.config.API_KEY = \
-                os.environ[sunlight.config.KEY_ENVVAR].strip()
+            os.environ[sunlight.config.KEY_ENVVAR].strip()
     except KeyError as e:
         pass
 

sunlight/config.py

@@ -29,15 +29,15 @@
 for a Sunlight API key is fun for the whole family!
 """
 
-KEY_LOCATION    = "~/.sunlight.key"
+KEY_LOCATION = "~/.sunlight.key"
 """
 This is the location of the api key that's stored on the filesystem. Currently,
 it uses a file directly under a tilde, so that windows users don't have to feel
 as much pain when using the API. Usually this is something like
 ``~/.sunlight.key``
 """
 
-KEY_ENVVAR      = "SUNLIGHT_API_KEY"
+KEY_ENVVAR = "SUNLIGHT_API_KEY"
 """
 This is the name of the ``os.environ`` key to look for. It's usually something
 stupid simple, like ``SUNLIGHT_API_KEY``.

sunlight/errors.py

@@ -6,6 +6,7 @@
     :synopsis: Exceptions and Errors
 """
 
+
 class SunlightException(Exception):
     """
     :class:`sunlight.errors.SunlightException` is the base exception,
@@ -31,6 +32,7 @@ def __str__(self):
         """
         return repr(self.value)
 
+
 class BadRequestException(SunlightException):
     """
     This gets thrown when the underlying url request has recieved an abnormal
@@ -46,6 +48,7 @@ class InvalidRequestException(BadRequestException):
     """
     pass
 
+
 class NoAPIKeyException(SunlightException):
     """
     This gets thrown if the bindings are asked to issue a request, but the

sunlight/service.py

@@ -78,6 +78,6 @@ def get(self, top_level_object, **kwargs):
 
             ex.url = e.geturl()
             ex.message = message
-            ex.code    = code
+            ex.code = code
 
             raise ex

sunlight/services/capitolwords.py

@@ -9,6 +9,7 @@
 
 service_url = "http://capitolwords.org/api"
 
+
 class capitolwords(sunlight.service.Service):
     """
     Bindings into the `CapitolWords project <http://capitolwords.org>`_.
@@ -34,7 +35,7 @@ def dates(self, phrase, **kwargs):
         endpoint <http://capitolwords.org/api/#dates.json>`_.
         """
         kwargs['phrase'] = phrase
-        return self.get( "dates", **kwargs )
+        return self.get("dates", **kwargs)
 
     def phrases(self, entity_type, entity_value, **kwargs):
         """
@@ -45,10 +46,10 @@ def phrases(self, entity_type, entity_value, **kwargs):
         For a list of arguments see `Capitol Words' phrases.json
         endpoint <http://capitolwords.org/api/#phrases.json>`_.
         """
-        kwargs['entity_type']  = entity_type
+        kwargs['entity_type'] = entity_type
         kwargs['entity_value'] = entity_value
 
-        return self.get( "phrases", **kwargs )
+        return self.get("phrases", **kwargs)
 
     def phrases_by_entity(self, entity_type, **kwargs):
         """
@@ -60,9 +61,9 @@ def phrases_by_entity(self, entity_type, **kwargs):
         endpoint <http://capitolwords.org/api/#phrases/entity.json>`_.
         """
         lss = "%s/%s" % ("phrases", entity_type)
-        return self.get( lss, **kwargs )
+        return self.get(lss, **kwargs)
 
-    def text( self, phrase=None, title=None, **kwargs ):
+    def text(self, phrase=None, title=None, **kwargs):
         """
         Full text-search against Capitol Words data.
 
@@ -85,13 +86,13 @@ def text( self, phrase=None, title=None, **kwargs ):
             kwargs['phrase'] = phrase
 
         if title:
-            kwargs['title']  = title
+            kwargs['title'] = title
 
-        return self.get( "text", **kwargs )
+        return self.get("text", **kwargs)
 
     # API impl methods below
 
-    def _get_url( self, obj, apikey, **kwargs ):
+    def _get_url(self, obj, apikey, **kwargs):
         ret = "%s/%s.json?apikey=%s&%s" % (
             service_url,
             obj,
@@ -100,15 +101,14 @@ def _get_url( self, obj, apikey, **kwargs ):
         )
         return ret
 
-    def _decode_response( self, response ):
-        ret = json.loads( response )
+    def _decode_response(self, response):
+        ret = json.loads(response)
         if "error" in ret:
-            ex = InvalidRequestException( ret['error'] )
+            ex = InvalidRequestException(ret['error'])
             ex.response = ret
             raise ex
         if "results" in ret:
             return ret['results']
             # XXX: Verify this is actually
             #      what we want.
         return ret
-

sunlight/services/congress.py

@@ -13,8 +13,10 @@
 
 service_url = "http://services.sunlightlabs.com/api/"
 
+
 def _unpack(resp, key):
-    return [e[key] for e in resp[key+'s']]
+    return [e[key] for e in resp[key + 's']]
+
 
 class congress(sunlight.service.Service):
     """
@@ -33,7 +35,6 @@ def legislators(self, **kwargs):
         return _unpack(self.get('legislators.getList', **kwargs),
                        'legislator')
 
-
     def legislator_search(self, name, threshold=0.9, all_legislators=False,
                           **kwargs):
         """
@@ -50,7 +51,6 @@ def legislator_search(self, name, threshold=0.9, all_legislators=False,
 
         return _unpack(self.get('legislators.search', **params), 'result')
 
-
     def legislators_for_zip(self, zipcode, **kwargs):
         """
         Query for all legislators representing a given ZIP code.
@@ -113,7 +113,6 @@ def districts_for_lat_lon(self, latitude, longitude, **kwargs):
         return _unpack(self.get('districts.getDistrictFromLatLong', **params),
                        'district')
 
-
     def committees(self, chamber, **kwargs):
         """
         Query for all committees for a chamber.  (House|Senate|Joint)

sunlight/services/influenceexplorer.py

@@ -15,6 +15,7 @@
 
 service_url = "http://transparencydata.com/api/1.0"
 
+
 class InfluenceExplorer(sunlight.service.Service):
     """
     Bindings into the `InfluenceExplorer <http://influenceexplorer.com/>`_
@@ -77,20 +78,18 @@ def entities(self, **kwargs):
         return self.get("entities", **kwargs)
 
     # API impl methods below
-
-    def _get_url( self, obj, apikey, **kwargs ):
+    def _get_url(self, obj, apikey, **kwargs):
         return "%s/%s?apikey=%s&%s" % (
             service_url,
             obj,
             apikey,
             sunlight.service.safe_encode(kwargs)
         )
 
-    def _decode_response( self, response ):
-        ret = json.loads( response )
+    def _decode_response(self, response):
+        ret = json.loads(response)
         if "error" in ret:
-            ex = InvalidRequestException( ret['error'] )
+            ex = InvalidRequestException(ret['error'])
             ex.response = ret
             raise ex
         return ret
-

sunlight/services/openstates.py

@@ -8,6 +8,7 @@
 module_name = "openstates"
 service_url = "http://openstates.org/api/v1"
 
+
 class openstates(sunlight.service.Service):
     """
     Bindings into the `Open States API <http://openstates.org/api/>`_. Keep in
@@ -75,7 +76,7 @@ def legislators(self, **kwargs):
         The fields and keyword arguments can be found on the
         `Legislator API docs <http://openstates.org/api/legislators/>`_.
         """
-        return self.get( [ "legislators"], **kwargs )
+        return self.get(["legislators"], **kwargs)
 
     def legislator_detail(self, leg_id, **kwargs):
         """
@@ -98,7 +99,7 @@ def legislator_geo_search(self, latitude, longitude, **kwargs):
         See the Open States documentation for examples of `Legislator Geo
         Lookup <http://openstates.org/api/legislators/#geo-lookup>`_.
         """
-        kwargs['lat']  = latitude
+        kwargs['lat'] = latitude
         kwargs['long'] = longitude
         return self.get(["legislators", "geo"], **kwargs)
 
@@ -132,7 +133,7 @@ def events(self, **kwargs):
         See the Open States' site for details on the
         `Event API <http://openstates.org/api/events/>`_.
         """
-        return self.get([ "events" ], **kwargs)
+        return self.get(["events"], **kwargs)
 
     def event_detail(self, event_id, **kwargs):
         """
@@ -143,8 +144,8 @@ def event_detail(self, event_id, **kwargs):
         See the Open States' site for details on the
         `Event API Fields <http://openstates.org/api/events/#event-fields>`_.
         """
-        lss = [ "events", event_id ]
-        return self.get( lss, **kwargs )
+        lss = ["events", event_id]
+        return self.get(lss, **kwargs)
 
     def districts(self, state, chamber=None, **kwargs):
         """
@@ -185,7 +186,7 @@ def _get_url(self, objs, apikey, **kwargs):
 
         # join pieces by slashes and add a trailing slash
         object_path = "/".join(objs)
-        object_path +=  "/"
+        object_path += "/"
 
         return "%s/%s?apikey=%s&%s" % (
             service_url,