Adding in some URL encoding fixes

Author: Paul Tagliamonte

ChangeLog

@@ -1,3 +1,8 @@
+2012-04-12  Paul Tagliamonte  <[email protected]>
+
+* sunlight/services/capitolwords.py: Fixed a URL Encoding issue that was
+sitting there, undiscovered. Thanks, dandrinkard!
+
 2012-02-27  James Turk  <[email protected]>
 
 [James]

sunlight/__init__.py

@@ -11,7 +11,7 @@
 """
 
 __appname__ = "sunlight"
-__version__ = "1.1.1"
+__version__ = "1.1.2"
 
 import sunlight.services.openstates
 import sunlight.services.capitolwords

sunlight/services/capitolwords.py

@@ -92,13 +92,12 @@ def text( self, phrase=None, title=None, **kwargs ):
     # API impl methods below
 
     def _get_url( self, obj, apikey, **kwargs ):
-        ret = "%s/%s.json?apikey=%s" % (
+        ret = "%s/%s.json?apikey=%s&%s" % (
             service_url,
             obj,
-            apikey
+            apikey,
+            sunlight.service.urlencode(kwargs)
         )
-        for arg in kwargs:
-            ret += "&%s=%s" % ( arg, kwargs[arg] )
         return ret
 
     def _decode_response( self, response ):

sunlight/services/influenceexplorer.py

@@ -79,14 +79,12 @@ def entities(self, **kwargs):
     # API impl methods below
 
     def _get_url( self, obj, apikey, **kwargs ):
-        ret = "%s/%s.json?apikey=%s" % (
+        return "%s/%s?apikey=%s&%s" % (
             service_url,
             obj,
-            apikey
+            apikey,
+            sunlight.service.urlencode(kwargs)
         )
-        for arg in kwargs:
-            ret += "&%s=%s" % ( arg, kwargs[arg] )
-        return ret
 
     def _decode_response( self, response ):
         ret = json.loads( response )