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

Remove == True error in LFRequest

Browse Source 
Signed-off-by: Matthew Stidham <stidmatt@gmail.com>
This commit is contained in:
Matthew Stidham
2021-11-15 13:36:27 -08:00
parent 3c1858a609
commit 12da46d6fb
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -81,9 +81,9 @@ class LFRequest:
# finding '#' prolly indicates a macvlan (eth1#0) # finding '#' prolly indicates a macvlan (eth1#0)
# finding ' ' prolly indicates a field name that should imply %20 # finding ' ' prolly indicates a field name that should imply %20
if (self.requested_url.find('#') >= 1): if self.requested_url.find('#') >= 1:
self.requested_url = self.requested_url.replace('#', '%23') self.requested_url = self.requested_url.replace('#', '%23')
if (self.requested_url.find(' ') >= 1): if self.requested_url.find(' ') >= 1:
self.requested_url = self.requested_url.replace(' ', '+') self.requested_url = self.requested_url.replace(' ', '+')
self.logger.debug("new LFRequest[%s]" % self.requested_url ) self.logger.debug("new LFRequest[%s]" % self.requested_url )
@@ -94,7 +94,7 @@ class LFRequest:
def form_post(self, show_error=True, debug=False, die_on_error_=False): def form_post(self, show_error=True, debug=False, die_on_error_=False):
if self.die_on_error: if self.die_on_error:
die_on_error_ = True die_on_error_ = True
if (debug == False) and (self.debug == True): if (debug is False) and (self.debug is True):
debug = True debug = True
responses = [] responses = []
urlenc_data = "" urlenc_data = ""
@@ -106,7 +106,7 @@ class LFRequest:
self.logger.debug("formPost: url: "+self.requested_url) self.logger.debug("formPost: url: "+self.requested_url)
if ((self.post_data != None) and (self.post_data is not self.No_Data)): 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") urlenc_data = urllib.parse.urlencode(self.post_data).encode("utf-8")
self.logger.debug("formPost: data looks like:" + str(urlenc_data)) self.logger.debug("formPost: data looks like:" + str(urlenc_data))
self.logger.debug("formPost: url: "+self.requested_url) self.logger.debug("formPost: url: "+self.requested_url)
@@ -141,7 +141,7 @@ class LFRequest:
error_list_=self.error_list, error_list_=self.error_list,
debug_=debug) debug_=debug)
if (die_on_error_ == True) or (self.die_on_error == True): if (die_on_error_ is True) or (self.die_on_error is True):
exit(1) exit(1)
return None return None
@@ -149,7 +149,7 @@ class LFRequest:
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'): def json_post(self, show_error=True, debug=False, die_on_error_=False, response_json_list_=None, method_='POST'):
if (debug == False) and (self.debug == True): if (debug is False) and (self.debug is True):
debug = True debug = True
if self.die_on_error: if self.die_on_error:
die_on_error_ = True die_on_error_ = True
@@ -158,7 +158,7 @@ class LFRequest:
opener = urllib.request.build_opener(request.ProxyHandler(self.proxies)) opener = urllib.request.build_opener(request.ProxyHandler(self.proxies))
urllib.request.install_opener(opener) urllib.request.install_opener(opener)
if ((self.post_data != None) and (self.post_data is not self.No_Data)): if (self.post_data is not None) and (self.post_data is not self.No_Data):
myrequest = request.Request(url=self.requested_url, myrequest = request.Request(url=self.requested_url,
method=method_, method=method_,
data=json.dumps(self.post_data).encode("utf-8"), data=json.dumps(self.post_data).encode("utf-8"),
@@ -174,7 +174,7 @@ class LFRequest:
try: try:
resp = urllib.request.urlopen(myrequest) resp = urllib.request.urlopen(myrequest)
resp_data = resp.read().decode('utf-8') resp_data = resp.read().decode('utf-8')
if (debug and die_on_error_): if debug and die_on_error_:
self.logger.debug("----- LFRequest::json_post:128 debug: --------------------------------------------") self.logger.debug("----- LFRequest::json_post:128 debug: --------------------------------------------")
self.logger.debug("URL: <%s> status: %d "% (self.requested_url, resp.status)) self.logger.debug("URL: <%s> status: %d "% (self.requested_url, resp.status))
if resp.status != 200: if resp.status != 200:
@@ -208,7 +208,7 @@ class LFRequest:
error_=uerror, error_=uerror,
debug_=debug) debug_=debug)
if die_on_error_ == True: if die_on_error_:
exit(1) exit(1)
return None return None
@@ -330,7 +330,7 @@ def plain_get(url_=None, debug_=False, die_on_error_=False, proxies_=None):
error_=uerror, error_=uerror,
debug_=debug_) debug_=debug_)
if die_on_error_ == True: if die_on_error_:
exit(1) exit(1)
return None return None