Drop dedicated Python2-support code

devpi_plumber/client.py

@@ -4,12 +4,12 @@
 import re
 import sys
 from collections import OrderedDict
+from io import StringIO
+from urllib.parse import urlsplit, urlunsplit, urljoin
 
 from devpi.main import main as devpi
-from six import StringIO, iteritems
 from twitter.common.contextutil import mutable_sys, temporary_dir
 
-from six.moves.urllib.parse import urlsplit, urlunsplit, urljoin
 
 logging.getLogger("requests").setLevel(logging.WARNING)
 logging.getLogger("devpi").setLevel(logging.WARNING)
@@ -56,7 +56,7 @@ def _create_command(self, *args, **kwargs):
         kwargs.update({'--clientdir': self._client_dir})
 
         return ['devpi'] + list(args) + ['{}={}'.format(k, v)
-                                         for k, v in iteritems(kwargs)]
+                                         for k, v in kwargs.items()]
 
     def _execute(self, *args, **kwargs):
         args = self._create_command(*args, **kwargs)

devpi_plumber/server.py

@@ -8,7 +8,6 @@
 import requests
 
 from devpi_plumber.client import DevpiClient
-from six import iteritems
 from twitter.common.contextutil import temporary_dir
 
 
@@ -31,10 +30,10 @@ def TestServer(users={}, indices={}, config={}, fail_on_output=['Traceback']):
         with DevpiServer(server_options) as url:
             with DevpiClient(url, 'root', '') as client:
 
-                for user, kwargs in iteritems(users):
+                for user, kwargs in users.items():
                     client.create_user(user, **kwargs)
 
-                for index, kwargs in iteritems(indices):
+                for index, kwargs in indices.items():
                     client.create_index(index, **kwargs)
 
                 yield client
@@ -99,8 +98,8 @@ def DevpiServer(options):
 
 
 def build_devpi_server_command(**options):
-    opts = ['--{}={}'.format(k, v) for k, v in iteritems(options) if v is not None]
-    flags = ['--{}'.format(k) for k, v in iteritems(options) if v is None]
+    opts = ['--{}={}'.format(k, v) for k, v in options.items() if v is not None]
+    flags = ['--{}'.format(k) for k, v in options.items() if v is None]
     return ['devpi-server'] + opts + flags
 
 

requirements.txt

@@ -135,7 +135,6 @@ setuptools-scm==6.0.1
 six==1.15.0
     # via
     #   argon2-cffi
-    #   devpi-plumber
     #   python-dateutil
     #   tox
     #   virtualenv

setup.py

@@ -23,7 +23,6 @@
         'devpi-client',
         'requests',
         'twitter.common.contextutil',
-        'six'
     ],
     extras_require={
         'test': ['devpi-server>=4.2.1'],