Merge branch 'master' of github.com:guyrt/twitter-data-examples

[twitter-api-cdsw-solutions] / tweepy / error.py

diff --git a/tweepy/error.py b/tweepy/error.py
index 753e2fe676cf2f581a9fe032a71d9c4d638cc471..1c47a5a2c3724fb74c6a56157c990c41856f9b53 100644 (file)
--- a/tweepy/error.py
+++ b/tweepy/error.py
@@ -2,14 +2,18 @@
 # Copyright 2009-2010 Joshua Roesslein
 # See LICENSE for details.
 
 # Copyright 2009-2010 Joshua Roesslein
 # See LICENSE for details.
 

+from __future__ import print_function
+
+import six
+
+

 class TweepError(Exception):
     """Tweepy exception"""
 
     def __init__(self, reason, response=None):
 class TweepError(Exception):
     """Tweepy exception"""
 
     def __init__(self, reason, response=None):

-        self.reason = unicode(reason)
+        self.reason = six.text_type(reason)

         self.response = response
         Exception.__init__(self, reason)
 
     def __str__(self):
         return self.reason
         self.response = response
         Exception.__init__(self, reason)
 
     def __str__(self):
         return self.reason

-