Drop support for Python 2

Author: alexreg

.travis.yml

@@ -5,11 +5,13 @@ jobs:
   - python: pypy
   include:
     - python: pypy
+    - python: 3.11
+    - python: 3.10
+    - python: 3.9
     - python: 3.8
     - python: 3.7
     - python: 3.6
     - python: 3.5
-    - python: 2.7
   fast_finish: true
 before_install:
   - sudo apt-get update -qq

README.rst

@@ -22,8 +22,9 @@ escaping of arguments and error checking:
   what's called a "command pool". The concurrency level can be customized and
   of course both local and remote commands are supported.
 
-The package is currently tested on Python 2.7, 3.5, 3.6, 3.7, 3.8 and PyPy. For
-usage instructions please refer to following sections and the documentation_.
+The package is currently tested on Python 3.5, 3.6, 3.7, 3.8, 3.9, 3.10, 3.11
+and PyPy. For usage instructions please refer to following sections and the
+documentation_.
 
 .. contents::
    :local:

executor/contexts.py

@@ -366,14 +366,7 @@ def lsb_release_variables(self):
         logger.debug("Parsing /etc/lsb-release contents: %r", contents)
         for lnum, line in enumerate(contents.splitlines()):
             name, delimiter, value = line.partition(u'=')
-            # The following encode/decode trick works around shlex.split() not
-            # properly supporting Unicode strings on Python 2.7, for details
-            # refer to https://stackoverflow.com/a/14219159/788200.
-            if PY2:
-                tokens = shlex.split(value.encode('UTF-8'))
-                parsed_value = [t.decode('UTF-8') for t in tokens]
-            else:
-                parsed_value = shlex.split(value)
+            parsed_value = shlex.split(value)
             # The null byte check below guards against a weird edge case
             # that has so far only manifested in the Python 2.6 environment
             # of Travis CI: The parsing of /etc/lsb-release results in the

executor/tests.py

@@ -1101,12 +1101,6 @@ def test_lsb_release_variables(self):
             # laptop as well as Travis CI run Ubuntu LTS releases.
             assert variables['DISTRIB_ID'].lower() == u'ubuntu'
             assert variables['DISTRIB_CODENAME'].lower() in EXPECTED_CODENAMES
-            # Make sure all strings are Unicode strings, this tests against
-            # a regression of a bug caused by shlex.split() on Python 2.7
-            # automatically coercing Unicode strings to byte strings.
-            for key, value in context.lsb_release_variables.items():
-                assert isinstance(key, text_type)
-                assert isinstance(value, text_type)
 
     def test_local_context(self):
         """Test a local command context."""

setup.py

@@ -76,7 +76,7 @@ def get_absolute_path(*args):
       tests_require=[
           'virtualenv',
       ],
-      python_requires='>=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*',
+      python_requires='>=3.5',
       classifiers=[
           'Development Status :: 5 - Production/Stable',
           'Environment :: Console',
@@ -88,13 +88,14 @@ def get_absolute_path(*args):
           'Operating System :: POSIX :: Linux',
           'Operating System :: Unix',
           'Programming Language :: Python',
-          'Programming Language :: Python :: 2',
-          'Programming Language :: Python :: 2.7',
           'Programming Language :: Python :: 3',
           'Programming Language :: Python :: 3.5',
           'Programming Language :: Python :: 3.6',
           'Programming Language :: Python :: 3.7',
           'Programming Language :: Python :: 3.8',
+          'Programming Language :: Python :: 3.9',
+          'Programming Language :: Python :: 3.10',
+          'Programming Language :: Python :: 3.11',
           'Programming Language :: Python :: Implementation :: CPython',
           'Programming Language :: Python :: Implementation :: PyPy',
           'Topic :: Internet',

tox.ini

@@ -1,5 +1,5 @@
 [tox]
-envlist = py27, py35, py36, py37, py38, pypy
+envlist = py35, py36, py37, py38, py39, py310, py311, pypy
 
 [testenv]
 commands = py.test {posargs}