summaryrefslogtreecommitdiff
path: root/bin/tools/convert.py
diff options
context:
space:
mode:
authorP. Christeas <p_christ@hol.gr>2009-08-13 04:07:06 +0300
committerP. Christeas <p_christ@hol.gr>2009-08-13 04:07:06 +0300
commitaba9fd3e77ce3ecaa7b24e945979942fbd0a8536 (patch)
treedd0583085e1add72d8642c5ffcdb64ccb6fbed4f /bin/tools/convert.py
parente9b723e3218439e671d65e2a26b97dcf838edf44 (diff)
parent076c4f13d628d40be9b2a2eb4e646fa57dfaee74 (diff)
Merge commit 'origin/master' into xrg
bzr revid: p_christ@hol.gr-20090813010638-2uwue8bg4w5uv99o bzr revid: p_christ@hol.gr-20090813010706-h9s7e7flcw2wwgt9
Diffstat (limited to 'bin/tools/convert.py')
-rw-r--r--bin/tools/convert.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/bin/tools/convert.py b/bin/tools/convert.py
index a691f7c5e21..6a8e8c9b094 100644
--- a/bin/tools/convert.py
+++ b/bin/tools/convert.py
@@ -883,7 +883,7 @@ def convert_xml_import(cr, module, xmlfile, idref=None, mode='init', noupdate=Fa
except Exception, e:
logger = netsvc.Logger()
logger.notifyChannel('init', netsvc.LOG_ERROR, 'The XML file does not fit the required schema !')
- logger.notifyChannel('init', netsvc.LOG_ERROR, tools.ustr(relaxng.error_log.last_error))
+ logger.notifyChannel('init', netsvc.LOG_ERROR, misc.ustr(relaxng.error_log.last_error))
raise
if idref is None: