all: Remove all Python 2 requirements, such as six

Now that the minimum version of Python required is 3.6, we can remove
all uses of six and future, along with some other test changes that
still support Python 2.

Fixes #209

Author: s-t-e-v-e-n-k

pytest-devpi-server/_pytest_devpi_server/__init__.py

@@ -3,11 +3,11 @@
 
 @author: eeaston
 '''
+import io
 import os
 import sys
 import zipfile
 import logging
-from six.moves import cStringIO
 
 from pytest import yield_fixture, fixture
 import devpi_server as _devpi_server
@@ -105,7 +105,7 @@ def api(self, *args):
         client_args.extend(args)
         client_args.extend(['--clientdir', str(self.client_dir)])
         log.info(' '.join(client_args))
-        captured = cStringIO()
+        captured = io.StringIO()
         stdout = sys.stdout
         sys.stdout = captured
         try:

pytest-devpi-server/setup.py

@@ -22,7 +22,6 @@
                     'pytest',
                     'devpi-server>=3.0.1',
                     'devpi-client',
-                    'six',
                     'ruamel.yaml>=0.15',
                     ]
 

pytest-fixture-config/setup.py

@@ -20,8 +20,7 @@
 
 install_requires = ['pytest']
 
-tests_require = ['six',
-                 ]
+tests_require = []
 
 if __name__ == '__main__':
     kwargs = common_setup('pytest_fixture_config')

pytest-fixture-config/tests/unit/test_fixture_config.py

@@ -1,11 +1,12 @@
+import importlib
+
 import pytest
-from six.moves import reload_module
 
 # HACK: if the plugin is imported before the coverage plugin then all
 # the top-level code will be omitted from coverage, so force it to be
 # reloaded within this unit test under coverage
 import pytest_fixture_config
-reload_module(pytest_fixture_config)
+importlib.reload(pytest_fixture_config)
 
 from pytest_fixture_config import Config, requires_config, yield_requires_config
 

pytest-listener/pytest_listener.py

@@ -3,14 +3,13 @@
 import collections
 import json
 import logging
+import pickle
 import socket
 import time
 from threading import Thread, Event
 from time import sleep
 
 import pytest
-from six import string_types
-from six.moves import cPickle
 from pytest_server_fixtures.base import get_ephemeral_port, get_ephemeral_host
 
 TERMINATOR = json.dumps(['STOP']).encode('utf-8')
@@ -64,7 +63,7 @@ def __str__(self):
         return 'TimedMsg: %s (@ %s)' % (str(self.value), self.time)
 
     def pickled(self):
-        return cPickle.dumps(self)
+        return pickle.dumps(self)
 
 
 class Listener(Thread):
@@ -119,7 +118,7 @@ def get_data(self):
             return None, None
 
         try:
-            data = cPickle.loads(data)
+            data = pickle.loads(data)
         except:
             try:
                 data = data.decode('utf-8')
@@ -133,7 +132,7 @@ def get_data(self):
         if isinstance(data, TimedMsg):
             d = data.value
             t = data.time
-        elif isinstance(data, string_types):
+        elif isinstance(data, str):
             try:
                 d = json.loads(data)
             except:

pytest-listener/setup.py

@@ -18,8 +18,7 @@
     'Programming Language :: Python :: 3.7',
 ]
 
-install_requires = ['six',
-                    'pytest',
+install_requires = ['pytest',
                     'pytest-server-fixtures'
                     ]
 

pytest-profiling/pytest_profiling.py

@@ -1,7 +1,5 @@
 """pytest: avoid already-imported warning: PYTEST_DONT_REWRITE."""
 
-from __future__ import absolute_import
-
 import sys
 import os
 import cProfile
@@ -10,16 +8,15 @@
 from hashlib import md5
 import subprocess
 
-import six
 import pytest
 
 LARGE_FILENAME_HASH_LEN = 8
 
 
 def clean_filename(s):
     forbidden_chars = set(r'/?<>\:*|"')
-    return six.text_type("".join(c if c not in forbidden_chars and ord(c) < 127 else '_'
-                                 for c in s))
+    return str("".join(c if c not in forbidden_chars and ord(c) < 127 else '_'
+                       for c in s))
 
 
 class Profiling(object):

pytest-profiling/setup.py

@@ -24,8 +24,7 @@
     'Programming Language :: Python :: 3.12',
 ]
 
-install_requires = ['six',
-                    'pytest',
+install_requires = ['pytest',
                     'gprof2dot',
                     ]
 

pytest-profiling/tests/unit/test_profile.py

@@ -2,12 +2,12 @@
 # the top-level code in pytest_profiling will be omitted from
 # coverage, so force it to be reloaded within this test unit under coverage
 
+import importlib
 import os.path
-from six.moves import reload_module  # @UnresolvedImport
 
 import pytest_profiling
 
-reload_module(pytest_profiling)
+importlib.reload(pytest_profiling)
 
 import os
 import subprocess

pytest-pyramid-server/pytest_pyramid_server.py

@@ -3,8 +3,8 @@
 
 @author: eeaston
 '''
