From 1ed694a155dc1ba920053f68260e5430f7e5e193 Mon Sep 17 00:00:00 2001 From: Jed Reynolds Date: Wed, 29 Jul 2020 22:20:25 -0700 Subject: [PATCH] LFRequest.py: improves self.die_on_error logic to absolutely die on conditions that are !404 --- py-json/LANforge/LFRequest.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/py-json/LANforge/LFRequest.py b/py-json/LANforge/LFRequest.py index c70cef29..d82c147f 100644 --- a/py-json/LANforge/LFRequest.py +++ b/py-json/LANforge/LFRequest.py @@ -103,6 +103,8 @@ class LFRequest: def jsonPost(self, show_error=True, debug=False, die_on_error_=False, response_json_list_=None): if (debug == False) and (self.debug == True): debug = True + if self.die_on_error: + die_on_error_ = True responses = [] if ((self.post_data != None) and (self.post_data is not self.No_Data)): request = urllib.request.Request(url=self.requested_url, @@ -156,8 +158,8 @@ class LFRequest: print("----- Response: --------------------------------------------------------") LFUtils.debug_printer.pprint(responses[0].reason) print("------------------------------------------------------------------------") - if (die_on_error_ == True) or (self.die_on_error == True): - exit(1) + if die_on_error_ or (error.code != 404): + exit(1) except urllib.error.URLError as uerror: if show_error: print("----- LFRequest::jsonPost:162 URLError: ---------------------------------------------")