From: Kenneth Falck <redacted>
Date: Wed, 14 Sep 2011 20:25:19 +0000 (+0300)
Subject: Encode basestring instead of just str to utf-8
X-Git-Tag: twitter-1.7~8^2
X-Git-Url: https://jfr.im/git/z_archive/twitter.git/commitdiff_plain/21942f5c9836152818365fd867b1d2c66eb82952?hp=-c

Encode basestring instead of just str to utf-8
---

21942f5c9836152818365fd867b1d2c66eb82952
diff --git a/twitter/oauth.py b/twitter/oauth.py
index be47e96..c11228f 100644
--- 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)