change: remove support for Python 2.7

This commit is contained in:
debugtalk
2020-03-07 17:05:07 +08:00
parent 3c9eb14409
commit d1fb5e6cdc
10 changed files with 38 additions and 132 deletions

View File

@@ -5,7 +5,6 @@ import jsonpath
from loguru import logger
from httprunner import exceptions, utils
from httprunner.compat import basestring, is_py2
text_extractor_regexp_compile = re.compile(r".*\(.*\).*")
@@ -254,7 +253,7 @@ class ResponseObject(object):
def extract_field(self, field):
""" extract value from requests.Response.
"""
if not isinstance(field, basestring):
if not isinstance(field, str):
err_msg = f"Invalid extractor! => {field}\n"
logger.error(err_msg)
raise exceptions.ParamsError(err_msg)
@@ -268,9 +267,6 @@ class ResponseObject(object):
else:
value = self._extract_field_with_delimiter(field)
if is_py2 and isinstance(value, unicode):
value = value.encode("utf-8")
msg += f"\t=> {value}"
logger.debug(msg)