scottk/wlan-lanforge-scripts
1
0
Fork 0
mirror of https://github.com/Telecominfraproject/wlan-lanforge-scripts.git synced 2025-11-02 11:48:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

LFRequest: Fix whitespace

Browse Source 
Signed-off-by: Matthew Stidham <stidmatt@gmail.com>
This commit is contained in:
Matthew Stidham
2021-12-06 11:24:18 -08:00
parent 769cfff912
commit f9b3347138
1 changed files with 34 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
py-json/LANforge/LFRequest.py
View File

@@ -15,11 +15,11 @@ if sys.version_info[0] != 3:
print("This script requires Python 3")
exit()
sys.path.append(os.path.join(os.path.abspath(__file__ + "../../../../")))
debug_printer = PrettyPrinter(indent=2)
class LFRequest:
Default_Base_URL = "http://localhost:8080"
No_Data = {'No Data': 0}
@@ -77,7 +77,8 @@ class LFRequest:
if self.requested_url.find('//'):
protopos = self.requested_url.find("://")
self.requested_url = self.requested_url[:protopos + 2] + self.requested_url[protopos + 2:].replace("//", "/")
self.requested_url = self.requested_url[:protopos + 2] + self.requested_url[protopos + 2:].replace("//",
"/")
# finding '#' prolly indicates a macvlan (eth1#0)
# finding ' ' prolly indicates a field name that should imply %20
@@ -104,7 +105,6 @@ class LFRequest:
opener = request.build_opener(request.ProxyHandler(self.proxies))
request.install_opener(opener)
self.logger.debug("formPost: url: " + self.requested_url)
if (self.post_data is not None) and (self.post_data is not self.No_Data):
urlenc_data = urllib.parse.urlencode(self.post_data).encode("utf-8")
@@ -146,7 +146,8 @@ class LFRequest:
return None
def jsonPost(self, show_error=True, debug=False, die_on_error_=False, response_json_list_=None):
return self.json_post(show_error=show_error, debug=debug, die_on_error_=die_on_error_, response_json_list_=response_json_list_)
return self.json_post(show_error=show_error, debug=debug, die_on_error_=die_on_error_,
response_json_list_=response_json_list_)
def json_post(self, show_error=True, debug=False, die_on_error_=False, response_json_list_=None, method_='POST'):
if not debug and self.debug:
@@ -188,7 +189,8 @@ class LFRequest:
raise ValueError("reponse_json_list_ needs to be type list")
j = json.loads(resp_data)
if debug:
self.logger.debug("----- LFRequest::json_post:140 debug: --------------------------------------------")
self.logger.debug(
"----- LFRequest::json_post:140 debug: --------------------------------------------")
self.logger.debug(pformat(j))
self.logger.debug("-------------------------------------------------")
response_json_list_.append(j)
@@ -297,6 +299,7 @@ class LFRequest:
for err in self.error_list:
self.logger.error("error: %s" % err)
def plain_get(url_=None, debug_=False, die_on_error_=False, proxies_=None):
"""
This static method does not respect LFRequest.proxy, it is not set in scope here
@@ -387,7 +390,8 @@ def print_diagnostics(url_=None, request_=None, responses_=None, error_=None, er
if (error_list_ is not None) and isinstance(error_list_, list):
error_list_.append("[%s HTTP %s] <%s> : %s" % (method, err_code, err_full_url, err_reason))
else:
logger.debug(" Content-type:[%s] Accept[%s]" % (request_.get_header('Content-type'), request_.get_header('Accept')))
logger.debug(
" Content-type:[%s] Accept[%s]" % (request_.get_header('Content-type'), request_.get_header('Accept')))
if hasattr(request_, "data") and (request_.data is not None):
logger.debug(" Data:")