refactor compatibility, learned from requests

This commit is contained in:
debugtalk
2018-03-25 21:15:43 +08:00
parent 1c44ae764b
commit 261169b70e
12 changed files with 80 additions and 38 deletions

View File

@@ -4,8 +4,8 @@ import time
import requests
import urllib3
from httprunner import logger
from httprunner.compat import is_py2
from httprunner.exception import ParamsError
from httprunner.utils import PYTHON_VERSION
from requests import Request, Response
from requests.exceptions import (InvalidSchema, InvalidURL, MissingSchema,
RequestException)
@@ -116,7 +116,7 @@ class HttpSession(requests.Session):
self.meta_data["response_headers"] = response.headers
self.meta_data["response_body"] = response.text
if PYTHON_VERSION == 2 and isinstance(self.meta_data["response_body"], unicode):
if is_py2 and isinstance(self.meta_data["response_body"], unicode):
self.meta_data["response_body"] = self.meta_data["response_body"].encode("utf-8")
logger.log_debug("response status_code: {}".format(self.meta_data["status_code"]))