From d2c51e70d5827de8dce8fc83afb9cccbea2b1dfc Mon Sep 17 00:00:00 2001 From: Markus Birth Date: Fri, 9 Feb 2018 00:12:46 +0100 Subject: [PATCH] Rearrange storing of result object. --- tcllib/requests/tcl.py | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/tcllib/requests/tcl.py b/tcllib/requests/tcl.py index 8e08ac1..217d878 100644 --- a/tcllib/requests/tcl.py +++ b/tcllib/requests/tcl.py @@ -8,6 +8,7 @@ from defusedxml import ElementTree class TclRequest: def __init__(self): self.uri = "" + self.response = None self.result = None self.error = None self.success = False @@ -24,7 +25,7 @@ class TclRequest: def get_result(self): """Returns Result object.""" - return None + return self.result class CheckRequest(TclRequest): def __init__(self, device: devices.Device): @@ -57,7 +58,8 @@ class CheckRequest(TclRequest): 404: "No data for requested CUREF/FV combination.", } if http_status == 200: - self.result = contents + self.response = contents + self.result = tclresult.CheckResult(contents) self.success = True return True elif http_status in ok_states: @@ -72,11 +74,6 @@ class CheckRequest(TclRequest): return True return False - def get_result(self): - if not self.success: - return None - return tclresult.CheckResult(self.result) - # Check requests have 4 possible outcomes: # 1. HTTP 200 with XML data - our desired info # 2. HTTP 204 - means: no newer update available