Add Python 2.3 support

This commit also adds the 'six' dependency

tests/integration/test_basic.py

@@ -3,10 +3,10 @@
 
 # External imports
 import os
-import urllib2
 
 # Internal imports
 import vcr
+from vcr._compat import urlopen
 
 
 def test_nonexistent_directory(tmpdir):
@@ -16,7 +16,7 @@ def test_nonexistent_directory(tmpdir):
 
     # Run VCR to create dir and cassette file
     with vcr.use_cassette(str(tmpdir.join('nonexistent', 'cassette.yml'))):
-        urllib2.urlopen('http://httpbin.org/').read()
+        urlopen('http://httpbin.org/').read()
 
     # This should have made the file and the directory
     assert os.path.exists(str(tmpdir.join('nonexistent', 'cassette.yml')))
@@ -25,11 +25,11 @@ def test_nonexistent_directory(tmpdir):
 def test_unpatch(tmpdir):
     '''Ensure that our cassette gets unpatched when we're done'''
     with vcr.use_cassette(str(tmpdir.join('unpatch.yaml'))) as cass:
-        urllib2.urlopen('http://httpbin.org/').read()
+        urlopen('http://httpbin.org/').read()
 
     # Make the same request, and assert that we haven't served any more
     # requests out of cache
-    urllib2.urlopen('http://httpbin.org/').read()
+    urlopen('http://httpbin.org/').read()
     assert cass.play_count == 0
 
 
@@ -38,10 +38,10 @@ def test_basic_use(tmpdir):
     Copied from the docs
     '''
     with vcr.use_cassette('fixtures/vcr_cassettes/synopsis.yaml'):
-        response = urllib2.urlopen(
+        response = urlopen(
             'http://www.iana.org/domains/reserved'
         ).read()
-        assert 'Example domains' in response
+        assert b'Example domains' in response
 
 
 def test_basic_json_use(tmpdir):
@@ -50,8 +50,8 @@ def test_basic_json_use(tmpdir):
     '''
     test_fixture = 'fixtures/vcr_cassettes/synopsis.json'
     with vcr.use_cassette(test_fixture, serializer='json'):
-        response = urllib2.urlopen('http://httpbin.org/').read()
-        assert 'difficult sometimes' in response
+        response = urlopen('http://httpbin.org/').read()
+        assert b'difficult sometimes' in response
 
 
 def test_patched_content(tmpdir):
