add unicode-ready safe_encode

Author: jamesturk

sunlight/service.py

@@ -17,10 +17,20 @@
     from urllib.parse import urlencode
     from urllib.request import urlopen
     from urllib.error import HTTPError
+    _str_type = str
 else:
     from urllib import urlencode
     from urllib2 import urlopen
     from urllib2 import HTTPError
+    _str_type = basestring
+
+
+def safe_encode(kwargs):
+    kwargs = kwargs.copy()
+    for k, v in kwargs.iteritems():
+        if isinstance(v, _str_type):
+            kwargs[k] = v.encode('utf8')
+    return urlencode(kwargs)
 
 
 class Service:

sunlight/services/capitolwords.py

@@ -96,7 +96,7 @@ def _get_url( self, obj, apikey, **kwargs ):
             service_url,
             obj,
             apikey,
-            sunlight.service.urlencode(kwargs)
+            sunlight.service.safe_encode(kwargs)
         )
         return ret
 

sunlight/services/congress.py

@@ -131,7 +131,7 @@ def _get_url(self, obj, apikey, **kwargs):
             service_url,
             obj,
             apikey,
-            sunlight.service.urlencode(kwargs)
+            sunlight.service.safe_encode(kwargs)
         )
 
     def _decode_response(self, response):

sunlight/services/influenceexplorer.py

@@ -83,7 +83,7 @@ def _get_url( self, obj, apikey, **kwargs ):
             service_url,
             obj,
             apikey,
-            sunlight.service.urlencode(kwargs)
+            sunlight.service.safe_encode(kwargs)
         )
 
     def _decode_response( self, response ):

sunlight/services/openstates.py

@@ -178,11 +178,6 @@ def district_boundary(self, boundary_id, **kwargs):
     # API impl methods
 
     def _get_url(self, objs, apikey, **kwargs):
-        nargs = {}
-        for arg in kwargs:
-            nargs[arg] = kwargs[arg].encode('utf-8')
-        kwargs = nargs
-
         # Gate for any None's in the query. This is usually a problem.
         if None in objs:
             raise BadRequestException("`None' passed to the URL encoder (%s)" %
@@ -196,7 +191,7 @@ def _get_url(self, objs, apikey, **kwargs):
             service_url,
             object_path,
             apikey,
-            sunlight.service.urlencode(kwargs)
+            sunlight.service.safe_encode(kwargs)
         )
 
     def _decode_response(self, response):