GithubBackup/httprunner
1
0
Fork 0
mirror of https://github.com/httprunner/httprunner.git synced 2026-07-09 14:32:31 +08:00
Code Issues Packages Projects Releases Wiki Activity

refactor compatibility, learned from requests

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

6
httprunner/testcase.py
View File

@@ -6,10 +6,10 @@ import json
import os
import random
import re
from collections import OrderedDict
import yaml
from httprunner import exception, logger, utils
from httprunner.compat import OrderedDict, numeric_types
variable_regexp = r"\$([\w_]+)"
function_regexp = r"\$\{([\w_]+\([\$\w\.\-_ =,]*\))\}"
@@ -541,7 +541,7 @@ def substitute_variables_with_mapping(content, mapping):
if isinstance(content, bool):
return content
if isinstance(content, (int, utils.long_type, float, complex)):
if isinstance(content, (numeric_types, type)):
return content
if not content:
@@ -852,7 +852,7 @@ class TestcaseParser(object):
return evaluated_data
if isinstance(content, (int, utils.long_type, float, complex)):
if isinstance(content, (numeric_types, type)):
return content
# content is in string format here