Encode basestring instead of just str to utf-8

diff --git a/twitter/oauth.py b/twitter/oauth.py
index be47e961997986e56cccb9eb73f3dcf7814822a1..c11228f78db47c59a699a5d3bc672ecd9725c862 100644 (file)
--- a/twitter/oauth.py
+++ b/twitter/oauth.py
@@ -87,11 +87,11 @@ def urlencode_noplus(query):
     encoded_bits = []
     for n, v in query:
         # and do unicode here while we are at it...
-        if isinstance(n, str):
+        if isinstance(n, basestring):
             n = n.encode('utf-8')
         else:
             n = str(n)
-        if isinstance(v, str):
+        if isinstance(v, basestring):
             v = v.encode('utf-8')
         else:
             v = str(v)