refactor: Remove most of _compat and python 2 support

Author: tony

libvcs/_compat.py

@@ -1,72 +1,17 @@
 # flake8: NOQA
 import sys
 
-PY2 = sys.version_info[0] == 2
-
 _identity = lambda x: x
+implements_to_string = _identity
 
+console_encoding = sys.__stdout__.encoding
 
-if PY2:
-    unichr = unichr
-    text_type = unicode
-    string_types = (str, unicode)
-    from urllib import urlretrieve
-
-    iterkeys = lambda d: d.iterkeys()
-    itervalues = lambda d: d.itervalues()
-    iteritems = lambda d: d.iteritems()
-
-    import ConfigParser as configparser
-    import cPickle as pickle
-    from cStringIO import StringIO as BytesIO
-    from StringIO import StringIO
-
-    cmp = cmp
 
-    input = raw_input
-    from string import lower as ascii_lowercase
-
-    import urlparse
-
-    def console_to_str(s):
+def console_to_str(s):
+    """ From pypa/pip project, pip.backwardwardcompat. License MIT. """
+    try:
+        return s.decode(console_encoding)
+    except UnicodeDecodeError:
         return s.decode('utf_8')
-
-    def implements_to_string(cls):
-        cls.__unicode__ = cls.__str__
-        cls.__str__ = lambda x: x.__unicode__().encode('utf-8')
-        return cls
-
-
-else:
-    unichr = chr
-    text_type = str
-    string_types = (str,)
-
-    iterkeys = lambda d: iter(d.keys())
-    itervalues = lambda d: iter(d.values())
-    iteritems = lambda d: iter(d.items())
-
-    import configparser
-    import pickle
-    from io import BytesIO, StringIO
-
-    cmp = lambda a, b: (a > b) - (a < b)
-
-    input = input
-    import urllib.parse as urllib
-    import urllib.parse as urlparse
-    from string import ascii_lowercase
-    from urllib.request import urlretrieve
-
-    console_encoding = sys.__stdout__.encoding
-
-    implements_to_string = _identity
-
-    def console_to_str(s):
-        """ From pypa/pip project, pip.backwardwardcompat. License MIT. """
-        try:
-            return s.decode(console_encoding)
-        except UnicodeDecodeError:
-            return s.decode('utf_8')
-        except AttributeError:  # for tests, #13
-            return s
+    except AttributeError:  # for tests, #13
+        return s

libvcs/base.py

@@ -5,8 +5,8 @@
 import logging
 import os
 from typing import NamedTuple
+from urllib import parse as urlparse
 
-from ._compat import implements_to_string, urlparse
 from .util import RepoLoggingAdapter, mkdir_p, run
 
 logger = logging.getLogger(__name__)
@@ -34,7 +34,6 @@ def convert_pip_url(pip_url: str) -> VCSLocation:
     return VCSLocation(url=url, rev=rev)
 
 
-@implements_to_string
 class BaseRepo(RepoLoggingAdapter, object):
 
     """Base class for repositories.

libvcs/git.py

@@ -19,9 +19,9 @@
 import os
 import re
 from typing import NamedTuple, Optional
+from urllib import parse as urlparse
 
 from . import exc
-from ._compat import urlparse
 from .base import BaseRepo, VCSLocation, convert_pip_url as base_convert_pip_url
 
 logger = logging.getLogger(__name__)

libvcs/svn.py

@@ -18,8 +18,8 @@
 import logging
 import os
 import re
+from urllib import parse as urlparse
 
-from ._compat import urlparse
 from .base import BaseRepo, VCSLocation, convert_pip_url as base_convert_pip_url
 
 logger = logging.getLogger(__name__)

tests/test_base.py

@@ -2,15 +2,14 @@
 """tests for libvcs repo abstract base class."""
 from __future__ import absolute_import, print_function, unicode_literals
 
-from libvcs._compat import text_type
 from libvcs.base import BaseRepo, convert_pip_url
 from libvcs.shortcuts import create_repo
 
 
 def test_repr():
     repo = create_repo(url='file://path/to/myrepo', repo_dir='/hello/', vcs='git')
 
-    str_repo = text_type(repo)
+    str_repo = str(repo)
     assert 'GitRepo' in str_repo
     assert 'hello' in str_repo
     assert '<GitRepo hello>' == str_repo
@@ -19,7 +18,7 @@ def test_repr():
 def test_repr_base():
     repo = BaseRepo(url='file://path/to/myrepo', repo_dir='/hello/')
 
-    str_repo = text_type(repo)
+    str_repo = str(repo)
     assert 'Repo' in str_repo
     assert 'hello' in str_repo
     assert '<BaseRepo hello>' == str_repo

tests/test_git.py

@@ -9,7 +9,6 @@
 import pytest
 
 from libvcs import exc
-from libvcs._compat import PY2, string_types
 from libvcs.git import GitRemote, convert_pip_url as git_convert_pip_url, extract_status
 from libvcs.shortcuts import create_repo_from_pip_url
 from libvcs.util import run, which
@@ -81,7 +80,7 @@ def test_repo_update_handle_cases(tmpdir, git_remote, mocker):
 
 def test_progress_callback(tmpdir, git_remote, mocker):
     def progress_callback_spy(output, timestamp):
-        assert isinstance(output, string_types)
+        assert isinstance(output, str)
         assert isinstance(timestamp, datetime.datetime)
 
     progress_callback = mocker.Mock(
@@ -312,16 +311,10 @@ def test_extract_status():
     ],
 )
 def test_extract_status_b(fixture, expected_result):
-    if PY2:
-        assert (
-            extract_status(textwrap.dedent(fixture))._asdict().items()
-            <= expected_result.items()
-        )
-    else:
-        assert (
-            extract_status(textwrap.dedent(fixture))._asdict().items()
-            >= expected_result.items()
-        )
+    assert (
+        extract_status(textwrap.dedent(fixture))._asdict().items()
+        >= expected_result.items()
+    )
 
 
 @pytest.mark.parametrize(