@@ -60,16 +60,16 @@ def test_patched_content(tmpdir):
     request
     '''
     with vcr.use_cassette(str(tmpdir.join('synopsis.yaml'))) as cass:
-        response = urllib2.urlopen('http://httpbin.org/').read()
+        response = urlopen('http://httpbin.org/').read()
         assert cass.play_count == 0
 
     with vcr.use_cassette(str(tmpdir.join('synopsis.yaml'))) as cass:
-        response2 = urllib2.urlopen('http://httpbin.org/').read()
+        response2 = urlopen('http://httpbin.org/').read()
         assert cass.play_count == 1
         cass._save(force=True)
 
     with vcr.use_cassette(str(tmpdir.join('synopsis.yaml'))) as cass:
-        response3 = urllib2.urlopen('http://httpbin.org/').read()
+        response3 = urlopen('http://httpbin.org/').read()
         assert cass.play_count == 1
 
     assert response == response2
@@ -85,16 +85,16 @@ def test_patched_content_json(tmpdir):
     testfile = str(tmpdir.join('synopsis.json'))
 
     with vcr.use_cassette(testfile) as cass:
-        response = urllib2.urlopen('http://httpbin.org/').read()
+        response = urlopen('http://httpbin.org/').read()
         assert cass.play_count == 0
 
     with vcr.use_cassette(testfile) as cass:
-        response2 = urllib2.urlopen('http://httpbin.org/').read()
+        response2 = urlopen('http://httpbin.org/').read()
         assert cass.play_count == 1
         cass._save(force=True)
 
     with vcr.use_cassette(testfile) as cass:
-        response3 = urllib2.urlopen('http://httpbin.org/').read()
+        response3 = urlopen('http://httpbin.org/').read()
         assert cass.play_count == 1
 
     assert response == response2

tests/integration/test_config.py

@@ -1,8 +1,8 @@
 import os
 import json
-import urllib2
 import pytest
 import vcr
+from vcr._compat import urlopen
 
 
 def test_set_serializer_default_config(tmpdir):
@@ -10,7 +10,7 @@ def test_set_serializer_default_config(tmpdir):
 
     with my_vcr.use_cassette(str(tmpdir.join('test.json'))):
         assert my_vcr.serializer == 'json'
-        urllib2.urlopen('http://httpbin.org/get')
+        urlopen('http://httpbin.org/get')
 
     with open(str(tmpdir.join('test.json'))) as f:
         assert json.loads(f.read())
@@ -20,7 +20,7 @@ def test_default_set_cassette_library_dir(tmpdir):
     my_vcr = vcr.VCR(cassette_library_dir=str(tmpdir.join('subdir')))
 
     with my_vcr.use_cassette('test.json'):
-        urllib2.urlopen('http://httpbin.org/get')
+        urlopen('http://httpbin.org/get')
 
     assert os.path.exists(str(tmpdir.join('subdir').join('test.json')))
 
@@ -31,7 +31,7 @@ def test_override_set_cassette_library_dir(tmpdir):
     cld = str(tmpdir.join('subdir2'))
 
     with my_vcr.use_cassette('test.json', cassette_library_dir=cld):
-        urllib2.urlopen('http://httpbin.org/get')
+        urlopen('http://httpbin.org/get')
 
     assert os.path.exists(str(tmpdir.join('subdir2').join('test.json')))
     assert not os.path.exists(str(tmpdir.join('subdir').join('test.json')))
@@ -41,10 +41,10 @@ def test_override_match_on(tmpdir):
     my_vcr = vcr.VCR(match_on=['method'])
 
     with my_vcr.use_cassette(str(tmpdir.join('test.json'))):
-        urllib2.urlopen('http://httpbin.org/')
+        urlopen('http://httpbin.org/')
 
     with my_vcr.use_cassette(str(tmpdir.join('test.json'))) as cass:
-        urllib2.urlopen('http://httpbin.org/get')
+        urlopen('http://httpbin.org/get')
 
     assert len(cass) == 1
     assert cass.play_count == 1

tests/integration/test_disksaver.py

@@ -3,11 +3,11 @@
 
 # External imports
 import os
-import urllib2
 import time
 
 # Internal imports
 import vcr
+from vcr._compat import urlopen
 
 
 def test_disk_saver_nowrite(tmpdir):
@@ -17,12 +17,12 @@ def test_disk_saver_nowrite(tmpdir):
     '''
     fname = str(tmpdir.join('synopsis.yaml'))
     with vcr.use_cassette(fname) as cass:
-        urllib2.urlopen('http://www.iana.org/domains/reserved').read()
+        urlopen('http://www.iana.org/domains/reserved').read()
         assert cass.play_count == 0
     last_mod = os.path.getmtime(fname)
 
     with vcr.use_cassette(fname) as cass:
-        urllib2.urlopen('http://www.iana.org/domains/reserved').read()
+        urlopen('http://www.iana.org/domains/reserved').read()
         assert cass.play_count == 1
         assert cass.dirty is False
     last_mod2 = os.path.getmtime(fname)
