Commit 38720b8c by fanxun

Merge remote-tracking branch 'origin/master'

parents b56995e7 1d2a5739
...@@ -26,7 +26,7 @@ def request_main(url, headers, method, data): ...@@ -26,7 +26,7 @@ def request_main(url, headers, method, data):
inner_res = requests.post(url=url, headers=headers, data=data) inner_res = requests.post(url=url, headers=headers, data=data)
return inner_res return inner_res
except Exception as e: except Exception as e:
logging.log(str(e)) # logging.log(str(e))
raise Exception raise Exception
if headers == None or headers == {} or headers == "": if headers == None or headers == {} or headers == "":
...@@ -38,14 +38,6 @@ def request_main(url, headers, method, data): ...@@ -38,14 +38,6 @@ def request_main(url, headers, method, data):
logging.log(str(e)) logging.log(str(e))
except requests.exceptions.RequestException as e: except requests.exceptions.RequestException as e:
logging.log(str(e)) logging.log(str(e))
if "mimeType" in headers.keys():
headers['mimeType'] = "application/x-www-form-urlencoded"
else:
headers['Content-Type'] = "application/x-www-form-urlencoded"
try:
res = request_by_method(method, headers)
except requests.exceptions.RequestException as e:
logging.log(str(e))
if res != None: if res != None:
return res.json() return res.json()
return res return res
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment