chore: liniter fix

Author: boilsquid

.github/workflows/e2e.yml

@@ -9,7 +9,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: [3.10.9, 3.11, 3.12]
+        python-version: [3.10.18, 3.11, 3.12]
     steps:
       - uses: actions/checkout@v2
       - name: Setup Python ${{ matrix.python-version }}

.github/workflows/release.yml

@@ -14,7 +14,7 @@ jobs:
       - name: Setup Python 3.9
         uses: actions/setup-python@v2
         with:
-          python-version: 3.10.9
+          python-version: 3.10.18
       - name: Setup Poetry
         uses: abatilo/actions-poetry@v2.1.2
         with:

.github/workflows/test.yml

@@ -9,7 +9,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: [3.10.9, 3.11, 3.12]
+        python-version: [3.10.18, 3.11, 3.12]
     steps:
       - uses: actions/checkout@v2
       - name: Setup Python ${{ matrix.python-version }}

evervault/client.py

@@ -55,7 +55,7 @@ def decrypt(self, data):
             )
         headers = self.__build_decrypt_headers(type(data))
 
-        if type(data) == bytes:
+        if isinstance(data, bytes):
             return self.post("decrypt", data, headers, raise_errors_on_api_error)
         else:
             payload = {"data": data}

evervault/crypto/client.py

@@ -49,32 +49,32 @@ def encrypt_data(self, fetch, data, role):
         self.__fetch_cage_key(fetch)
         self.shared_key = self.__derive_shared_key(role is not None)
 
-        if self.shared_key is None or type(self.shared_key) != bytes:
+        if self.shared_key is None or not isinstance(self.shared_key, bytes):
             raise EvervaultError("Retrieved key is invalid")
 
-        if type(data) == bytes:
+        if isinstance(data, bytes):
             return self.__encrypt_file(data, role)
-        elif type(data) == bytearray:
+        elif isinstance(data, bytearray):
             return self.__encrypt_file(bytes(data), role)
-        elif type(data) == dict or type(data) == list or type(data) == set:
+        elif isinstance(data, dict) or isinstance(data, list) or isinstance(data, set):
             return self.__traverse_and_encrypt(data, role)
         elif self.__encryptable_data(data):
             return self.__encrypt_string(data, role)
         else:
             raise EvervaultError(f"Cannot encrypt unsupported type {data}")
 
     def __traverse_and_encrypt(self, data, role):
-        if type(data) == list:
+        if isinstance(data, list):
             encrypted_list = []
             for idx, item in enumerate(data):
                 if not self.__encryptable_data(item):
                     encrypted_list.insert(idx, self.__traverse_and_encrypt(item, role))
                 else:
                     encrypted_list.insert(idx, self.__encrypt_string(item, role))
             return encrypted_list
-        elif type(data) == dict:
+        elif isinstance(data, dict):
             return self.__encrypt_object(data, role)
-        elif type(data) == set:
+        elif isinstance(data, set):
             return self.__encrypt_set(data, role)
         elif self.__encryptable_data(data):
             return self.__encrypt_string(data, role)
@@ -212,9 +212,9 @@ def __encrypt_file(self, data, role):
         )
 
     def __coerce_type(self, data):
-        if type(data) == bool:
+        if isinstance(data, bool):
             return "true" if data else "false"
-        elif type(data) == int or type(data) == float:
+        elif isinstance(data, int) or isinstance(data, float):
             return str(data)
         else:
             return data
@@ -254,10 +254,10 @@ def __base_64_remove_padding(self, data):
 
     def __encryptable_data(self, data):
         return data is not None and (
-            type(data) == str
-            or type(data) == bool
-            or type(data) == int
-            or type(data) == float
+            isinstance(data, str)
+            or isinstance(data, bool)
+            or isinstance(data, int)
+            or isinstance(data, float)
         )
 
     def __fetch_cage_key(self, fetch):

evervault/http/request.py

@@ -93,7 +93,7 @@ def __build_headers(self, method, params, url, optional_headers, version):
 
         headers.update(optional_headers)
         if method in ("POST", "PUT", "DELETE"):
-            if type(params) == bytes:
+            if isinstance(params, bytes):
                 req_params["data"] = params
             else:
                 req_params["data"] = json.dumps(params, cls=json.JSONEncoder)

tests/test_evervault.py

@@ -107,7 +107,7 @@ def test_encrypt_lists_of_various_types(self, curve, role, mock_request):
         level_2_list = ["a", False, 4.0, ["b", 2], set(["x", "b"])]
         level_2_list_encrypted = self.evervault.encrypt(level_2_list, role)
         for item in level_2_list_encrypted:
-            if type(item) == list or type(item) == set:
+            if isinstance(item, list) or isinstance(item, set):
                 for sub_item in item:
                     assert self.__is_evervault_string_format(sub_item)
             else:
@@ -129,7 +129,7 @@ def test_encrypt_dicts(self, curve, role, mock_request):
         assert encrypted_data != {"name": "testname"}
         assert "name" in encrypted_data
         assert "dict" in encrypted_data
-        assert type(encrypted_data["dict"]) == dict
+        assert isinstance(encrypted_data["dict"], dict)
         assert self.__is_evervault_string(encrypted_data["dict"]["subnumber"], "number")
 
     @parameterized.expand(CURVES.keys())