@@ -37,7 +37,7 @@ def test_disk_saver_write(tmpdir):
     '''
     fname = str(tmpdir.join('synopsis.yaml'))
     with vcr.use_cassette(fname) as cass:
-        urllib2.urlopen('http://www.iana.org/domains/reserved').read()
+        urlopen('http://www.iana.org/domains/reserved').read()
         assert cass.play_count == 0
     last_mod = os.path.getmtime(fname)
 
@@ -46,8 +46,8 @@ def test_disk_saver_write(tmpdir):
     time.sleep(1)
 
     with vcr.use_cassette(fname, record_mode='any') as cass:
-        urllib2.urlopen('http://www.iana.org/domains/reserved').read()
-        urllib2.urlopen('http://httpbin.org/').read()
+        urlopen('http://www.iana.org/domains/reserved').read()
+        urlopen('http://httpbin.org/').read()
         assert cass.play_count == 1
         assert cass.dirty
     last_mod2 = os.path.getmtime(fname)

tests/integration/test_multiple.py

@@ -1,6 +1,6 @@
 import pytest
-from urllib2 import urlopen
 import vcr
+from vcr._compat import urlopen
 
 
 def test_making_extra_request_raises_exception(tmpdir):

tests/integration/test_record_mode.py

@@ -1,46 +1,46 @@
 import os
-import urllib2
 import pytest
 import vcr
+from vcr._compat import urlopen
 
 
 def test_once_record_mode(tmpdir):
     testfile = str(tmpdir.join('recordmode.yml'))
     with vcr.use_cassette(testfile, record_mode="once"):
         # cassette file doesn't exist, so create.
-        response = urllib2.urlopen('http://httpbin.org/').read()
+        response = urlopen('http://httpbin.org/').read()
 
     with vcr.use_cassette(testfile, record_mode="once") as cass:
         # make the same request again
-        response = urllib2.urlopen('http://httpbin.org/').read()
+        response = urlopen('http://httpbin.org/').read()
 
         # the first time, it's played from the cassette.
         # but, try to access something else from the same cassette, and an
         # exception is raised.
         with pytest.raises(Exception):
-            response = urllib2.urlopen('http://httpbin.org/get').read()
+            response = urlopen('http://httpbin.org/get').read()
 
 
 def test_once_record_mode_two_times(tmpdir):
     testfile = str(tmpdir.join('recordmode.yml'))
     with vcr.use_cassette(testfile, record_mode="once"):
         # get two of the same file
-        response1 = urllib2.urlopen('http://httpbin.org/').read()
-        response2 = urllib2.urlopen('http://httpbin.org/').read()
+        response1 = urlopen('http://httpbin.org/').read()
+        response2 = urlopen('http://httpbin.org/').read()
 
     with vcr.use_cassette(testfile, record_mode="once") as cass:
         # do it again
-        response = urllib2.urlopen('http://httpbin.org/').read()
-        response = urllib2.urlopen('http://httpbin.org/').read()
+        response = urlopen('http://httpbin.org/').read()
+        response = urlopen('http://httpbin.org/').read()
 
 
 def test_once_mode_three_times(tmpdir):
     testfile = str(tmpdir.join('recordmode.yml'))
     with vcr.use_cassette(testfile, record_mode="once"):
         # get three of the same file
-        response1 = urllib2.urlopen('http://httpbin.org/').read()
-        response2 = urllib2.urlopen('http://httpbin.org/').read()
-        response2 = urllib2.urlopen('http://httpbin.org/').read()
+        response1 = urlopen('http://httpbin.org/').read()
+        response2 = urlopen('http://httpbin.org/').read()
+        response2 = urlopen('http://httpbin.org/').read()
 
 
 def test_new_episodes_record_mode(tmpdir):
@@ -48,15 +48,15 @@ def test_new_episodes_record_mode(tmpdir):
 
     with vcr.use_cassette(testfile, record_mode="new_episodes"):
         # cassette file doesn't exist, so create.
-        response = urllib2.urlopen('http://httpbin.org/').read()
+        response = urlopen('http://httpbin.org/').read()
 
     with vcr.use_cassette(testfile, record_mode="new_episodes") as cass:
         # make the same request again
-        response = urllib2.urlopen('http://httpbin.org/').read()
+        response = urlopen('http://httpbin.org/').read()
 
         # in the "new_episodes" record mode, we can add more requests to
         # a cassette without repurcussions.
-        response = urllib2.urlopen('http://httpbin.org/get').read()
+        response = urlopen('http://httpbin.org/get').read()
 
         # the first interaction was not re-recorded, but the second was added
         assert cass.play_count == 1
@@ -67,15 +67,15 @@ def test_all_record_mode(tmpdir):
 
     with vcr.use_cassette(testfile, record_mode="all"):
         # cassette file doesn't exist, so create.
-        response = urllib2.urlopen('http://httpbin.org/').read()
+        response = urlopen('http://httpbin.org/').read()
 
     with vcr.use_cassette(testfile, record_mode="all") as cass:
         # make the same request again
-        response = urllib2.urlopen('http://httpbin.org/').read()
+        response = urlopen('http://httpbin.org/').read()
 
         # in the "all" record mode, we can add more requests to
         # a cassette without repurcussions.
-        response = urllib2.urlopen('http://httpbin.org/get').read()
+        response = urlopen('http://httpbin.org/get').read()
 
         # The cassette was never actually played, even though it existed.
         # that's because, in "all" mode, the requests all go directly to
@@ -89,7 +89,7 @@ def test_none_record_mode(tmpdir):
     testfile = str(tmpdir.join('recordmode.yml'))
     with vcr.use_cassette(testfile, record_mode="none"):
         with pytest.raises(Exception):
-            response = urllib2.urlopen('http://httpbin.org/').read()
+            response = urlopen('http://httpbin.org/').read()
 
 
 def test_none_record_mode_with_existing_cassette(tmpdir):
@@ -97,12 +97,12 @@ def test_none_record_mode_with_existing_cassette(tmpdir):
     testfile = str(tmpdir.join('recordmode.yml'))
 
     with vcr.use_cassette(testfile, record_mode="all"):
-        response = urllib2.urlopen('http://httpbin.org/').read()
+        response = urlopen('http://httpbin.org/').read()
 
     # play from cassette file
     with vcr.use_cassette(testfile, record_mode="none") as cass:
-        response = urllib2.urlopen('http://httpbin.org/').read()
+        response = urlopen('http://httpbin.org/').read()
         assert cass.play_count == 1
         # but if I try to hit the net, raise an exception.
         with pytest.raises(Exception):
-            response = urllib2.urlopen('http://httpbin.org/get').read()
+            response = urlopen('http://httpbin.org/get').read()

tests/integration/test_register_matcher.py

@@ -1,5 +1,5 @@
-import urllib2
 import vcr
+from vcr._compat import urlopen
 
 
 def true_matcher(r1, r2):
@@ -16,13 +16,13 @@ def test_registered_serializer_true_matcher(tmpdir):
     testfile = str(tmpdir.join('test.yml'))
     with my_vcr.use_cassette(testfile, match_on=['true']) as cass:
         # These 2 different urls are stored as the same request
-        urllib2.urlopen('http://httpbin.org/')
-        urllib2.urlopen('https://httpbin.org/get')
+        urlopen('http://httpbin.org/')
+        urlopen('https://httpbin.org/get')
 
     with my_vcr.use_cassette(testfile, match_on=['true']) as cass:
         # I can get the response twice even though I only asked for it once
-        urllib2.urlopen('http://httpbin.org/get')
-        urllib2.urlopen('https://httpbin.org/get')
+        urlopen('http://httpbin.org/get')
+        urlopen('https://httpbin.org/get')
 
 
 def test_registered_serializer_false_matcher(tmpdir):
@@ -31,6 +31,6 @@ def test_registered_serializer_false_matcher(tmpdir):
     testfile = str(tmpdir.join('test.yml'))
     with my_vcr.use_cassette(testfile, match_on=['false']) as cass:
         # These 2 different urls are stored as different requests
-        urllib2.urlopen('http://httpbin.org/')
-        urllib2.urlopen('https://httpbin.org/get')
+        urlopen('http://httpbin.org/')
+        urlopen('https://httpbin.org/get')
         assert len(cass) == 2

tests/integration/test_register_serializer.py

@@ -1,4 +1,3 @@
-import urllib2
 import vcr
 
 

tests/integration/test_request.py

@@ -1,11 +1,11 @@
-import urllib2
 import vcr
+from vcr._compat import urlopen
 
 
 def test_recorded_request_url_with_redirected_request(tmpdir):
     with vcr.use_cassette(str(tmpdir.join('test.yml'))) as cass:
         assert len(cass) == 0
-        urllib2.urlopen('http://httpbin.org/redirect/3')
+        urlopen('http://httpbin.org/redirect/3')
         assert cass.requests[0].url == 'http://httpbin.org/redirect/3'
         assert cass.requests[3].url == 'http://httpbin.org/get'
         assert len(cass) == 4

tests/integration/test_urllib2.py

@@ -3,12 +3,12 @@
 
 # External imports
 import os
-import urllib2
-from urllib import urlencode
+
 import pytest
 
 # Internal imports
 import vcr
+from vcr._compat import urlopen, urlencode
 
 from assertions import assert_cassette_empty, assert_cassette_has_one_response
 
@@ -25,30 +25,30 @@ def test_response_code(scheme, tmpdir):
     '''Ensure we can read a response code from a fetch'''
     url = scheme + '://httpbin.org/'
     with vcr.use_cassette(str(tmpdir.join('atts.yaml'))) as cass:
-        code = urllib2.urlopen(url).getcode()
+        code = urlopen(url).getcode()
 
     with vcr.use_cassette(str(tmpdir.join('atts.yaml'))) as cass:
-        assert code == urllib2.urlopen(url).getcode()
+        assert code == urlopen(url).getcode()
 
 
 def test_random_body(scheme, tmpdir):
     '''Ensure we can read the content, and that it's served from cache'''
     url = scheme + '://httpbin.org/bytes/1024'
     with vcr.use_cassette(str(tmpdir.join('body.yaml'))) as cass:
