Use six instead of manually maintaining compatibility with PY2.

This makes it easier to use constants for status codes as well.

Author: Flameeyes

cachecontrol/compat.py

@@ -2,17 +2,6 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 
-try:
-    from urllib.parse import urljoin
-except ImportError:
-    from urlparse import urljoin
-
-
-try:
-    import cPickle as pickle
-except ImportError:
-    import pickle
-
 # Handle the case where the requests module has been patched to not have
 # urllib3 bundled as part of its source.
 try:
@@ -24,9 +13,3 @@
     from requests.packages.urllib3.util import is_fp_closed
 except ImportError:
     from urllib3.util import is_fp_closed
-
-# Replicate some six behaviour
-try:
-    text_type = unicode
-except NameError:
-    text_type = str

cachecontrol/serialize.py

@@ -10,7 +10,10 @@
 import msgpack
 from requests.structures import CaseInsensitiveDict
 
-from .compat import HTTPResponse, pickle, text_type
+from six import text_type
+from six.moves import cPickle as pickle
+
+from .compat import HTTPResponse
 
 
 def _b64_decode_bytes(b):

setup.py

@@ -21,7 +21,7 @@
     include_package_data=True,
     description="httplib2 caching for requests",
     long_description=long_description,
-    install_requires=["requests", "msgpack>=0.5.2"],
+    install_requires=["requests", "msgpack>=0.5.2", "six"],
     extras_require={"filecache": ["lockfile>=0.9"], "redis": ["redis>=2.10.5"]},
     entry_points={"console_scripts": ["doesitcache = cachecontrol._cmd:main"]},
     python_requires=">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*",

tests/test_etag.py

@@ -8,7 +8,7 @@
 
 from cachecontrol import CacheControl
 from cachecontrol.cache import DictCache
-from cachecontrol.compat import urljoin
+from six.moves.urllib.parse import urljoin
 
 
 class NullSerializer(object):

tests/test_serialization.py

@@ -6,8 +6,8 @@
 import requests
 from mock import Mock
 
-from cachecontrol.compat import pickle
 from cachecontrol.serialize import Serializer
+from six.moves import cPickle as pickle
 
 
 class TestSerializer(object):

tests/test_vary.py

@@ -7,7 +7,7 @@
 
 from cachecontrol import CacheControl
 from cachecontrol.cache import DictCache
-from cachecontrol.compat import urljoin
+from six.moves.urllib.parse import urljoin
 
 
 class TestVary(object):