Try to restore Python 3.2 compat by using futuristic unicode literals.

diff --git a/.travis.yml b/.travis.yml
index b36c0e4cb4da7d1d0cd571072743248403d0bce5..1a263441025a007310947b7cec76051804aa1dc1 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -20,6 +20,5 @@ after_success:
 
 matrix:
   allow_failures:
-    - python: "3.2"
     - python: "3.4"
     - python: "pypy"

diff --git a/tests/test_sanity.py b/tests/test_sanity.py
index 19885060812c3a2c539ecd4ad9cd343c018dfbc3..6e5f0c492a7880e4f13ff06e8fe5e502011e9bb6 100644 (file)
--- a/tests/test_sanity.py
+++ b/tests/test_sanity.py
@@ -1,4 +1,5 @@
-# encoding: utf8
+# encoding: utf-8
+from __future__ import unicode_literals
 
 from random import choice
 import time
@@ -31,21 +32,23 @@ def get_random_str():
 def test_API_set_tweet():
     random_tweet = "A random tweet " + get_random_str()
     twitter11.statuses.update(status=random_tweet)
-    time.sleep(2)
+    time.sleep(5)
     recent = twitter11.statuses.home_timeline()
     assert recent
     assert isinstance(recent.rate_limit_remaining, int)
     assert isinstance(recent.rate_limit_reset, int)
-    assert random_tweet == recent[0]['text']
+    texts = [tweet['text'] for tweet in recent]
+    assert random_tweet in texts
 
 
 def test_API_set_unicode_tweet():
-    random_tweet = u"A random tweet with unicode üøπ" + get_random_str()
+    random_tweet = "A random tweet with unicode üøπ" + get_random_str()
     twitter11.statuses.update(status=random_tweet)
-
+    time.sleep(5)
     recent = twitter11.statuses.home_timeline()
     assert recent
-    assert random_tweet == recent[0]['text']
+    texts = [tweet['text'] for tweet in recent]
+    assert random_tweet in texts
 
 
 def test_search():
@@ -109,5 +112,3 @@ def test_jsonifability():
     res2 = json.loads(p)
     assert res == res2
     assert res2[2] == 3
-
-# End of file

diff --git a/tests/test_util.py b/tests/test_util.py
index b8efea92334b5b3e3ce446ba4ff512244aa2a36c..d7a1f6ee8cf7f9830bedfd11ab51e0d9fd4f4fbb 100644 (file)
--- a/tests/test_util.py
+++ b/tests/test_util.py
@@ -1,3 +1,6 @@
+# encoding: utf-8
+from __future__ import unicode_literals
+
 from collections import namedtuple
 import contextlib
 import functools

diff --git a/twitter/api.py b/twitter/api.py
index c4187997554d60413da1ca3374bbaa54b100de64..be0ef43f3add9f2e9c67a335e004f227b83906c3 100644 (file)
--- a/twitter/api.py
+++ b/twitter/api.py
@@ -1,3 +1,6 @@
+# encoding: utf-8
+from __future__ import unicode_literals
+
 try:
     import urllib.request as urllib_request
     import urllib.error as urllib_error

diff --git a/twitter/stream.py b/twitter/stream.py
index bc18f8e3fad0f0e8769cfc85b95991db86ea12f9..6a7753a77733a1b2672ef2c638df3f434523a5d4 100644 (file)
--- a/twitter/stream.py
+++ b/twitter/stream.py
@@ -1,3 +1,6 @@
+# encoding: utf-8
+from __future__ import unicode_literals
+
 import sys
 PY_3_OR_HIGHER = sys.version_info >= (3, 0)
 
@@ -81,7 +84,7 @@ class HttpChunkDecoder(object):
 class JsonDecoder(object):
 
     def __init__(self):
-        self.buf = u""
+        self.buf = ""
         self.raw_decode = json.JSONDecoder().raw_decode
 
     def decode(self, data):