From c1d744de2e3f59a18bd0943f29911ccafba7c1b5 Mon Sep 17 00:00:00 2001 From: Filipp Lepalaan Date: Wed, 17 Dec 2014 00:11:28 +0200 Subject: CompTIA fixes --- gsxws/core.py | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'gsxws/core.py') diff --git a/gsxws/core.py b/gsxws/core.py index e1e5a50..c2e26a4 100644 --- a/gsxws/core.py +++ b/gsxws/core.py @@ -226,8 +226,8 @@ class GsxCache(object): def set(self, key, value): d = { - 'value': value, - 'expires': self.now + self.expires + 'value' : value, + 'expires' : self.now + self.expires } self.shelf[key] = d @@ -256,6 +256,7 @@ class GsxRequest(object): ET.SubElement(self.env, "soapenv:Header") self.body = ET.SubElement(self.env, "soapenv:Body") + self.xml_response = '' for k, v in kwargs.items(): self.obj = v @@ -309,11 +310,16 @@ class GsxRequest(object): data = ET.tostring(self.env, "UTF-8") res = self._send(method, data) xml = res.read() + self.xml_response = xml if res.status > 200: raise GsxError(xml=xml, url=self._url) logging.debug("Response: %s %s %s" % (res.status, res.reason, xml)) + + if raw: + return ET.fromstring(self.xml_response) + response = response or self._response self.objects = objectify.parse(xml, response) return self.objects -- cgit v1.2.3