X-Git-Url: https://jfr.im/git/z_archive/twitter.git/blobdiff_plain/82a93c036394fa6d7b40914e21617c7494a193fd..0a24ba9ece4445032c2fcdccf0264065b062eb5f:/twitter/api.py

diff --git a/twitter/api.py b/twitter/api.py
index ba9ce5d..0ebc814 100644
--- a/twitter/api.py
+++ b/twitter/api.py
@@ -10,8 +10,8 @@ try:
 except ImportError:
     from io import BytesIO as StringIO
 
-from twitter.twitter_globals import POST_ACTIONS
-from twitter.auth import NoAuth
+from .twitter_globals import POST_ACTIONS
+from .auth import NoAuth
 
 import re
 import gzip
@@ -21,10 +21,7 @@ try:
 except ImportError:
     import httplib as http_client
 
-try:
-    import json
-except ImportError:
-    import simplejson as json
+import json
 
 
 class _DEFAULT(object):
@@ -108,6 +105,8 @@ def wrap_response(response, headers):
     if response_typ is bool:
         # HURF DURF MY NAME IS PYTHON AND I CAN'T SUBCLASS bool.
         response_typ = int
+    elif response_typ is str:
+        return response
 
     class WrappedTwitterResponse(response_typ, TwitterResponse):
         __doc__ = TwitterResponse.__doc__
@@ -118,7 +117,6 @@ def wrap_response(response, headers):
         def __new__(cls, response, headers):
             return response_typ.__new__(cls, response)
 
-
     return WrappedTwitterResponse(response, headers)