Moving congress to deprecated; move to new API soon

 Will maintain congress_deprecated for a few releases.

Author: Paul Tagliamonte

docs/source/index.rst

@@ -11,13 +11,12 @@ projects.
 
 Currently this library supports the following APIs:
 
-* `Sunlight Congress API <http://services.sunlightlabs.com/docs/Sunlight_Congress_API/>`_ (via :ref:`sunlight.congress`)
 * `Open States API <http://openstates.org/api/>`_ (via :ref:`sunlight.openstates`)
+* `Congress API <http://sunlightlabs.github.com/congress/>`_ (via :ref:`sunlight.congress`)
 * `Capitol Words API <http://capitolwords.org/api/>`_ (via :ref:`sunlight.capitolwords`)
 
-Support is pending for the `Influence Explorer API <http://data.influenceexplorer.com/api/>`_ and the
-`Real Time Congress API <http://services.sunlightlabs.com/docs/Real_Time_Congress_API/>`_,
-though these currently have their own Python wrappers.
+* `The old Sunlight Congress API (deprecated) <http://services.sunlightlabs.com/docs/Sunlight_Congress_API/>`_ (via :ref:`sunlight.congress_deprecated`)
+
 
 Installation
 ============

examples/congress/get_nacy renamed to examples/congress_deprecated/get_nacy

@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 
 from __future__ import print_function
