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

Changed fstrings to % formatting

Browse Source
This commit is contained in:
Logan Lipke
2020-06-04 14:15:40 -07:00
parent c4d96626a5
commit e768a1544b
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
py-json/LANforge/lfcli_base.py
View File

@@ -33,9 +33,9 @@ class LFCliBase:
json_response = lf_r.jsonPost(self.debugOn) json_response = lf_r.jsonPost(self.debugOn)
except Exception as x: except Exception as x:
if self.debugOn or self.haltOnError: if self.debugOn or self.haltOnError:
print(f"jsonPost posted to {_req_url}") print("jsonPost posted to %s" % _req_url)
pprint(_data) pprint(_data)
print(f"Exception {x}:") print("Exception %s:" % x)
traceback.print_exception(Exception, x, x.__traceback__, chain=True) traceback.print_exception(Exception, x, x.__traceback__, chain=True)
if self.haltOnError: if self.haltOnError:
exit(1) exit(1)
@@ -54,7 +54,7 @@ class LFCliBase:
except ValueError as ve: except ValueError as ve:
if self.debugOn or self.haltOnError: if self.debugOn or self.haltOnError:
print("jsonGet asked for "+_req_url) print("jsonGet asked for "+_req_url)
print(f"Exception {ve}:") print("Exception %s:" % ve)
traceback.print_exception(ValueError, ve, ve.__traceback__, chain=True) traceback.print_exception(ValueError, ve, ve.__traceback__, chain=True)
if self.haltOnError: if self.haltOnError:
sys.exit(1) sys.exit(1)
@@ -62,7 +62,7 @@ class LFCliBase:
return json_response return json_response
def error(self, exception): def error(self, exception):
#print(f"lfcli_base error: {exception}") #print("lfcli_base error: %s" % exception)
pprint.pprint(exception) pprint.pprint(exception)
traceback.print_exception(Exception, exception, exception.__traceback__, chain=True) traceback.print_exception(Exception, exception, exception.__traceback__, chain=True)
if self.haltOnError: if self.haltOnError:
@@ -72,11 +72,11 @@ class LFCliBase:
# print("continuing...") # print("continuing...")
def check_connect(self): def check_connect(self):
print(f"Checking for LANforge GUI connection: {self.mgr_url}") print("Checking for LANforge GUI connection: " % self.mgr_url)
response = self.json_get("/") response = self.json_get("/")
duration = 0 duration = 0
while (response is None) and (duration < 300): while (response is None) and (duration < 300):
print(f"LANforge GUI connection not found sleeping 5 seconds, tried: {self.mgr_url}") print("LANforge GUI connection not found sleeping 5 seconds, tried: %s" % self.mgr_url)
duration += 2 duration += 2
time.sleep(2) time.sleep(2)
response = self.json_get("") response = self.json_get("")