Merge pull request bitly#19 from jsocol/units_is_an_int_19

mccutchen · mccutchen · commit c7668444d27c · 2013-08-01T09:01:55.000-07:00
Not all parameters are strings, _utf8 assumes that they all are
diff --git a/bitly_api/bitly_api.py b/bitly_api/bitly_api.py
@@ -28,6 +28,23 @@ def _utf8(s):
     return s
 
 
+def _utf8_params(params):
+    """encode a dictionary of URL parameters (including iterables) as utf-8"""
+    assert isinstance(params, dict)
+    encoded_params = []
+    for k, v in params.items():
+        if v is None:
+            continue
+        if isinstance(v, (int, long, float)):
+            v = str(v)
+        if isinstance(v, (list, tuple)):
+            v = [_utf8(x) for x in v]
+        else:
+            v = _utf8(v)
+        encoded_params.append((k, v))
+    return dict(encoded_params)
+
+
 class Connection(object):
     """
     This is a python library for accessing the bitly api
@@ -745,14 +762,7 @@ def _call(self, host, method, params, secret=None, timeout=5000):
             params['signature'] = self._generateSignature(params, secret)
 
         # force to utf8 to fix ascii codec errors
-        encoded_params = []
-        for k, v in params.items():
-            if isinstance(v, (list, tuple)):
-                v = [_utf8(e) for e in v]
-            else:
-                v = _utf8(v)
-            encoded_params.append((k, v))
-        params = dict(encoded_params)
+        params = _utf8_params(params)
 
         request = "%(scheme)s://%(host)s/%(method)s?%(params)s" % {
             'scheme': scheme,
