Fix for Python 3.9

Author: forcecore

.travis.yml

@@ -1,5 +1,5 @@
 language: python
-python: 2.7
+python: 3.9
 
 sudo: required
 

keyctl/key.py

@@ -1,7 +1,7 @@
 
 # -*- coding: utf-8 -*-
 
-from keyctlwrapper import KeyctlWrapper
+from .keyctlwrapper import KeyctlWrapper
 
 
 # -------------------------------------------------------------------

keyctl/keyctlwrapper.py

@@ -50,21 +50,23 @@ class KeyctlWrapper(object):
     default_keyring = '@u'
     default_keytype = 'user'
 
-    def __init__(self, keyring=default_keyring, keytype=default_keytype):
+    def __init__(self, keyring: str=default_keyring, keytype: str=default_keytype):
         self.keyring = keyring
         self.keytype = keytype
 
     # ---------------------------------------------------------------
 
     @staticmethod
-    def _system(args, data=None, check=True):
+    def _system(args, data: str=None, check=True):
+
         try:
             p = subprocess.Popen(
                 args,
                 stdout=subprocess.PIPE,
                 stderr=subprocess.PIPE,
                 stdin=subprocess.PIPE,
-                bufsize=4096
+                bufsize=4096,
+                text=True,
             )
         except OSError as e:
             raise OSError('Command \'{}\' execution failed. ErrMsg:{}'.format(' '.join(args), e))
@@ -78,7 +80,7 @@ def _system(args, data=None, check=True):
 
         if not check:
             return ret, out, err
-        elif ret is 0:
+        elif ret == 0:
             return out
         else:
             raise KeyctlOperationError(errmsg='({}){} {}'.format(ret, err, out))

setup.py

@@ -13,7 +13,7 @@
     readme = readme.replace('\r', '')
 except ImportError:
     readme = 'see README.md'
-    print 'NO README CREATED'
+    print('NO README CREATED')
 
 
 setup(
@@ -40,7 +40,7 @@
         'Intended Audience :: Developers',
         'License :: OSI Approved :: GNU General Public License v3 (GPLv3)',
         'Programming Language :: Python',
-        'Programming Language :: Python :: 2.7',
+        'Programming Language :: Python :: 3.9',
         'Environment :: X11 Applications :: Qt',
         'Topic :: Utilities',
     ]

tests/test_keyctlwrapper.py

@@ -111,7 +111,7 @@ def test_get_data_from_id(self, empty_keyring):
 
         # hex mode
         data = keyctl.get_data_from_id(keyid, 'hEx')
-        assert data == content.encode('hex')
+        assert data == content.encode("utf8").hex()
 
     # ---------------------------------------------------------------