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