+import configparser
 import os
-from six.moves import configparser
 import sys
 import socket
 import glob

pytest-pyramid-server/setup.py

@@ -23,7 +23,6 @@
                     'pytest',
                     'pyramid',
                     'waitress',
-                    'six',
                     ]
 
 tests_require = [

pytest-server-fixtures/pytest_server_fixtures/base.py

@@ -14,8 +14,6 @@
 import random
 import errno
 
-from six import string_types
-
 from pytest_server_fixtures import CONFIG
 from pytest_shutil.workspace import Workspace
 
@@ -112,7 +110,7 @@ def __init__(self, process, stream, stderr):
     def run(self):
         while self.process.poll() is None:
             l = self.stream.readline()
-            if not isinstance(l, string_types):
+            if not isinstance(l, str):
                 l = l.decode('utf-8')
 
             if l.strip():

pytest-server-fixtures/pytest_server_fixtures/http.py

@@ -1,5 +1,4 @@
-from __future__ import print_function
-
+import http.client
 import os
 import socket
 import logging
@@ -9,7 +8,6 @@
 import pytest
 import requests
 from contextlib import contextmanager
-from six.moves import http_client
 
 from pytest_shutil.env import unset_env
 from pytest_server_fixtures import CONFIG
@@ -83,7 +81,7 @@ def get(self, path, as_json=False, attempts=25):
                 with self.handle_proxy():
                     returned = requests.get('http://%s:%d/%s' % (self.hostname, self.port, path))
                 return returned.json() if as_json else returned
-            except (http_client.BadStatusLine, requests.ConnectionError) as e:
+            except (http.client.BadStatusLine, requests.ConnectionError) as e:
                 time.sleep(int(i) / 10)
                 pass
         raise e
@@ -109,7 +107,7 @@ def post(self, path, data=None, attempts=25, as_json=False, headers=None):
                 with self.handle_proxy():
                     returned = requests.post('http://%s:%d/%s' % (self.hostname, self.port, path), data=data, headers=headers)
                 return returned.json() if as_json else returned
-            except (http_client.BadStatusLine, requests.ConnectionError) as e:
+            except (http.client.BadStatusLine, requests.ConnectionError) as e:
                 time.sleep(int(i) / 10)
                 pass
         raise e

pytest-server-fixtures/pytest_server_fixtures/jenkins.py

@@ -3,13 +3,10 @@
 
 @author: eeaston
 '''
-from __future__ import absolute_import
-
 import os.path
 import shutil
 
 import pytest
-import six
 
 from pytest_server_fixtures import CONFIG
 from pytest_fixture_config import yield_requires_config
@@ -95,7 +92,7 @@ def load_plugins(self, plugins_repo, plugins=None):
         if plugins is None:
             plugins = available_plugins.keys()
         else:
-            if isinstance(plugins, six.string_types):
+            if isinstance(plugins, str):
                 plugins = [plugins]
 
             errors = []

pytest-server-fixtures/pytest_server_fixtures/postgres.py

@@ -1,14 +1,11 @@
 # coding: utf-8
 
-from __future__ import absolute_import, division, print_function, unicode_literals
-
 import os
 import logging
 import subprocess
 
 import errno
 import pytest
-from six import text_type
 
 from pytest_server_fixtures import CONFIG
 from pytest_fixture_config import requires_config
@@ -65,7 +62,7 @@ def pre_setup(self):
         try:
             self.pg_bin = subprocess.check_output([CONFIG.pg_config_executable, "--bindir"]).decode('utf-8').rstrip()
         except OSError as e:
-            msg = "Failed to get pg_config --bindir: " + text_type(e)
+            msg = "Failed to get pg_config --bindir: " + str(e)
             print(msg)
             self._fail(msg)
         initdb_path = self.pg_bin + '/initdb'
@@ -76,7 +73,7 @@ def pre_setup(self):
         try:
             subprocess.check_call([initdb_path, str(self.workspace / 'db')])
         except OSError as e:
-            msg = "Failed to launch postgres: " + text_type(e)
+            msg = "Failed to launch postgres: " + str(e)
             print(msg)
             self._fail(msg)
 

pytest-server-fixtures/pytest_server_fixtures/redis.py

@@ -4,7 +4,6 @@
 @author: eeaston
 
 '''
-from __future__ import absolute_import
 import socket
 
 import pytest

pytest-server-fixtures/pytest_server_fixtures/s3.py

@@ -3,15 +3,12 @@
 Pytest fixtures to launch a minio S3 server and get a bucket for it.
 """
 
-from __future__ import absolute_import, division, print_function, unicode_literals
-
 import uuid
 from collections import namedtuple
 import logging
 import os
 
 import pytest
-from future.utils import text_type
 from pytest_fixture_config import requires_config
 
 from . import CONFIG
@@ -47,7 +44,7 @@ def s3_bucket(s3_server):  # pylint: disable=redefined-outer-name
     returning a BucketInfo namedtuple with `s3_bucket.client` and `s3_bucket.name` fields
     """
     client = s3_server.get_s3_client()
-    bucket_name = text_type(uuid.uuid4())
+    bucket_name = str(uuid.uuid4())
     client.create_bucket(Bucket=bucket_name)
     return BucketInfo(client, bucket_name)
 
@@ -96,6 +93,6 @@ def run_cmd(self):
             "server",
             "--address",
             "{}:{}".format(self.hostname, self.port),
-            text_type(self.datadir),
+            str(self.datadir),
         ]
         return cmdargs

