GithubBackup/httprunner
1
0
Fork 0
mirror of https://github.com/httprunner/httprunner.git synced 2026-07-06 15:01:22 +08:00
Code Issues Packages Projects Releases Wiki Activity

bugfix: UnicodeDecodeError in Python2.7

Browse Source
This commit is contained in:
debugtalk
2018-07-26 11:46:46 +08:00
parent 62bc08dde6
commit e3d17d27d1
5 changed files with 17 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
httprunner/testcase.py
View File

@@ -10,7 +10,8 @@ import random
import re
from httprunner import exceptions, logger, utils
from httprunner.compat import OrderedDict, basestring, numeric_types
from httprunner.compat import (OrderedDict, basestring, builtin_str,
numeric_types, str)
from httprunner.utils import FileUtils
variable_regexp = r"\$([\w_]+)"
@@ -627,7 +628,9 @@ def substitute_variables_with_mapping(content, mapping):
# content is a variable
content = value
else:
content = content.replace(var, str(value))
if not isinstance(value, str):
value = builtin_str(value)
content = content.replace(var, value)
return content
@@ -850,9 +853,12 @@ class TestcaseParser(object):
content = variable_value
else:
# content contains one or several variables
if not isinstance(variable_value, str):
variable_value = builtin_str(variable_value)
content = content.replace(
"${}".format(variable_name),
str(variable_value), 1
variable_value, 1
)
return content