Port to Python 3.3+

.gitignore

@@ -1,8 +1,13 @@
 *.pyc
 *.swp
-build/
-dist/
-tweepy.egg-info/
-.env/
+env.sh
 .coverage
-htmlcov/
+.env
+.idea
+.pdbrc
+.tox
+build
+dist
+cassettes
+htmlcov
+tweepy.egg-info

CONTRIBUTORS

@@ -31,4 +31,4 @@ Stuart Powers
 Jeff Hull (@jsh2134)
 Mike (mikeandmore)
 Kohei YOSHIDA
-
+Mark Smith (@judy2k)

MANIFEST.in

@@ -0,0 +1 @@
+include requirements.txt

README.md

@@ -18,8 +18,7 @@ Github and install it manually:
     cd tweepy
     python setup.py install
 
-**Note** only Python 2.6 and 2.7 are supported at
-the moment. The Python 3 family is not yet supported.
+Python 2.6 and 2.7, 3.3 & 3.4 are supported.
 
 Documentation
 -------------

requirements.txt

@@ -1,2 +1,3 @@
-requests>=2.0.0
-requests_oauthlib==0.4.0
+requests==2.3.0
+requests_oauthlib==0.4.1
+six==1.7.3

run_tests.sh

@@ -3,6 +3,5 @@
 if [[ $TRAVIS_BRANCH == "production" ]]; then
   nosetests -v --with-coverage tests.test_api tests.test_streaming tests.test_cursors tests.test_utils
 else
-  curl "https://dl.dropboxusercontent.com/u/231242/record.json" -o tests/record.json
-  USE_REPLAY=1 nosetests -v tests.test_api tests.test_utils
+  USE_REPLAY=1 nosetests -v --with-coverage tests.test_api tests.test_utils
 fi

test_requirements.txt

@@ -1,5 +1,4 @@
-httreplay==0.1.4
-coveralls==0.2
-unittest2==0.5.1
+tox>=1.7.2
+vcrpy==1.0.2
 mock==1.0.1
-boto==2.27
+unittest2   # Comment this line out if using Python 3.

tests/config.py

@@ -1,37 +1,40 @@
 import os
-import sys
-from unittest2 import TestCase
 
-from httreplay import start_replay, stop_replay
-from httreplay.utils import filter_headers_key
+import vcr
 
 from tweepy.auth import OAuthHandler
 from tweepy.api import API
 
+import six
+if six.PY3:
+    import unittest
+else:
+    import unittest2 as unittest
+
 username = os.environ.get('TWITTER_USERNAME', 'tweepytest')
 oauth_consumer_key = os.environ.get('CONSUMER_KEY', '')
 oauth_consumer_secret = os.environ.get('CONSUMER_SECRET', '')
 oauth_token = os.environ.get('ACCESS_KEY', '')
 oauth_token_secret = os.environ.get('ACCESS_SECRET', '')
 use_replay = os.environ.get('USE_REPLAY', False)
 
-class TweepyTestCase(TestCase):
 
+tape = vcr.VCR(
+    cassette_library_dir='cassettes',
+    filter_headers=['Authorization'],
+    serializer='json',
+    # Either use existing cassettes, or never use recordings:
+    record_mode='new_episodes' if use_replay else 'all',
+)
+
+
+class TweepyTestCase(unittest.TestCase):
     def setUp(self):
         self.auth = create_auth()
         self.api = API(self.auth)
         self.api.retry_count = 2
         self.api.retry_delay = 5
 
-        if use_replay:
-            def filter_body(data): return ''
-            start_replay('tests/record.json',
-                         headers_key=filter_headers_key(['Authorization']),
-                         body_key=filter_body)
-
-    def tearDown(self):
-        if use_replay:
-            stop_replay()
 
 def create_auth():
     auth = OAuthHandler(oauth_consumer_key, oauth_consumer_secret)