From 6d0a8d8ed9e69c9b4ce5d64fd814cf499d8b8a1c Mon Sep 17 00:00:00 2001
From: Kevin McCarthy <me@kevinmccarthy.org>
Date: Sat, 8 Mar 2014 23:01:49 -1000
Subject: [PATCH] use six.moves instead of _compat

---
 tests/integration/test_basic.py            | 2 +-
 tests/integration/test_config.py           | 2 +-
 tests/integration/test_disksaver.py        | 2 +-
 tests/integration/test_multiple.py         | 2 +-
 tests/integration/test_record_mode.py      | 2 +-
 tests/integration/test_register_matcher.py | 2 +-
 tests/integration/test_request.py          | 2 +-
 tests/integration/test_urllib2.py          | 3 ++-
 vcr/_compat.py                             | 9 ---------
 vcr/patch.py                               | 2 +-
 10 files changed, 10 insertions(+), 18 deletions(-)
 delete mode 100644 vcr/_compat.py

diff --git a/tests/integration/test_basic.py b/tests/integration/test_basic.py
index 8728a13..67c906d 100644
--- a/tests/integration/test_basic.py
+++ b/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):
diff --git a/tests/integration/test_config.py b/tests/integration/test_config.py
index 6b3f4c2..d58e32d 100644
--- a/tests/integration/test_config.py
+++ b/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):
diff --git a/tests/integration/test_disksaver.py b/tests/integration/test_disksaver.py
index 534b1e9..624cbd6 100644
--- a/tests/integration/test_disksaver.py
+++ b/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):
diff --git a/tests/integration/test_multiple.py b/tests/integration/test_multiple.py
index 9458093..db0f2da 100644
--- a/tests/integration/test_multiple.py
+++ b/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):
diff --git a/tests/integration/test_record_mode.py b/tests/integration/test_record_mode.py
index 9e63b1e..a14855f 100644
--- a/tests/integration/test_record_mode.py
+++ b/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):
diff --git a/tests/integration/test_register_matcher.py b/tests/integration/test_register_matcher.py
index c1e11a3..9e542be 100644
--- a/tests/integration/test_register_matcher.py
+++ b/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):
diff --git a/tests/integration/test_request.py b/tests/integration/test_request.py
index 0dbc47b..829c6eb 100644
--- a/tests/integration/test_request.py
+++ b/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):
diff --git a/tests/integration/test_urllib2.py b/tests/integration/test_urllib2.py
index d218796..ad2d47a 100644
--- a/tests/integration/test_urllib2.py
+++ b/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
 
diff --git a/vcr/_compat.py b/vcr/_compat.py
deleted file mode 100644
index 769fe4e..0000000
--- a/vcr/_compat.py
+++ /dev/null
@@ -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
-
diff --git a/vcr/patch.py b/vcr/patch.py
index e5250f6..ed4ffac 100644
--- a/vcr/patch.py
+++ b/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