aboutsummaryrefslogtreecommitdiffstats
path: root/gsxws
diff options
context:
space:
mode:
Diffstat (limited to 'gsxws')
-rw-r--r--gsxws/comptia.py14
-rw-r--r--gsxws/core.py10
2 files changed, 15 insertions, 9 deletions
diff --git a/gsxws/comptia.py b/gsxws/comptia.py
index bdbc7d4..61164f8 100644
--- a/gsxws/comptia.py
+++ b/gsxws/comptia.py
@@ -11,6 +11,7 @@ MODIFIERS = (
("E", "Environmental"),
("F", "Configuration: Peripheral"),
("G", "Damaged"),
+ ("H", "Apple Review"),
)
GROUPS = (
@@ -28,6 +29,7 @@ GROUPS = (
('B', "iPhone"),
('E', "iPod"),
('F', "iPad"),
+ ('G', "Beats Products"),
)
@@ -57,23 +59,21 @@ class CompTIA(GsxObject):
>>> CompTIA().fetch() # doctest: +ELLIPSIS
{u'A': {'989': u'Remote Inoperable', ...
"""
- self._submit("ComptiaCodeLookupRequest", "ComptiaCodeLookup", "comptiaInfo", True)
+ if self._cache.get('comptia'):
+ return self._cache.get('comptia')
- if self._cache.get():
- return self._cache.get()
-
- root = self._req.objects
+ doc = self._submit("ComptiaCodeLookupRequest", "ComptiaCodeLookup", "comptiaInfo", raw=True)
+ root = doc.find('.//comptiaInfo')
for el in root.findall(".//comptiaGroup"):
group = {}
comp_id = unicode(el[0].text)
-
for ci in el.findall("comptiaCodeInfo"):
group[ci[0].text] = unicode(ci[1].text)
self._comptia[comp_id] = group
- self._cache.set(self._comptia)
+ self._cache.set('comptia', self._comptia)
return self._comptia
def symptoms(self, component=None):
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