-        body = urllib2.urlopen(url).read()
+        body = urlopen(url).read()
 
     with vcr.use_cassette(str(tmpdir.join('body.yaml'))) as cass:
-        assert body == urllib2.urlopen(url).read()
+        assert body == urlopen(url).read()
 
 
 def test_response_headers(scheme, tmpdir):
     '''Ensure we can get information from the response'''
     url = scheme + '://httpbin.org/'
     with vcr.use_cassette(str(tmpdir.join('headers.yaml'))) as cass:
-        open1 = urllib2.urlopen(url).info().items()
+        open1 = urlopen(url).info().items()
 
     with vcr.use_cassette(str(tmpdir.join('headers.yaml'))) as cass:
-        open2 = urllib2.urlopen(url).info().items()
+        open2 = urlopen(url).info().items()
         assert open1 == open2
 
 
@@ -61,7 +61,7 @@ def test_multiple_requests(scheme, tmpdir):
         scheme + '://httpbin.org/bytes/1024'
     ]
     with vcr.use_cassette(str(tmpdir.join('multiple.yaml'))) as cass:
-        map(urllib2.urlopen, urls)
+        [urlopen(url) for url in urls]
     assert len(cass) == len(urls)
 
 
@@ -70,23 +70,23 @@ def test_get_data(scheme, tmpdir):
     data = urlencode({'some': 1, 'data': 'here'})
     url = scheme + '://httpbin.org/get?' + data
     with vcr.use_cassette(str(tmpdir.join('get_data.yaml'))) as cass:
