Don't try to validate xml for old version of lxml
This commit is contained in:
1 parent
5c747aca98
commit
aa569114cc
1 file changed
+11
-9
+11
-9
@@ -56,17 +56,19 @@ class View(OSV):
|
||||
trans_views[trans['name']][trans['src']] = trans
|
||||
for view in views:
|
||||
xml = view.arch.strip()
|
||||
tree = etree.fromstring(xml)
|
||||
|
||||
dtd_name = os.path.join(os.path.dirname(__file__),
|
||||
(view.inherit and view.inherit.type or view.type) + '.dtd')
|
||||
dtd = etree.DTD(file(dtd_name))
|
||||
tree = etree.fromstring(xml)
|
||||
if not dtd.validate(tree):
|
||||
logger = Logger()
|
||||
error_log = reduce(lambda x, y: str(x) + '\n' + str(y),
|
||||
dtd.error_log.filter_from_errors())
|
||||
logger.notify_channel('ir', LOG_ERROR,
|
||||
'Invalid xml view:\n%s' % (error_log + '\n' + xml))
|
||||
return False
|
||||
if hasattr(etree, 'DTD'):
|
||||
dtd = etree.DTD(file(dtd_name))
|
||||
if not dtd.validate(tree):
|
||||
logger = Logger()
|
||||
error_log = reduce(lambda x, y: str(x) + '\n' + str(y),
|
||||
dtd.error_log.filter_from_errors())
|
||||
logger.notify_channel('ir', LOG_ERROR,
|
||||
'Invalid xml view:\n%s' % (error_log + '\n' + xml))
|
||||
return False
|
||||
root_element = tree.getroottree().getroot()
|
||||
strings = self._translate_view(root_element)
|
||||
view_ids = self.search(cursor, 0, [
|
||||
|
||||
Reference in new issue
Block a user