use six.moves instead of _compat

tests/integration/test_basic.py

@@ -3,10 +3,10 @@
 
 # External imports
 import os
+from six.moves.urllib.request import urlopen
 
 # Internal imports
 import vcr
-from vcr._compat import urlopen
 
 
 def test_nonexistent_directory(tmpdir):

tests/integration/test_config.py

@@ -2,7 +2,7 @@ import os
 import json
 import pytest
 import vcr
-from vcr._compat import urlopen
+from six.moves.urllib.request import urlopen
 
 
 def test_set_serializer_default_config(tmpdir):

tests/integration/test_disksaver.py

@@ -4,10 +4,10 @@
 # External imports
 import os
 import time
+from six.moves.urllib.request import urlopen
 
 # Internal imports
 import vcr
-from vcr._compat import urlopen
 
 
 def test_disk_saver_nowrite(tmpdir):

tests/integration/test_multiple.py

@@ -1,6 +1,6 @@
 import pytest
 import vcr
-from vcr._compat import urlopen
+from six.moves.urllib.request import urlopen
 
 
 def test_making_extra_request_raises_exception(tmpdir):

tests/integration/test_record_mode.py

@@ -1,7 +1,7 @@
 import os
 import pytest
 import vcr
-from vcr._compat import urlopen
+from six.moves.urllib.request import urlopen
 
 
 def test_once_record_mode(tmpdir):

tests/integration/test_register_matcher.py

@@ -1,5 +1,5 @@
 import vcr
-from vcr._compat import urlopen
+from six.moves.urllib.request import urlopen
 
 
 def true_matcher(r1, r2):

tests/integration/test_request.py

@@ -1,5 +1,5 @@
 import vcr
-from vcr._compat import urlopen
+from six.moves.urllib.request import urlopen
 
 
 def test_recorded_request_url_with_redirected_request(tmpdir):

tests/integration/test_urllib2.py

@@ -5,10 +5,11 @@
 import os
 
 import pytest
+from six.moves.urllib.request import urlopen
+from six.moves.urllib_parse import urlencode
 
 # Internal imports
 import vcr
-from vcr._compat import urlopen, urlencode
 
 from assertions import assert_cassette_empty, assert_cassette_has_one_response
 

vcr/_compat.py

@@ -1,9 +0,0 @@
-try:
-    import httplib
-    from urllib2 import urlopen
-    from urllib import urlencode
-except ImportError:
-    import http.client as httplib
-    from urllib.request import urlopen
-    from urllib.parse import urlencode
-

vcr/patch.py

@@ -1,7 +1,7 @@
 '''Utilities for patching in cassettes'''
 
 from .stubs import VCRHTTPConnection, VCRHTTPSConnection
-from vcr._compat import httplib
+from six.moves import http_client as httplib
 
 
 # Save some of the original types for the purposes of unpatching