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

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

diff --git a/tweepy/models.py b/tweepy/models.py
index 09ed3eb026a2afd412755e3f32bf47aabc538839..af80986ba6b2bdc0e337567cf7f3ee608ca14ff6 100644 (file)
--- a/tweepy/models.py
+++ b/tweepy/models.py
@@ -77,8 +77,10 @@ class Status(Model):
         status = cls(api)
 
         # I'm not proud. Blame billg.
-        json['text'] = str(json['text'].encode('ascii', 'ignore'))[2:-1]
-        json['user']['screen_name'] = str(json['user']['screen_name'].encode('ascii', 'ignore'))[2:-1]
+        import sys
+        json['text'] = str(json['text'].encode(sys.stdout.encoding, 'replace'))[2:-1]
+        if 'user' in json:
+            json['user']['screen_name'] = str(json['user']['screen_name'].encode(sys.stdout.encoding, 'replace'))[2:-1]
 
         setattr(status, '_json', json)
         for k, v in json.items():