-from sunlight import congress
+from sunlight import congress_deprecated as congress
 
 nancy = congress.legislators( lastname="Pelosi" )[0]
 print( "%s %s %s (%s)" % ( nancy['title'], nancy['firstname'],

examples/influenceexplorer/contrib_to_mikulski

@@ -16,12 +16,13 @@
 import sunlight.services.openstates
 import sunlight.services.capitolwords
 import sunlight.services.congress
-import sunlight.services.influenceexplorer
+import sunlight.services.congress_deprecated
 
 openstates = sunlight.services.openstates.Openstates()
 capitolwords = sunlight.services.capitolwords.CapitolWords()
+
 congress = sunlight.services.congress.Congress()
-influenceexplorer = sunlight.services.influenceexplorer.InfluenceExplorer()
+congress_deprecated = sunlight.services.congress_deprecated.Congress()
 
 import os.path
 import warnings
@@ -34,7 +35,6 @@ def available_services():
         'openstates': openstates,
         'capitolwords': capitolwords,
         'congress': congress,
-        'influenceexplorer': influenceexplorer,
     }
 
 

examples/influenceexplorer/homeland_security_grants

@@ -11,12 +11,6 @@
 import sunlight.service
 import json
 
-service_url = "http://services.sunlightlabs.com/api/"
-
-
-def _unpack(resp, key):
-    return [e[key] for e in resp[key + 's']]
-
 
 class Congress(sunlight.service.Service):
     """
@@ -25,132 +19,6 @@ class Congress(sunlight.service.Service):
     primarily for details on current federal legislators.
     """
 
-    def legislators(self, **kwargs):
-        """
-        Query for all legislators matching certain criteria.
-
-        See documentation at `legislators.get(List)
-        <http://services.sunlightlabs.com/docs/congressapi/legislators.get(List)/>`_
-        """
-        return _unpack(self.get('legislators.getList', **kwargs),
-                       'legislator')
-
-    def legislator_search(self, name, threshold=0.9, all_legislators=False,
-                          **kwargs):
-        """
-        Fuzzy-matching name search against federal legislators.
-
-        See documentation at `legislators.search
-        <http://services.sunlightlabs.com/docs/congressapi/legislators.search/>`_
-        """
-        params = kwargs.copy()
-        params.update({'name': name, 'threshold': threshold})
-
-        if all_legislators:
-            params['all_legislators'] = 1
-
-        return _unpack(self.get('legislators.search', **params), 'result')
-
-    def legislators_for_zip(self, zipcode, **kwargs):
-        """
-        Query for all legislators representing a given ZIP code.
-
-        This method is not recommended, prefer legislators_for_lat_lon instead.
-        See the blog post `"Don't Use Zip Codes Unless You Have To"
-        <http://sunlightlabs.com/blog/2012/dont-use-zipcodes/>`_.
-
-        See documentation at `legislators.allForZip
-        <http://services.sunlightlabs.com/docs/congressapi/legislators.allForZip/>`_
-        """
-        params = kwargs.copy()
-        params.update({
-            "zip": zipcode
-        })
-        return _unpack(self.get('legislators.allForZip', **params),
-                       'legislator')
-
-    def legislators_for_lat_lon(self, latitude, longitude, **kwargs):
-        """
-        Query for all legislators representing an given location.
-
-        See documentation at `legislators.allForLatLong
-        <http://services.sunlightlabs.com/docs/congressapi/legislators.allForLatLong/>`_
-        """
-        params = kwargs.copy()
-        params.update({
-            "latitude": latitude,
-            "longitude": longitude
-        })
-        return _unpack(self.get('legislators.allForLatLong', **params),
-                       'legislator')
-
-    def districts_for_zip(self, zipcode, **kwargs):
-        """
-        Query for all congressional districts overlapping a zip code.
-
-        See documentation at `districts.getDistrictFromLatLong
-        <http://services.sunlightlabs.com/docs/congressapi/districts.getDistrictFromLatLong/>`_
-        """
-        params = kwargs.copy()
-        params.update({
-            "zip": zipcode
-        })
-        return _unpack(self.get('districts.getDistrictsFromZip', **params),
-                       'district')
-
-    def districts_for_lat_lon(self, latitude, longitude, **kwargs):
-        """
-        Query for all congressional districts containing a given location.
-
-        See documentation at `districts.getDistrictFromLatLong
-        <http://services.sunlightlabs.com/docs/congressapi/districts.getDistrictFromLatLong/>`_
-        """
-        params = kwargs.copy()
-        params.update({
-            "latitude": latitude,
-            "longitude": longitude
-        })
-        return _unpack(self.get('districts.getDistrictFromLatLong', **params),
-                       'district')
-
-    def committees(self, chamber, **kwargs):
-        """
-        Query for all committees for a chamber.  (House|Senate|Joint)
-
-        See documentation at `committees.getList
-        <http://services.sunlightlabs.com/docs/congressapi/committees.getList/>`_
-        """
-        params = kwargs.copy()
-        params.update({"chamber": chamber})
-        return _unpack(self.get('committees.getList', **params),
-                       'committee')
-
-    def committee_detail(self, committee_id, **kwargs):
-        """
-        Query for all details for a committee, including members.
-
-        See documentation at `committees.get
-        <http://services.sunlightlabs.com/docs/congressapi/committees.get/>`_
-        """
-        params = kwargs.copy()
-        params.update({"id": committee_id})
-        # We can't use _unpack since top level is `committee' not committees
-        return self.get('committees.get', **params)['committee']
-
-    def committees_for_legislator(self, bioguide_id, **kwargs):
-        """
-        Query for all details for all of a legislator's committee assignments.
-
-        See documentation at `committees.allForLegislator
-        <http://services.sunlightlabs.com/docs/congressapi/committees.allForLegislator/>`_
-        """
-        params = kwargs.copy()
-        params.update({
-            "bioguide_id": bioguide_id
-        })
-        return _unpack(self.get('committees.allForLegislator', **params),
-                       'committee')
-
     # implementation methods
     def _get_url(self, obj, apikey, **kwargs):
         return "%s/%s?apikey=%s&%s" % (
@@ -159,6 +27,3 @@ def _get_url(self, obj, apikey, **kwargs):
             apikey,
             sunlight.service.safe_encode(kwargs)
         )
-
-    def _decode_response(self, response):
-        return json.loads(response)['response']