entrouvert
/
zoo
17
0
Fork 0
Code Issues Pull Requests Releases Activity

python3: replace response content with text (#40911)

This commit is contained in:
Nicolas Roche 2020-03-23 17:34:53 +01:00
parent dcb5351962
commit f39cbee9d2
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/test_nanterre_qf.py
View File

@ -379,4 +379,4 @@ def test_api_editer_carte(app, nanterre_classic_family, qf_settings):
with httmock.HTTMock(qf_ok):
response = app.get(url)
assert response.content == content
assert response.text == content

6
zoo/zoo_nanterre/qf.py
View File

@ -47,7 +47,7 @@ class QF(object):
try:
data = response.json()
except ValueError as e:
return None, u'Implicit contenu non JSON: %s %r' % (response.status_code, response.content[:1024])
return None, u'Implicit contenu non JSON: %s %r' % (response.status_code, response.text[:1024])
if response.status_code != 200:
return None, data
@ -199,8 +199,8 @@ class QF(object):
'%s %r' % (url, e))
if response.status_code != 200:
return None, (u'Implicit editer-carte code non 200 sur récupération du lien: '
'%s %s %r' % (url, response.status_code, response.content[:1024]))
return response.content, None
'%s %s %r' % (url, response.status_code, response.text[:1024]))
return response.text, None
class CalculQF(fragments.FragmentBuilder):

8
zoo/zoo_nanterre/saga.py
View File

@ -73,14 +73,14 @@ class Saga(object):
if response.status_code != 200:
return None, u'SAGA response is not 200: %s %r' % (response.status_code,
response.content[:1024])
response.text[:1024])
try:
et = ET.fromstring(response.content)
et = ET.fromstring(response.text)
except Exception:
return None, u'SAGA invalid XML content: %r' % response.content[:1024]
return None, u'SAGA invalid XML content: %r' % response.text[:1024]
content_node = et.find('.//{%s}%s' % (self.ns, content_tag))
if content_node is None:
return None, u'SAGA no content node: %r' % response.content[:1024]
return None, u'SAGA no content node: %r' % response.text[:1024]
# pluging XML inside XML is so stupid :(
content = content_node.text
if 'ISO-8859-1' in content: