cleanup

Author: tuxberlin

keyctl/keyctlwrapper.py

@@ -1,4 +1,3 @@
-
 # -*- coding: utf-8 -*-
 
 import subprocess
@@ -51,14 +50,14 @@ class KeyctlWrapper(object):
     default_keyring = '@u'
     default_keytype = 'user'
 
-    def __init__(self, keyring: str=default_keyring, keytype: str=default_keytype):
+    def __init__(self, keyring: str = default_keyring, keytype: str = default_keytype):
         self.keyring = keyring
         self.keytype = keytype
 
     # ---------------------------------------------------------------
 
     @staticmethod
-    def _system(args, data: str=None, check=True):
+    def _system(args, data: str = None, check=True):
 
         try:
             p = subprocess.Popen(
@@ -90,9 +89,7 @@ def _system(args, data: str=None, check=True):
 
     def get_all_key_ids(self) -> List[int]:
         out = self._system(['keyctl', 'rlist', self.keyring])
-        l = out.split()
-        l = [int(x) for x in l]
-        return l
+        return [int(x) for x in out.split()]
 
     # ---------------------------------------------------------------
 
@@ -183,5 +180,4 @@ def remove_key(self, keyid: int):
     def clear_keyring(self):
         self._system(['keyctl', 'clear', self.keyring])
 
-
 # -------------------------------------------------------------------

tests/test_key.py

@@ -1,11 +1,7 @@
-
 # -*- coding: utf-8 -*-
 
-import sys
-import os
-sys.path.insert(0, os.path.abspath(os.path.join(os.path.dirname(__file__), '..')))
-
 import pytest
+
 from keyctl import KeyctlWrapper, KeyNotExistError, KeyAlreadyExistError, KeyctlOperationError
 from keyctl import Key
 
@@ -40,7 +36,7 @@ def test_init(self, empty_keyring):
 
         # non existing key
         with pytest.raises(KeyNotExistError):
-            k = Key(999)
+            Key(999)
 
         # exisitng key
         keyctl = empty_keyring
@@ -80,7 +76,7 @@ def test_list(self, empty_keyring):
     def test_search(self, empty_keyring):
         # non existing key
         with pytest.raises(KeyNotExistError):
-            k = Key.search('this key does not exist')
+            Key.search('this key does not exist')
 
         # existing key
         keyctl = empty_keyring
@@ -154,5 +150,4 @@ def test_update(self, empty_keyring):
         with pytest.raises(KeyNotExistError):
             k2.update('xxxx')
 
-
 # -------------------------------------------------------------------

tests/test_keyctlwrapper.py

@@ -1,11 +1,8 @@
 
 # -*- coding: utf-8 -*-
 
-import sys
-import os
-sys.path.insert(0, os.path.abspath(os.path.join(os.path.dirname(__file__), '..')))
-
 import pytest
+
 from keyctl import KeyctlWrapper, KeyNotExistError, KeyAlreadyExistError