tryton-do/tryton
2
0
Fork 0
Code Issues Pull Requests 2 Actions Packages Projects Releases Wiki Activity

Add more details on invalid XML error

Browse Source 
It is useful when the error happens during the execution of the tests.

issue5257
review17761002
This commit is contained in:
Cédric Krier
2016-01-21 10:40:30 +01:00
parent 2f2e95e09f
commit fa0774cd1e
1 changed files with 22 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
trytond/ir/ui/view.py
+22 -20
View File
@@ -153,11 +153,12 @@ class View(ModelSQL, ModelView):
if hasattr(etree, 'RelaxNG'):
validator = etree.RelaxNG(etree=cls.get_rng(view.rng_type))
if not validator.validate(tree):
error_log = reduce(lambda x, y: str(x) + '\n' + str(y),
validator.error_log.filter_from_errors())
logger.error('Invalid xml view:\n%s',
str(error_log) + '\n' + xml)
cls.raise_user_error('invalid_xml', (view.rec_name,))
error_log = '\n'.join(map(str,
validator.error_log.filter_from_errors()))
logger.error('Invalid XML view %s:\n%s\n%s',
view.rec_name, error_log, xml)
cls.raise_user_error(
'invalid_xml', (view.rec_name,), error_log)
root_element = tree.getroottree().getroot()
# validate pyson attributes
@@ -167,22 +168,23 @@ class View(ModelSQL, ModelView):
def encode(element):
for attr in ('states', 'domain', 'spell'):
if element.get(attr):
try:
value = PYSONDecoder().decode(element.get(attr))
validates.get(attr, lambda a: True)(value)
except Exception, e:
logger.error('Invalid pyson view element "%s:%s":'
'\n%s\n%s',
element.get('id') or element.get('name'), attr,
str(e), xml)
return False
if not element.get(attr):
continue
try:
value = PYSONDecoder().decode(element.get(attr))
validates.get(attr, lambda a: True)(value)
except Exception, e:
error_log = '%s: <%s %s="%s"/>' % (
e, element.get('id') or element.get('name'), attr,
value)
logger.error(
'Invalid XML view %s:\n%s\n%s',
view.rec_name, error_log, xml)
cls.raise_user_error(
'invalid_xml', (view.rec_name,), error_log)
for child in element:
if not encode(child):
return False
return True
if not encode(root_element):
cls.raise_user_error('invalid_xml', (view.rec_name,))
encode(child)
encode(root_element)
def get_arch(self, name):
value = None