Changes from the review

Author: jborean93

k5test/realm.py

@@ -26,6 +26,7 @@
 import copy
 import os
 import os.path
+import shlex
 import shutil
 import signal
 import socket
@@ -39,11 +40,6 @@
 
 from k5test import _utils
 
-try:
-    from shlex import quote as shlex_quote
-except ImportError:
-    from pipes import quote as shlex_quote
-
 
 _LOG = logging.getLogger(__name__)
 
@@ -71,24 +67,22 @@ def _cfg_merge(cfg1, cfg2):
 
 
 def _discover_path(name, default, paths):
-    stderr_out = getattr(subprocess, 'DEVNULL', subprocess.PIPE)
+    stderr_out = subprocess.DEVNULL
     try:
         path = subprocess.check_output(['which', name],
                                         stderr=stderr_out).strip()
         path = path.decode(sys.getfilesystemencoding() or
-                            sys.getdefaultencoding())
+                           sys.getdefaultencoding())
         _LOG.debug("Using discovered path for {name} ({path})".format(
             name=name, path=path))
         return path
     except subprocess.CalledProcessError as e:
         path = paths.get(name, default)
-        _LOG.debug("Using default path for {name} ({path}): {err}".format(
-            name=name, path=path, err=e))
+        _LOG.debug(f"Using default path for {name} ({path}): {e}")
         return path
 
 
-@six.add_metaclass(abc.ABCMeta)
-class K5Realm(object):
+class K5Realm(metaclass=abc.ABCMeta):
     """An object representing a functional krb5 test realm."""
 
     def __new__(cls, *args, **kwargs):
@@ -104,13 +98,10 @@ def __new__(cls, *args, **kwargs):
                 krb5_version = krb5_version.decode(
                     sys.getfilesystemencoding() or sys.getdefaultencoding())
 
-                if (
-                    'heimdal' in krb5_version.lower() or
-                    (
-                        # macOS output doesn't contain Heimdal
-                        sys.platform == 'darwin' and
-                        krb5_config == '/usr/bin/krb5-config'
-                    )
+                # macOS output doesn't contain Heimdal
+                if 'heimdal' in krb5_version.lower() or (
+                    sys.platform == 'darwin' and
+                    krb5_config == '/usr/bin/krb5-config'
                 ):
                     provider_cls = HeimdalRealm
 
@@ -148,7 +139,6 @@ def __init__(self, realm='KRBTEST.COM', portbase=61000,
         self.client_keytab = os.path.join(self.tmpdir, 'client_keytab')
         self.ccache = os.path.join(self.tmpdir, 'ccache')
         self.kadmin_ccache = os.path.join(self.tmpdir, 'kadmin_ccache')
-
         self._kdc_proc = None
         self._kadmind_proc = None
         krb5_conf_path = os.path.join(self.tmpdir, 'krb5.conf')
@@ -159,8 +149,6 @@ def __init__(self, realm='KRBTEST.COM', portbase=61000,
 
         self._init_paths(**paths)
 
-        self._devnull = open(os.devnull, 'r')
-
         if existing is None:
             self._create_conf(_cfg_merge(self._krb5_conf, krb5_conf),
                               krb5_conf_path)
@@ -339,7 +327,7 @@ def run(self, args, env=None, input=None, expected_code=0):
         if input:
             infile = subprocess.PIPE
         else:
-            infile = self._devnull
+            infile = subprocess.DEVNULL
 
         proc = subprocess.Popen(args, stdin=infile, stdout=subprocess.PIPE,
                                 stderr=subprocess.STDOUT, env=env)
@@ -361,7 +349,7 @@ def run(self, args, env=None, input=None, expected_code=0):
         return outdata
 
     def __del__(self):
-        self._devnull.close()
+        pass
 
     def kprop_port(self):
         return self.portbase + 3
@@ -373,8 +361,8 @@ def _start_daemon(self, args, env=None, sentinel=None):
         if env is None:
             env = self.env
 
-        stdout = subprocess.PIPE if sentinel else self._devnull
-        proc = subprocess.Popen(args, stdin=self._devnull,
+        stdout = subprocess.PIPE if sentinel else subprocess.DEVNULL
+        proc = subprocess.Popen(args, stdin=subprocess.DEVNULL,
                                 stdout=stdout,
                                 stderr=subprocess.STDOUT, env=env)
         cmd = ' '.join(args)
@@ -564,7 +552,7 @@ def run_kadmin(self, query, **keywords):
 
     def run_kadminl(self, query, **keywords):
         if isinstance(query, list):
-            query = " ".join([shlex_quote(q) for q in query])
+            query = " ".join([shlex.quote(q) for q in query])
 
         return self.run([self.kadmin_local, '-q', query], **keywords)
 
@@ -597,15 +585,15 @@ def provider(self):
 
     @property
     def _default_paths(self):
-        basedir = '/usr/libexec'
-        if sys.platform == 'darwin':
-            basedir = '/System/Library/PrivateFrameworks/Heimdal.framework/Helpers'
+        base = '/System/Library/PrivateFrameworks/Heimdal.framework/Helpers'
+        if sys.platform != 'darwin':
+            base = '/usr/libexec'
 
         return [
-            ('krb5kdc', 'kdc', os.path.join(basedir, 'kdc')),
+            ('krb5kdc', 'kdc', os.path.join(base, 'kdc')),
             ('kadmin', 'kadmin', '/usr/bin/kadmin'),
             ('kadmin_local', 'kadmin', '/usr/bin/kadmin'),
-            ('kadmind', 'kadmind', os.path.join(basedir, 'kadmind')),
+            ('kadmind', 'kadmind', os.path.join(base, 'kadmind')),
             ('_kinit', 'kinit', '/usr/bin/kinit'),
             ('_klist', 'klist', '/usr/bin/klist'),
             ('_ktutil', 'ktutil', '/usr/bin/ktutil'),
@@ -677,7 +665,6 @@ def extract_keytab(self, princname, keytab):
 
     def kinit(self, princname, password=None, flags=None, verbose=True,
               **keywords):
-
         cmd = [self._kinit]
 
         input = None

k5test/unit.py

@@ -43,11 +43,8 @@ def krb_minversion_test(target_version, problem, provider=None):
 
     def make_ext_test(func):
         def ext_test(self, *args, **kwargs):
-            if (
-                not provider or (
-                    self.realm.provider.lower() == provider.lower()
-                ) and
-                _KRB_VERSION < target_version.split('.')
+            if _KRB_VERSION < target_version.split('.') and (
+                not provider or self.realm.lower() == provider.lower()
             ):
                 self.skipTest("Your GSSAPI (version %s) is known to have "
                               "problems with %s" % (_KRB_VERSION, problem))

setup.py

@@ -13,12 +13,12 @@
     long_description=open('README.md').read(),
     license='LICENSE.txt',
     url="https://github.com/pythongssapi/k5test",
+    python_requires=">=3.6",
     classifiers=[
         'Development Status :: 4 - Beta',
         'Programming Language :: Python',
-        'Programming Language :: Python :: 2.7',
         'Programming Language :: Python :: 3',
-        'Programming Language :: Python :: 3.3',
+        'Programming Language :: Python :: 3.6',
         'Intended Audience :: Developers',
         'License :: OSI Approved :: ISC License (ISCL)',
         'License :: OSI Approved :: MIT License',