fix unittests

This commit is contained in:
debugtalk
2020-03-07 18:48:15 +08:00
parent c4e2e74f39
commit 9047d02eaf
4 changed files with 4 additions and 5 deletions

View File

@@ -77,7 +77,7 @@ def type_match(check_value, expect_value):
def get_type(name):
if isinstance(name, type):
return name
elif isinstance(name, str, bytes):
elif isinstance(name, str):
try:
return __builtins__[name]
except KeyError:

View File

@@ -38,7 +38,7 @@ def _load_json_file(json_file):
with io.open(json_file, encoding='utf-8') as data_file:
try:
json_content = json.load(data_file)
except exceptions.JSONDecodeError:
except json.JSONDecodeError:
err_msg = f"JSONDecodeError: JSON file format error: {json_file}"
logger.error(err_msg)
raise exceptions.FileFormatError(err_msg)

View File

@@ -1,3 +1,4 @@
import json
import re
from collections import OrderedDict
@@ -199,7 +200,7 @@ class ResponseObject(object):
elif top_query in ["body", "content", "text", "json"]:
try:
body = self.json
except exceptions.JSONDecodeError:
except json.JSONDecodeError:
body = self.text
if not sub_query: