Skip to content

Commit db4b20b

Browse files
committed
chore: liniter fix
1 parent a4f4f68 commit db4b20b

File tree

4 files changed

+16
-16
lines changed

4 files changed

+16
-16
lines changed

evervault/client.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ def decrypt(self, data):
5555
)
5656
headers = self.__build_decrypt_headers(type(data))
5757

58-
if type(data) == bytes:
58+
if isinstance(data, bytes):
5959
return self.post("decrypt", data, headers, raise_errors_on_api_error)
6060
else:
6161
payload = {"data": data}

evervault/crypto/client.py

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -52,29 +52,29 @@ def encrypt_data(self, fetch, data, role):
5252
if self.shared_key is None or type(self.shared_key) != bytes:
5353
raise EvervaultError("Retrieved key is invalid")
5454

55-
if type(data) == bytes:
55+
if isinstance(data, bytes):
5656
return self.__encrypt_file(data, role)
57-
elif type(data) == bytearray:
57+
elif isinstance(data, bytearray):
5858
return self.__encrypt_file(bytes(data), role)
59-
elif type(data) == dict or type(data) == list or type(data) == set:
59+
elif isinstance(data, dict) or isinstance(data, list) or isinstance(data, set):
6060
return self.__traverse_and_encrypt(data, role)
6161
elif self.__encryptable_data(data):
6262
return self.__encrypt_string(data, role)
6363
else:
6464
raise EvervaultError(f"Cannot encrypt unsupported type {data}")
6565

6666
def __traverse_and_encrypt(self, data, role):
67-
if type(data) == list:
67+
if isinstance(data, list):
6868
encrypted_list = []
6969
for idx, item in enumerate(data):
7070
if not self.__encryptable_data(item):
7171
encrypted_list.insert(idx, self.__traverse_and_encrypt(item, role))
7272
else:
7373
encrypted_list.insert(idx, self.__encrypt_string(item, role))
7474
return encrypted_list
75-
elif type(data) == dict:
75+
elif isinstance(data, dict):
7676
return self.__encrypt_object(data, role)
77-
elif type(data) == set:
77+
elif isinstance(data, set):
7878
return self.__encrypt_set(data, role)
7979
elif self.__encryptable_data(data):
8080
return self.__encrypt_string(data, role)
@@ -212,9 +212,9 @@ def __encrypt_file(self, data, role):
212212
)
213213

214214
def __coerce_type(self, data):
215-
if type(data) == bool:
215+
if isinstance(data, bool):
216216
return "true" if data else "false"
217-
elif type(data) == int or type(data) == float:
217+
elif isinstance(data, int) or isinstance(data, float):
218218
return str(data)
219219
else:
220220
return data
@@ -254,10 +254,10 @@ def __base_64_remove_padding(self, data):
254254

255255
def __encryptable_data(self, data):
256256
return data is not None and (
257-
type(data) == str
258-
or type(data) == bool
259-
or type(data) == int
260-
or type(data) == float
257+
isinstance(data, str)
258+
or isinstance(data, bool)
259+
or isinstance(data, int)
260+
or isinstance(data, float)
261261
)
262262

263263
def __fetch_cage_key(self, fetch):

evervault/http/request.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ def __build_headers(self, method, params, url, optional_headers, version):
9393

9494
headers.update(optional_headers)
9595
if method in ("POST", "PUT", "DELETE"):
96-
if type(params) == bytes:
96+
if isinstance(params, bytes):
9797
req_params["data"] = params
9898
else:
9999
req_params["data"] = json.dumps(params, cls=json.JSONEncoder)

tests/test_evervault.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ def test_encrypt_lists_of_various_types(self, curve, role, mock_request):
107107
level_2_list = ["a", False, 4.0, ["b", 2], set(["x", "b"])]
108108
level_2_list_encrypted = self.evervault.encrypt(level_2_list, role)
109109
for item in level_2_list_encrypted:
110-
if type(item) == list or type(item) == set:
110+
if isinstance(item, list) or isinstance(item, set):
111111
for sub_item in item:
112112
assert self.__is_evervault_string_format(sub_item)
113113
else:
@@ -129,7 +129,7 @@ def test_encrypt_dicts(self, curve, role, mock_request):
129129
assert encrypted_data != {"name": "testname"}
130130
assert "name" in encrypted_data
131131
assert "dict" in encrypted_data
132-
assert type(encrypted_data["dict"]) == dict
132+
assert isinstance(encrypted_data["dict"], dict)
133133
assert self.__is_evervault_string(encrypted_data["dict"]["subnumber"], "number")
134134

135135
@parameterized.expand(CURVES.keys())

0 commit comments

Comments
 (0)