pytest-server-fixtures/pytest_server_fixtures/serverclass/__init__.py

@@ -2,7 +2,6 @@
 Implementation of how a server fixture will run.
 """
 # flake8: noqa
-from __future__ import absolute_import
 
 def create_server(server_class, **kwargs):
     if server_class == 'thread':

pytest-server-fixtures/pytest_server_fixtures/serverclass/docker.py

@@ -1,8 +1,6 @@
 """
 Docker server class implementation.
 """
-from __future__ import absolute_import
-
 import logging
 import docker
 

pytest-server-fixtures/pytest_server_fixtures/serverclass/kubernetes.py

@@ -1,7 +1,6 @@
 """
 Kubernetes server class implementation.
 """
-from __future__ import absolute_import
 
 import os
 import logging

pytest-server-fixtures/setup.py

@@ -20,8 +20,6 @@
 install_requires = ['pytest',
                     'pytest-shutil',
                     'pytest-fixture-config',
-                    'six',
-                    'future',
                     'requests',
                     'retry',
                     'psutil',

pytest-server-fixtures/tests/integration/test_s3_server.py

@@ -1,7 +1,5 @@
 # coding: utf-8
 
-from __future__ import absolute_import, division, print_function, unicode_literals
-
 
 def test_connection(s3_bucket):
     client, bucket_name = s3_bucket

pytest-shutil/pytest_shutil/cmdline.py

@@ -10,12 +10,6 @@
 from tempfile import mkdtemp
 
 
-try:  # Python 2
-    str_type = basestring
-except NameError:  # Python 3
-    str_type = str
-
-
 def get_log():
     return logging.getLogger(__name__)