-        res1 = urllib2.urlopen(url).read()
+        res1 = urlopen(url).read()
 
     with vcr.use_cassette(str(tmpdir.join('get_data.yaml'))) as cass:
-        res2 = urllib2.urlopen(url).read()
+        res2 = urlopen(url).read()
 
     assert res1 == res2
 
 
 def test_post_data(scheme, tmpdir):
     '''Ensure that it works when posting data'''
-    data = urlencode({'some': 1, 'data': 'here'})
+    data = urlencode({'some': 1, 'data': 'here'}).encode('utf-8')
     url = scheme + '://httpbin.org/post'
     with vcr.use_cassette(str(tmpdir.join('post_data.yaml'))) as cass:
-        res1 = urllib2.urlopen(url, data).read()
+        res1 = urlopen(url, data).read()
 
     with vcr.use_cassette(str(tmpdir.join('post_data.yaml'))) as cass:
-        res2 = urllib2.urlopen(url, data).read()
+        res2 = urlopen(url, data).read()
 
     assert res1 == res2
     assert_cassette_has_one_response(cass)
@@ -94,12 +94,12 @@ def test_post_data(scheme, tmpdir):
 
 def test_post_unicode_data(scheme, tmpdir):
     '''Ensure that it works when posting unicode data'''
-    data = urlencode({'snowman': u'☃'.encode('utf-8')})
+    data = urlencode({'snowman': u'☃'.encode('utf-8')}).encode('utf-8')
     url = scheme + '://httpbin.org/post'
     with vcr.use_cassette(str(tmpdir.join('post_data.yaml'))) as cass:
-        res1 = urllib2.urlopen(url, data).read()
+        res1 = urlopen(url, data).read()
     with vcr.use_cassette(str(tmpdir.join('post_data.yaml'))) as cass:
-        res2 = urllib2.urlopen(url, data).read()
+        res2 = urlopen(url, data).read()
     assert res1 == res2
     assert_cassette_has_one_response(cass)
 
@@ -110,8 +110,8 @@ def test_cross_scheme(tmpdir):
     # ensure that we haven't served anything out of cache, and we have two
     # requests / response pairs in the cassette
     with vcr.use_cassette(str(tmpdir.join('cross_scheme.yaml'))) as cass:
-        urllib2.urlopen('https://httpbin.org/')
-        urllib2.urlopen('http://httpbin.org/')
+        urlopen('https://httpbin.org/')
+        urlopen('http://httpbin.org/')
         assert len(cass) == 2
         assert cass.play_count == 0
 
@@ -121,10 +121,10 @@ def test_decorator(scheme, tmpdir):
 
     @vcr.use_cassette(str(tmpdir.join('atts.yaml')))
     def inner1():
-        return urllib2.urlopen(url).getcode()
+        return urlopen(url).getcode()
 
     @vcr.use_cassette(str(tmpdir.join('atts.yaml')))
     def inner2():
-        return urllib2.urlopen(url).getcode()
+        return urlopen(url).getcode()
 
     assert inner1() == inner2()

tests/integration/test_wild.py

@@ -3,7 +3,10 @@ requests = pytest.importorskip("requests")
 
 import vcr
 
-import httplib
+try:
+    import httplib
+except ImportError:
+    import http.client as httplib
 
 
 def test_domain_redirect():