Merge pull request twilio#116 from jvankoten/master

Kevin Burke · Kevin Burke · commit 2ae07978b82d · 2013-05-20T19:52:40.000-07:00
Fixing 'data should be either a binary or a string'
diff --git a/twilio/rest/resources/base.py b/twilio/rest/resources/base.py
@@ -1,5 +1,5 @@
 import logging
-from six import text_type, iteritems, binary_type
+from six import integer_types, string_types, binary_type, iteritems
 from twilio.compat import urlparse
 from twilio.compat import urlencode
 
@@ -40,12 +40,12 @@ def make_request(method, url, params=None, data=None, headers=None,
         udata = {}
         for k, v in iteritems(data):
             key = k.encode('utf-8')
-            if isinstance(v, text_type):
-                udata[key] = v.encode('utf-8')
-            elif isinstance(v, binary_type):
+            if isinstance(v, (integer_types, binary_type)):
                 udata[key] = v
+            elif isinstance(v, string_types):
+                udata[key] = v.encode('utf-8')
             else:
-                raise ValueError('data should be either a binary or a string')
+                raise ValueError('data should be iinteger or binary or string')
         data = urlencode(udata)
 
     if params is not None:
