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

JSON: replace show_error with debug

Browse Source
This commit is contained in:
Jed Reynolds
2020-06-29 23:21:06 -07:00
parent f202fc7c97
commit ebf6737edb
1 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -166,7 +166,7 @@ class LFRequest:
exit(1)
return None
def get(self, show_error=True, debug=False, die_on_error_=False):
def get(self, debug=False, die_on_error_=False):
if (debug == False) and (self.debug == True):
debug = True
if (debug):
@@ -177,7 +177,7 @@ class LFRequest:
myresponses.append(urllib.request.urlopen(myrequest))
return myresponses[0]
except urllib.error.HTTPError as error:
if show_error:
if debug:
print("----- LFRequest::get:155 HTTPError: --------------------------------------------")
print("<%s> HTTP %s: %s"%(myrequest.get_full_url(), error.code, error.reason, ))
if error.code != 404:
@@ -201,7 +201,7 @@ class LFRequest:
if (die_on_error_ == True) or (self.die_on_error == True):
exit(1)
except urllib.error.URLError as uerror:
if show_error:
if debug:
print("----- LFRequest::get:177 URLError: ---------------------------------------------")
print("Reason: %s; URL: %s"%(uerror.reason, myrequest.get_full_url()))
print("------------------------------------------------------------------------")
@@ -209,13 +209,14 @@ class LFRequest:
exit(1)
return None
def getAsJson(self, show_error=True, die_on_error_=False, debug_=False):
def getAsJson(self, die_on_error_=False, debug_=False):
responses = []
responses.append(self.get(show_error, die_on_error_=die_on_error_, debug=(debug_ or self.debug)))
if (len(responses) < 1):
j = self.get(debug=debug_, die_on_error_=die_on_error_)
responses.append(j)
if len(responses) < 1:
return None
if (responses[0] == None):
if (show_error):
if responses[0] == None:
if debug_:
print("No response from "+self.requested_url)
return None
json_data = json.loads(responses[0].read().decode('utf-8'))