dave/pyfa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 17 Wiki Activity

Fix update checker, migrate to requests package for all network stuff. The eveapi package is probably not going to work with caching and whatnot, but pyfa doesn't use it and XML API is EOL anyway

Browse Source
This commit is contained in:
blitzmann
2018-03-04 18:08:34 -05:00
parent 7956ca0409
commit 4fac10ccb7
5 changed files with 58 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
service/eveapi.py
View File

@@ -402,11 +402,11 @@ class _RootContext(_Context):
req = self._scheme + '://' + self._host + path
response = network.request(req, network.EVE, kw)
response = network.request(req, network.EVE, params=kw)
if cache:
store = True
response = response.read()
response = response.text
else:
store = False
else:
@@ -416,8 +416,8 @@ class _RootContext(_Context):
if retrieve_fallback:
# implementor is handling fallbacks...
try:
return _ParseXML(response, True,
store and (lambda obj: cache.store(self._host, path, kw, response, obj)))
return _ParseXML(response.text, True,
store and (lambda obj: cache.store(self._host, path, kw, response.text, obj)))
except Error as e:
response = retrieve_fallback(self._host, path, kw, reason=e)
if response is not None:
@@ -425,7 +425,7 @@ class _RootContext(_Context):
raise
else:
# implementor is not handling fallbacks...
return _ParseXML(response, True, store and (lambda obj: cache.store(self._host, path, kw, response, obj)))
return _ParseXML(response.text, True, store and (lambda obj: cache.store(self._host, path, kw, response, obj)))
# -----------------------------------------------------------------------------