entrouvert/wcs
entrouvert
/
wcs
14
1
Fork 0
Code Issues Pull Requests 46 Releases Activity

workflows: use force_str to display wscall error details (#36515)

This commit is contained in:
Frédéric Péters 2019-11-15 20:13:59 +01:00
parent 21ee4427c6
commit dc82d0f918
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
wcs/wf/wscall.py
View File

@ -31,7 +31,7 @@ from quixote.html import TemplateIO, htmltext
from ..qommon import _, force_str
from ..qommon.errors import ConnectionError
from ..qommon.form import *
from ..qommon.misc import json_loads, site_encode
from ..qommon.misc import json_loads
from wcs.workflows import (WorkflowStatusItem, register_item_class,
AbortActionException, AttachmentEvolutionPart)
from wcs.wscalls import call_webservice
@ -75,8 +75,10 @@ class JournalWsCallErrorPart: #pylint: disable=C1001
r += htmltext('<ul>')
for attr in ('err', 'err_class', 'err_desc', 'reason'):
if attr in json_data:
if six.PY2 and isinstance(json_data[attr], unicode):
json_data[attr] = force_str(json_data[attr])
r += htmltext('<li>%s: %s</li>\n' ) % (
labels.get(attr), site_encode(json_data[attr]))
labels.get(attr), json_data[attr])
r += htmltext('</ul>')
r += htmltext('</div>')
r += htmltext('</div>')