From 200e8bbe27a6e1039b7730626212c8c73a207a6c Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Thu, 26 Nov 2009 15:03:29 +0100 Subject: [PATCH 01/29] Add virtualenv files to bzrignore bzr revid: xmo@tinyerp.com-20091126140329-s6hyghyhx0n41fws --- .bzrignore | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/.bzrignore b/.bzrignore index 9b867797a34..7f295489dba 100644 --- a/.bzrignore +++ b/.bzrignore @@ -3,3 +3,15 @@ .bzrignore bin/addons/* bin/filestore* +.Python +include +lib +bin/activate +bin/activate_this.py +bin/easy_install +bin/easy_install-2.6 +bin/pip +bin/python +bin/python2.6 +*.pyc +*.pyo From 0d3d0a23e12845faf20127937c2a10c3742a8f69 Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Fri, 27 Nov 2009 11:50:05 +0100 Subject: [PATCH 02/29] Fix server start shebang: hardcoding /usr/bin/python bypasses virtualenv (or other), /usr/bin/env python doesn't bzr revid: xmo@tinyerp.com-20091127105005-g4mwjrp7a1m38zj0 --- bin/openerp-server.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/bin/openerp-server.py b/bin/openerp-server.py index 3971f2fa779..7f90eb77902 100755 --- a/bin/openerp-server.py +++ b/bin/openerp-server.py @@ -1,5 +1,5 @@ -#!/usr/bin/python -# -*- encoding: utf-8 -*- +#!/usr/bin/env python +# -*- coding: utf-8 -*- ############################################################################## # # OpenERP, Open Source Management Solution @@ -223,4 +223,3 @@ while True: time.sleep(1) # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: - From c0450256dcda05e65400a226176bd9dd12740ee4 Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Fri, 27 Nov 2009 12:05:54 +0100 Subject: [PATCH 03/29] Add more stuff into bzrignore bzr revid: xmo@tinyerp.com-20091127110554-89eqy06fmla373u3 --- .bzrignore | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.bzrignore b/.bzrignore index 7f295489dba..b44befc61b4 100644 --- a/.bzrignore +++ b/.bzrignore @@ -15,3 +15,5 @@ bin/python bin/python2.6 *.pyc *.pyo +build/ +bin/yolk From b676be9a97cfcce751a35afed6159d61591227c2 Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Fri, 27 Nov 2009 12:07:12 +0100 Subject: [PATCH 04/29] [FIX] set absolute path for the config file to avoid the save() method breaking on single file, since os.path.exists('') returns false and you can't create the current directory bzr revid: xmo@tinyerp.com-20091127110712-dmj8pwl8xcpxk0fj --- bin/tools/config.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/bin/tools/config.py b/bin/tools/config.py index 1621a11f9c2..9e092434bb8 100644 --- a/bin/tools/config.py +++ b/bin/tools/config.py @@ -204,7 +204,8 @@ class configmanager(object): else: rcfilepath = os.path.expanduser('~/.openerp_serverrc') - self.rcfile = fname or opt.config or os.environ.get('OPENERP_SERVER') or rcfilepath + self.rcfile = os.path.abspath( + fname or opt.config or os.environ.get('OPENERP_SERVER') or rcfilepath) self.load() From fdcbed339b52e6e8f8170c7259f6a502d9bb028d Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Fri, 27 Nov 2009 13:09:38 +0100 Subject: [PATCH 05/29] [FIX] hang in OSX when trying to shutdown server via SIGINT bzr revid: xmo@tinyerp.com-20091127120938-arrvoqieit1bqx9c --- bin/netsvc.py | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/bin/netsvc.py b/bin/netsvc.py index 56d0eb2918a..863b17fe553 100644 --- a/bin/netsvc.py +++ b/bin/netsvc.py @@ -331,7 +331,19 @@ class HttpDaemon(threading.Thread): def stop(self): self.running = False if os.name != 'nt': - self.server.socket.shutdown( hasattr(socket, 'SHUT_RDWR') and socket.SHUT_RDWR or 2 ) + try: + self.server.socket.shutdown( + hasattr(socket, 'SHUT_RDWR') and socket.SHUT_RDWR or 2) + except socket.error, e: + if e.errno != 57: raise + # OSX, socket shutdowns both sides if any side closes it + # causing an error 57 'Socket is not connected' on shutdown + # of the other side (or something), see + # http://bugs.python.org/issue4397 + Logger().notifyChannel( + 'server', LOG_DEBUG, + '"%s" when shutting down server socket, ' + 'this is normal under OS X'%e) self.server.socket.close() def run(self): From 752e88e5212aba2b4afa2a0448534bb0a0d7bccd Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Sat, 28 Nov 2009 11:01:04 +0100 Subject: [PATCH 06/29] [FIX] Remove leftover instances of libxslt and libxml2, replace them by lxml bzr revid: xmo@tinyerp.com-20091128100104-n0s3sv3p1601mn50 --- bin/report/custom.py | 25 +++++++-------- bin/report/interface.py | 52 +++++++++++-------------------- bin/report/printscreen/ps_form.py | 12 +++---- bin/report/printscreen/ps_list.py | 13 ++++---- bin/tools/convert.py | 6 ---- setup.py | 2 -- 6 files changed, 40 insertions(+), 70 deletions(-) diff --git a/bin/report/custom.py b/bin/report/custom.py index 4c0c9b1ece0..0f770a8760a 100644 --- a/bin/report/custom.py +++ b/bin/report/custom.py @@ -34,11 +34,10 @@ from osv.orm import browse_null from osv.orm import browse_record_list import pooler from xml.dom import minidom -import libxml2 -import libxslt from pychart import * import misc import cStringIO +from lxml import etree class external_pdf(render.render): def __init__(self, pdf): @@ -351,11 +350,11 @@ class report_custom(report_int): new_doc.childNodes[0].appendChild(lines) - styledoc = libxml2.parseFile(os.path.join(tools.config['root_path'],'addons/base/report/custom_new.xsl')) - style = libxslt.parseStylesheetDoc(styledoc) - doc = libxml2.parseDoc(new_doc.toxml()) - rml_obj = style.applyStylesheet(doc, None) - rml = style.saveResultToString(rml_obj) + transform = etree.XSLT( + etree.parse(os.path.join(tools.config['root_path'], + 'addons/base/report/custom_new.xsl'))) + rml = etree.tostring( + transform(etree.fromstring(new_doc.toxml()))) self.obj = render.rml(rml) self.obj.render() @@ -649,13 +648,11 @@ class report_custom(report_int): new_doc.childNodes[0].appendChild(lines) -# file('/tmp/terp.xml','w+').write(new_doc.toxml()) - - styledoc = libxml2.parseFile(os.path.join(tools.config['root_path'],'addons/base/report/custom_new.xsl')) - style = libxslt.parseStylesheetDoc(styledoc) - doc = libxml2.parseDoc(new_doc.toxml()) - rml_obj = style.applyStylesheet(doc, None) - rml = style.saveResultToString(rml_obj) + transform = etree.XSLT( + etree.parse(os.path.join(tools.config['root_path'], + 'addons/base/report/custom_new.xsl'))) + rml = etree.tostring( + transform(etree.fromstring(new_doc.toxml()))) self.obj = render.rml(rml) self.obj.render() diff --git a/bin/report/interface.py b/bin/report/interface.py index 09ea80720ac..e3804481e50 100644 --- a/bin/report/interface.py +++ b/bin/report/interface.py @@ -23,8 +23,6 @@ import os import re -import libxml2 -import libxslt from lxml import etree import netsvc import pooler @@ -145,48 +143,34 @@ class report_rml(report_int): if not self.xsl: return xml - # load XSL (parse it to the XML level) - styledoc = libxml2.parseDoc(tools.file_open(self.xsl).read()) - xsl_path, tail = os.path.split(self.xsl) - for child in styledoc.children: - if child.name == 'import': - if child.hasProp('href'): - imp_file = child.prop('href') - _x, imp_file = tools.file_open(imp_file, subdir=xsl_path, pathinfo=True) - child.setProp('href', urllib.quote(str(imp_file))) + stylesheet = etree.parse(tools.file_open(self.xsl)) + xsl_path, _ = os.path.split(self.xsl) + for import_child in stylesheet.findall('./import'): + if 'href' in import_child.attrib: + imp_file = import_child.get('href') + _, imp_file = tools.file_open(imp_file, subdir=xsl_path, pathinfo=True) + import_child.set('href', urllib.quote(str(imp_file))) #TODO: get all the translation in one query. That means we have to: # * build a list of items to translate, # * issue the query to translate them, # * (re)build/update the stylesheet with the translated items - # translate the XSL stylesheet - def look_down(child, lang): - while child is not None: - if (child.type == "element") and child.hasProp('t'): - #FIXME: use cursor - res = service.execute(cr.dbname, uid, 'ir.translation', - '_get_source', self.name2, 'xsl', lang, child.content) - if res: - child.setContent(res.encode('utf-8')) - look_down(child.children, lang) - child = child.next + def translate(doc, lang): + for node in doc.xpath('//*[@t]'): + translation = service.execute( + cr.dbname, uid, 'ir.translation', '_get_source', + self.name2, 'xsl', lang, node.text) + if translation: + node.text = translation if context.get('lang', False): - look_down(styledoc.children, context['lang']) + translate(stylesheet, context['lang']) - # parse XSL - style = libxslt.parseStylesheetDoc(styledoc) - # load XML (data) - doc = libxml2.parseMemory(xml,len(xml)) - # create RML (apply XSL to XML data) - result = style.applyStylesheet(doc, None) - # save result to string - xml = style.saveResultToString(result) + transform = etree.XSLT(stylesheet) + xml = etree.tostring( + transform(etree.fromstring(xml))) - style.freeStylesheet() - doc.freeDoc() - result.freeDoc() return xml def create_pdf(self, rml, localcontext = None, logo=None, title=None): diff --git a/bin/report/printscreen/ps_form.py b/bin/report/printscreen/ps_form.py index ac9c499dda3..be7b926de30 100644 --- a/bin/report/printscreen/ps_form.py +++ b/bin/report/printscreen/ps_form.py @@ -26,8 +26,6 @@ import tools from report import render from lxml import etree -import libxml2 -import libxslt import time, os @@ -140,11 +138,11 @@ class report_printscreen_list(report_int): lines.append(node_line) new_doc.append(node_line) - styledoc = libxml2.parseFile(os.path.join(tools.config['root_path'],'addons/base/report/custom_new.xsl')) - style = libxslt.parseStylesheetDoc(styledoc) - doc = libxml2.parseDoc(new_doc.toxml()) - rml_obj = style.applyStylesheet(doc, None) - rml = style.saveResultToString(rml_obj) + transform = etree.XSLT( + etree.parse(os.path.join(tools.config['root_path'], + 'addons/base/report/custom_new.xsl'))) + rml = etree.tostring(transform(new_doc)) + self.obj = render.rml(rml, self.title) self.obj.render() return True diff --git a/bin/report/printscreen/ps_list.py b/bin/report/printscreen/ps_list.py index d2f946e6715..e20262a7897 100644 --- a/bin/report/printscreen/ps_list.py +++ b/bin/report/printscreen/ps_list.py @@ -25,8 +25,6 @@ import pooler import tools from lxml import etree from report import render -import libxml2 -import libxslt import locale import time, os @@ -236,11 +234,12 @@ class report_printscreen_list(report_int): lines.append(node_line) new_doc.append(lines) - styledoc = libxml2.parseFile(os.path.join(tools.config['root_path'],'addons/base/report/custom_new.xsl')) - style = libxslt.parseStylesheetDoc(styledoc) - doc = libxml2.parseDoc(etree.tostring(new_doc)) - rml_obj = style.applyStylesheet(doc, None) - rml = style.saveResultToString(rml_obj) + + transform = etree.XSLT( + etree.parse(os.path.join(tools.config['root_path'], + 'addons/base/report/custom_new.xsl'))) + rml = etree.tostring(transform(new_doc)) + self.obj = render.rml(rml, title=self.title) self.obj.render() return True diff --git a/bin/tools/convert.py b/bin/tools/convert.py index 9f8f2bc55c1..749867c3862 100644 --- a/bin/tools/convert.py +++ b/bin/tools/convert.py @@ -35,12 +35,6 @@ from config import config import logging import sys -try: - from lxml import etree -except: - sys.stderr.write("ERROR: pythonic binding for the libxml2 and libxslt libraries is missing\n") - sys.stderr.write("ERROR: Try to install python-lxml package\n") - sys.exit(2) import pickle diff --git a/setup.py b/setup.py index f34a69bfb8b..c4b830c67a5 100755 --- a/setup.py +++ b/setup.py @@ -55,8 +55,6 @@ py_short_version = '%s.%s' % sys.version_info[:2] required_modules = [ ('psycopg2', 'PostgreSQL module'), ('xml', 'XML Tools for python'), - ('libxml2', 'libxml2 python bindings'), - ('libxslt', 'libxslt python bindings'), ('reportlab', 'reportlab module'), ('pychart', 'pychart module'), ('pydot', 'pydot module'), From 3d9805937144f2e6761be0f2c181a91e8eb67d2f Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Sat, 28 Nov 2009 11:01:45 +0100 Subject: [PATCH 07/29] [FIX] leftover call to minidom in ps_form even though minidom isn't imported there anymore bzr revid: xmo@tinyerp.com-20091128100145-9bjfjivub2kzvopb --- bin/report/printscreen/ps_form.py | 1 - 1 file changed, 1 deletion(-) diff --git a/bin/report/printscreen/ps_form.py b/bin/report/printscreen/ps_form.py index be7b926de30..ca848ac6521 100644 --- a/bin/report/printscreen/ps_form.py +++ b/bin/report/printscreen/ps_form.py @@ -76,7 +76,6 @@ class report_printscreen_list(report_int): def _create_table(self, uid, ids, fields, fields_order, results, context, title=''): pageSize=[297.0,210.0] - impl = minidom.getDOMImplementation() new_doc = etree.Element("report") config = etree.Element("config") From ce28b92c9e314579334271a58fcf4c5c65873e36 Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Sat, 28 Nov 2009 11:26:57 +0100 Subject: [PATCH 08/29] [FIX] remove minidom from report/custom, replace with lxml bzr revid: xmo@tinyerp.com-20091128102657-nu1k8y4hlo91tiez --- bin/report/custom.py | 99 +++++++++++++++++++------------------------- 1 file changed, 42 insertions(+), 57 deletions(-) diff --git a/bin/report/custom.py b/bin/report/custom.py index 0f770a8760a..c773de3ffaf 100644 --- a/bin/report/custom.py +++ b/bin/report/custom.py @@ -33,7 +33,6 @@ from osv.osv import except_osv from osv.orm import browse_null from osv.orm import browse_record_list import pooler -from xml.dom import minidom from pychart import * import misc import cStringIO @@ -286,17 +285,14 @@ class report_custom(report_int): if report['print_orientation']=='landscape': pageSize=[pageSize[1],pageSize[0]] - impl = minidom.getDOMImplementation() - new_doc = impl.createDocument(None, "report", None) + new_doc = etree.Element('report') - # build header - config = new_doc.createElement("config") + config = etree.Element('config') def _append_node(name, text): - n = new_doc.createElement(name) - t = new_doc.createTextNode(text) - n.appendChild(t) - config.appendChild(n) + n = etree.Element(name) + t.text = text + config.append(n) _append_node('date', time.strftime('%d/%m/%Y')) _append_node('PageFormat', '%s' % report['print_format']) @@ -316,45 +312,41 @@ class report_custom(report_int): _append_node('report-header', '%s' % (report['title'],)) _append_node('report-footer', '%s' % (report['footer'],)) - new_doc.childNodes[0].appendChild(config) - header = new_doc.createElement("header") + new_doc.append(config) + header = etree.Element('header') for f in fields: - field = new_doc.createElement("field") - field_txt = new_doc.createTextNode('%s' % (f['name'],)) - field.appendChild(field_txt) - header.appendChild(field) - - new_doc.childNodes[0].appendChild(header) + field = etree.Element('field') + field.text = f['name'] + header.append(field) + new_doc.append(header) - lines = new_doc.createElement("lines") + lines = etree.Element('lines') level.reverse() for line in results: shift = level.pop() - node_line = new_doc.createElement("row") + node_line = etree.Element('row') prefix = '+' for f in range(len(fields)): - col = new_doc.createElement("col") + col = etree.Element('col') if f == 0: - col.setAttribute('para','yes') - col.setAttribute('tree','yes') - col.setAttribute('space',str(3*shift)+'mm') + col.set('para','yes') + col.set('tree','yes') + col.set('space',str(3*shift)+'mm') if line[f] != None: - txt = new_doc.createTextNode(prefix+str(line[f]) or '') + col.text = prefix+str(line[f]) or '' else: - txt = new_doc.createTextNode('/') - col.appendChild(txt) - node_line.appendChild(col) + col.text = '/' + node_line.append(col) prefix = '' - lines.appendChild(node_line) + lines.append(node_line) - new_doc.childNodes[0].appendChild(lines) + new_doc.append(lines) transform = etree.XSLT( etree.parse(os.path.join(tools.config['root_path'], 'addons/base/report/custom_new.xsl'))) - rml = etree.tostring( - transform(etree.fromstring(new_doc.toxml()))) + rml = etree.tostring(transform(new_doc)) self.obj = render.rml(rml) self.obj.render() @@ -591,16 +583,12 @@ class report_custom(report_int): if report['print_orientation']=='landscape': pageSize=[pageSize[1],pageSize[0]] - impl = minidom.getDOMImplementation() - new_doc = impl.createDocument(None, "report", None) - - # build header - config = new_doc.createElement("config") + new_doc = etree.Element('report') + config = etree.Element('config') def _append_node(name, text): - n = new_doc.createElement(name) - t = new_doc.createTextNode(text) - n.appendChild(t) + n = etree.Element(name) + n.text = text config.appendChild(n) _append_node('date', time.strftime('%d/%m/%Y')) @@ -621,38 +609,35 @@ class report_custom(report_int): _append_node('report-header', '%s' % (report['title'],)) _append_node('report-footer', '%s' % (report['footer'],)) - new_doc.childNodes[0].appendChild(config) - header = new_doc.createElement("header") + new_doc.append(config) + header = etree.Element("header") for f in fields: - field = new_doc.createElement("field") - field_txt = new_doc.createTextNode('%s' % (f['name'],)) - field.appendChild(field_txt) - header.appendChild(field) + field = etree.Element("field") + field.text = f['name'] + header.append(field) - new_doc.childNodes[0].appendChild(header) + new_doc.append(header) - lines = new_doc.createElement("lines") + lines = etree.Element("lines") for line in results: - node_line = new_doc.createElement("row") + node_line = etree.Element("row") for f in range(len(fields)): - col = new_doc.createElement("col") - col.setAttribute('tree','no') + col = etree.Element("col") + col.set('tree','no') if line[f] != None: - txt = new_doc.createTextNode(str(line[f] or '')) + col.text = line[f] or '' else: - txt = new_doc.createTextNode('/') - col.appendChild(txt) + col.text = '/' node_line.appendChild(col) - lines.appendChild(node_line) + lines.append(node_line) - new_doc.childNodes[0].appendChild(lines) + new_doc.append(lines) transform = etree.XSLT( etree.parse(os.path.join(tools.config['root_path'], 'addons/base/report/custom_new.xsl'))) - rml = etree.tostring( - transform(etree.fromstring(new_doc.toxml()))) + rml = etree.tostring(transform(new_doc)) self.obj = render.rml(rml) self.obj.render() From 44a11226fe23c693c65036f8a94ba70bad154bcf Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Sat, 28 Nov 2009 11:48:10 +0100 Subject: [PATCH 09/29] [IMP] improve usage of the ET API, use SubElement instead of Element/append, kwarg attributes setting instead of node.set bzr revid: xmo@tinyerp.com-20091128104810-52uhz28fiw53joaz --- bin/report/custom.py | 54 ++++++++------------------ bin/report/print_xml.py | 27 +++++-------- bin/report/printscreen/ps_form.py | 24 ++++-------- bin/report/printscreen/ps_list.py | 44 ++++++--------------- bin/report/render/rml2html/rml2html.py | 10 ++--- 5 files changed, 50 insertions(+), 109 deletions(-) diff --git a/bin/report/custom.py b/bin/report/custom.py index c773de3ffaf..bb1b32c0e43 100644 --- a/bin/report/custom.py +++ b/bin/report/custom.py @@ -287,12 +287,11 @@ class report_custom(report_int): new_doc = etree.Element('report') - config = etree.Element('config') + config = etree.SubElement(new_doc, 'config') def _append_node(name, text): - n = etree.Element(name) + n = etree.SubElement(config, name) t.text = text - config.append(n) _append_node('date', time.strftime('%d/%m/%Y')) _append_node('PageFormat', '%s' % report['print_format']) @@ -312,36 +311,28 @@ class report_custom(report_int): _append_node('report-header', '%s' % (report['title'],)) _append_node('report-footer', '%s' % (report['footer'],)) - new_doc.append(config) - header = etree.Element('header') - + header = etree.SubElement(new_doc, 'header') for f in fields: - field = etree.Element('field') + field = etree.SubElement(header, 'field') field.text = f['name'] - header.append(field) - new_doc.append(header) - lines = etree.Element('lines') + lines = etree.SubElement(new_doc, 'lines') level.reverse() for line in results: shift = level.pop() - node_line = etree.Element('row') + node_line = etree.SubElement(lines, 'row') prefix = '+' for f in range(len(fields)): - col = etree.Element('col') + col = etree.SubElement(node_line, 'col') if f == 0: - col.set('para','yes') - col.set('tree','yes') - col.set('space',str(3*shift)+'mm') + col.attrib.update(para='yes', + tree='yes', + space=str(3*shift)+'mm') if line[f] != None: col.text = prefix+str(line[f]) or '' else: col.text = '/' - node_line.append(col) prefix = '' - lines.append(node_line) - - new_doc.append(lines) transform = etree.XSLT( etree.parse(os.path.join(tools.config['root_path'], @@ -584,12 +575,11 @@ class report_custom(report_int): pageSize=[pageSize[1],pageSize[0]] new_doc = etree.Element('report') - config = etree.Element('config') + config = etree.SubElement(new_doc, 'config') def _append_node(name, text): - n = etree.Element(name) + n = etree.SubElement(config, name) n.text = text - config.appendChild(n) _append_node('date', time.strftime('%d/%m/%Y')) _append_node('PageSize', '%.2fmm,%.2fmm' % tuple(pageSize)) @@ -609,30 +599,20 @@ class report_custom(report_int): _append_node('report-header', '%s' % (report['title'],)) _append_node('report-footer', '%s' % (report['footer'],)) - new_doc.append(config) - header = etree.Element("header") - + header = etree.SubElement(new_doc, 'header') for f in fields: - field = etree.Element("field") + field = etree.SubElement(header, 'field') field.text = f['name'] - header.append(field) - - new_doc.append(header) - lines = etree.Element("lines") + lines = etree.SubElement(new_doc, 'lines') for line in results: - node_line = etree.Element("row") + node_line = etree.SubElement(lines, 'row') for f in range(len(fields)): - col = etree.Element("col") - col.set('tree','no') + col = etree.SubElement(node_line, 'col', tree='no') if line[f] != None: col.text = line[f] or '' else: col.text = '/' - node_line.appendChild(col) - lines.append(node_line) - - new_doc.append(lines) transform = etree.XSLT( etree.parse(os.path.join(tools.config['root_path'], diff --git a/bin/report/print_xml.py b/bin/report/print_xml.py index 912fdad00a3..9eb038e7463 100644 --- a/bin/report/print_xml.py +++ b/bin/report/print_xml.py @@ -122,8 +122,7 @@ class document(object): #TODO: test this if value == '' and 'default' in attrs: value = attrs['default'] - el = etree.Element(node.tag) - parent.append(el) + el = etree.SubElement(parent, node.tag) el.text = tounicode(value) #TODO: test this for key, value in attrs.iteritems(): @@ -155,31 +154,27 @@ class document(object): fp.write(dt) i = str(len(self.bin_datas)) self.bin_datas[i] = fp - el = etree.Element(node.tag) + el = etree.SubElement(parent, node.tag) el.text = i - parent.append(el) elif attrs['type']=='data': #TODO: test this txt = self.datas.get('form', {}).get(attrs['name'], '') - el = etree.Element(node.tag) + el = etree.SubElement(parent, node.tag) el.text = txt - parent.append(el) elif attrs['type']=='function': if attrs['name'] in self.func: txt = self.func[attrs['name']](node) else: txt = print_fnc.print_fnc(attrs['name'], node) - el = etree.Element(node.tag) + el = etree.SubElement(parent, node.tag) el.text = txt - parent.append(el) elif attrs['type']=='eval': value = self.eval(browser, attrs['expr']) - el = etree.Element(node.tag) + el = etree.SubElement(parent, node.tag) el.text = str(value) - parent.append(el) elif attrs['type']=='fields': fields = attrs['name'].split(',') @@ -197,8 +192,7 @@ class document(object): v_list = [vals[k] for k in keys] for v in v_list: - el = etree.Element(node.tag) - parent.append(el) + el = etree.SubElement(parent, node.tag) for el_cld in node: self.parse_node(el_cld, el, v) @@ -232,8 +226,7 @@ class document(object): def parse_result_tree(node, parent, datas): if not node.tag == etree.Comment: - el = etree.Element(node.tag) - parent.append(el) + el = etree.SubElement(parent, node.tag) atr = self.node_attrs_get(node) if 'value' in atr: if not isinstance(datas[atr['value']], (str, unicode)): @@ -257,8 +250,7 @@ class document(object): else: v_list = value for v in v_list: - el = etree.Element(node.tag) - parent.append(el) + el = etree.SubElement(parent, node.tag) for el_cld in node: self.parse_node(el_cld, el, v) else: @@ -267,8 +259,7 @@ class document(object): if node.tag == parent.tag: el = parent else: - el = etree.Element(node.tag) - parent.append(el) + el = etree.SubElement(parent, node.tag) for el_cld in node: self.parse_node(el_cld,el, browser) def xml_get(self): diff --git a/bin/report/printscreen/ps_form.py b/bin/report/printscreen/ps_form.py index ca848ac6521..5e2c7285206 100644 --- a/bin/report/printscreen/ps_form.py +++ b/bin/report/printscreen/ps_form.py @@ -77,19 +77,17 @@ class report_printscreen_list(report_int): pageSize=[297.0,210.0] new_doc = etree.Element("report") - config = etree.Element("config") + config = etree.SubElement(new_doc, 'config') # build header def _append_node(name, text): - n = etree.Element(name) + n = etree.SubElement(config, name) n.text = text - config.append(n) _append_node('date', time.strftime('%d/%m/%Y')) _append_node('PageSize', '%.2fmm,%.2fmm' % tuple(pageSize)) _append_node('PageWidth', '%.2f' % (pageSize[0] * 2.8346,)) _append_node('PageHeight', '%.2f' %(pageSize[1] * 2.8346,)) - _append_node('report-header', title) l = [] @@ -108,17 +106,15 @@ class report_printscreen_list(report_int): s = fields[fields_order[pos]].get('size', 56) / 28 + 1 l[pos] = strmax * s / t _append_node('tableSize', ','.join(map(str,l)) ) - new_doc.append(config) - header=etree.Element("header") + header = etree.SubElement(new_doc, 'header') for f in fields_order: - field = etree.Element("field") + field = etree.SubElement(header, 'field') field.text = fields[f]['string'] or '' - header.append(field) - new_doc.append(header) - lines = etree.Element("lines") + + lines = etree.SubElement(new_doc, 'lines') for line in results: - node_line = etree.Element("row") + node_line = etree.SubElement(lines, 'row') for f in fields_order: if fields[f]['type']=='many2one' and line[f]: line[f] = line[f][1] @@ -127,15 +123,11 @@ class report_printscreen_list(report_int): if fields[f]['type'] == 'float': precision=(('digits' in fields[f]) and fields[f]['digits'][1]) or 2 line[f]=round(line[f],precision) - col = etree.Element("col") - col.set('tree','no') + col = etree.SubElement(node_line, 'col', tree='no') if line[f] != None: col.text = tools.ustr(line[f] or '') else: col.text = '/' - node_line.append(col) - lines.append(node_line) - new_doc.append(node_line) transform = etree.XSLT( etree.parse(os.path.join(tools.config['root_path'], diff --git a/bin/report/printscreen/ps_list.py b/bin/report/printscreen/ps_list.py index e20262a7897..744c2d21709 100644 --- a/bin/report/printscreen/ps_list.py +++ b/bin/report/printscreen/ps_list.py @@ -89,30 +89,28 @@ class report_printscreen_list(report_int): def _create_table(self, uid, ids, fields, fields_order, results, context, title=''): pageSize=[297.0, 210.0] - new_doc = etree.Element("report") - config = etree.Element("config") - # build header + new_doc = etree.Element("report") + config = etree.SubElement(new_doc, 'config') def _append_node(name, text): - n = etree.Element(name) + n = etree.SubElement(config, name) n.text = text - config.append(n) #_append_node('date', time.strftime('%d/%m/%Y')) _append_node('date', time.strftime(str(locale.nl_langinfo(locale.D_FMT).replace('%y', '%Y')))) _append_node('PageSize', '%.2fmm,%.2fmm' % tuple(pageSize)) _append_node('PageWidth', '%.2f' % (pageSize[0] * 2.8346,)) _append_node('PageHeight', '%.2f' %(pageSize[1] * 2.8346,)) - _append_node('report-header', title) + l = [] t = 0 rowcount=0; strmax = (pageSize[0]-40) * 2.8346 temp = [] count = len(fields_order) - for i in range(0,count): + for i in range(0, count): temp.append(0) ince = -1; @@ -134,24 +132,20 @@ class report_printscreen_list(report_int): l[pos] = strmax * s / t _append_node('tableSize', ','.join(map(str,l)) ) - new_doc.append(config) - header=etree.Element("header") - + header = etree.SubElement(new_doc, 'header') for f in fields_order: - field = etree.Element("field") + field = etree.SubElement(header, 'field') field.text = tools.ustr(fields[f]['string'] or '') - header.append(field) - new_doc.append(header) - lines = etree.Element("lines") + lines = etree.SubElement(new_doc, 'lines') tsum = [] count = len(fields_order) for i in range(0,count): tsum.append(0) for line in results: - node_line = etree.Element("row") + node_line = etree.SubElement(lines, 'row') count = -1 for f in fields_order: float_flag = 0 @@ -193,28 +187,19 @@ class report_printscreen_list(report_int): new_d1 = d1.strftime(format) line[f] = new_d1 - col = etree.Element("col") - col.set('para','yes') - col.set('tree','no') + col = etree.SubElement(node_line, 'col', para='yes', tree='no') if line[f] != None: col.text = tools.ustr(line[f] or '') if float_flag: col.set('tree','float') if temp[count] == 1: tsum[count] = float(tsum[count]) + float(line[f]); - - else: col.text = '/' - node_line.append(col) - lines.append(node_line) - node_line = etree.Element("row") - lines.append(node_line) + node_line = etree.SubElement(lines, 'row') for f in range(0,count+1): - col = etree.Element("col") - col.set('para','yes') - col.set('tree','no') + col = etree.SubElement(node_line, 'col', para='yes', tree='no') if tsum[f] != None: if tsum[f] >= 0.01 : prec = '%.' + str(tools.config['price_accuracy']) + 'f' @@ -229,11 +214,6 @@ class report_printscreen_list(report_int): txt ='Total' col.text = tools.ustr(txt or '') - node_line.append(col) - - lines.append(node_line) - - new_doc.append(lines) transform = etree.XSLT( etree.parse(os.path.join(tools.config['root_path'], diff --git a/bin/report/render/rml2html/rml2html.py b/bin/report/render/rml2html/rml2html.py index 5e7bb5cf4e9..ea2a5583250 100644 --- a/bin/report/render/rml2html/rml2html.py +++ b/bin/report/render/rml2html/rml2html.py @@ -104,12 +104,10 @@ class _flowable(object): process(node,new_node) if new_node.get('colWidths',False): sizes = map(lambda x: utils.unit_get(x), new_node.get('colWidths').split(',')) - tr = etree.Element('tr') + tr = etree.SubElement(new_node, 'tr') for s in sizes: - td = etree.Element('td') - td.set("width", str(s)) - tr.append(td) - new_node.append(tr) + etree.SubElement(tr, 'td', width=str(s)) + return etree.tostring(new_node) def _tag_para(self, node): @@ -458,4 +456,4 @@ if __name__=="__main__": print 'Usage: trml2pdf input.rml >output.pdf' print 'Try \'trml2pdf --help\' for more information.' -# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: \ No newline at end of file +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: From 70ab8c460759f70e738f795bb2d1954af1a8f1ec Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Sat, 28 Nov 2009 12:58:09 +0100 Subject: [PATCH 10/29] [IMP] removal of usages of the deprecated node.getchildren call, better usage of the attributes & tostring ET APIs, style fixes bzr revid: xmo@tinyerp.com-20091128115809-pk5zqrc3zp8h6pir --- bin/osv/orm.py | 4 +- bin/report/printscreen/ps_list.py | 9 +- bin/report/render/html2html/html2html.py | 2 +- bin/report/render/rml2html/rml2html.py | 2 +- bin/report/render/rml2pdf/trml2pdf.py | 7 +- bin/report/render/rml2pdf/utils.py | 14 +-- bin/report/report_sxw.py | 28 ++--- bin/tools/convert.py | 144 +++++++++++------------ bin/tools/translate.py | 18 ++- bin/wizard/__init__.py | 2 +- 10 files changed, 103 insertions(+), 127 deletions(-) diff --git a/bin/osv/orm.py b/bin/osv/orm.py index c8469c1ccc5..35edfe5b654 100644 --- a/bin/osv/orm.py +++ b/bin/osv/orm.py @@ -1218,7 +1218,7 @@ class orm_template(object): if pos == 'replace': parent = node.getparent() if parent is None: - src = copy.deepcopy(node2.getchildren()[0]) + src = copy.deepcopy(node2[0]) else: for child in node2: node.addprevious(child) @@ -3074,4 +3074,4 @@ class orm(orm_template): return False return True -# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: \ No newline at end of file +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/bin/report/printscreen/ps_list.py b/bin/report/printscreen/ps_list.py index 744c2d21709..37a9adda880 100644 --- a/bin/report/printscreen/ps_list.py +++ b/bin/report/printscreen/ps_list.py @@ -36,14 +36,9 @@ class report_printscreen_list(report_int): def _parse_node(self, root_node): result = [] - for node in root_node.getchildren(): + for node in root_node: if node.tag == 'field': - attrsa = node.attrib - attrs = {} - if not attrsa is None: - for key,val in attrsa.items(): - attrs[key] = val - result.append(attrs['name']) + result.append(node.get('name')) else: result.extend(self._parse_node(node)) return result diff --git a/bin/report/render/html2html/html2html.py b/bin/report/render/html2html/html2html.py index fa07e9b4726..9f81e26d4f2 100644 --- a/bin/report/render/html2html/html2html.py +++ b/bin/report/render/html2html/html2html.py @@ -75,7 +75,7 @@ class html2html(object): return self._node def url_modify(self,root): - for n in root.getchildren(): + for n in root: if (n.text.find('=0 or n.text.find('<a')>=0) and n.text.find('href')>=0 and n.text.find('style')<=0 : node = (n.tag=='span' and n.getparent().tag=='u') and n.getparent().getparent() or ((n.tag=='span') and n.getparent()) or n style = node.get('color') and "style='color:%s; text-decoration: none;'"%node.get('color') or '' diff --git a/bin/report/render/rml2html/rml2html.py b/bin/report/render/rml2html/rml2html.py index ea2a5583250..a3a14fc8aee 100644 --- a/bin/report/render/rml2html/rml2html.py +++ b/bin/report/render/rml2html/rml2html.py @@ -296,7 +296,7 @@ class _rml_template(object): posx = int(utils.unit_get(tmpl.get('x1'))) frames[(posy,posx,tmpl.get('id'))] = _rml_tmpl_frame(posx, utils.unit_get(tmpl.get('width'))) for tmpl in pt.findall('pageGraphics'): - for n in tmpl.getchildren(): + for n in tmpl: if n.tag == 'image': self.data = rc + utils._process_text(self, n.text) if n.tag in self._tags: diff --git a/bin/report/render/rml2pdf/trml2pdf.py b/bin/report/render/rml2pdf/trml2pdf.py index b3585254eb3..b7db9724781 100644 --- a/bin/report/render/rml2pdf/trml2pdf.py +++ b/bin/report/render/rml2pdf/trml2pdf.py @@ -88,7 +88,7 @@ class _rml_styles(object,): def _table_style_get(self, style_node): styles = [] - for node in style_node.getchildren(): + for node in style_node: start = utils.tuple_int_get(node, 'start', (0,0) ) stop = utils.tuple_int_get(node, 'stop', (-1,-1) ) if node.tag=='blockValign': @@ -166,7 +166,7 @@ class _rml_doc(object): def _textual_image(self, node): rc = '' - for n in node.getchildren(): + for n in node: rc +=( etree.tostring(n) or '') + n.tail return base64.decodestring(node.tostring()) @@ -749,7 +749,8 @@ class _rml_template(object): frame.lastFrame = True frames.append( frame ) try : - gr = pt.findall('pageGraphics') or pt.getchildren()[1].findall('pageGraphics') + gr = pt.findall('pageGraphics')\ + or pt[1].findall('pageGraphics') except : gr='' if len(gr): diff --git a/bin/report/render/rml2pdf/utils.py b/bin/report/render/rml2pdf/utils.py index abc421a0f2f..bbccd23bb28 100644 --- a/bin/report/render/rml2pdf/utils.py +++ b/bin/report/render/rml2pdf/utils.py @@ -56,7 +56,7 @@ def xml2str(s): def _child_get(node, self=None, tagname=None): for n in node: - if self and self.localcontext and n.get('rml_loop', False): + if self and self.localcontext and n.get('rml_loop'): oldctx = self.localcontext for ctx in eval(n.get('rml_loop'),{}, self.localcontext): @@ -80,12 +80,12 @@ def _child_get(node, self=None, tagname=None): yield n self.localcontext = oldctx continue - if self and self.localcontext and n.get('rml_except', False): + if self and self.localcontext and n.get('rml_except'): try: eval(n.get('rml_except'), {}, self.localcontext) except: continue - if self and self.localcontext and n.get('rml_tag', False): + if self and self.localcontext and n.get('rml_tag'): try: (tag,attr) = eval(n.get('rml_tag'),{}, self.localcontext) n2 = copy.deepcopy(n) @@ -125,10 +125,7 @@ def _process_text(self, txt): return result def text_get(node): - rc = '' - for node in node.getchildren(): - rc = rc + tools.ustr(node.text) - return rc + return ''.join([tools.ustr(n.text) for n in node]) units = [ (re.compile('^(-?[0-9\.]+)\s*in$'), reportlab.lib.units.inch), @@ -158,8 +155,7 @@ def unit_get(size): def tuple_int_get(node, attr_name, default=None): if not node.get(attr_name): return default - res = [int(x) for x in node.get(attr_name).split(',')] - return res + return map(int, node.get(attr_name).split(',')) def bool_get(value): return (str(value)=="1") or (value.lower()=='yes') diff --git a/bin/report/report_sxw.py b/bin/report/report_sxw.py index 1adca0b8176..0364511da13 100644 --- a/bin/report/report_sxw.py +++ b/bin/report/report_sxw.py @@ -303,7 +303,7 @@ class rml_parse(object): rml_head = rml_head.replace('','') head_dom = etree.XML(rml_head) - for tag in head_dom.getchildren(): + for tag in head_dom: found = rml_dom.find('.//'+tag.tag) if found is not None and len(found): if tag.get('position'): @@ -462,13 +462,14 @@ class report_sxw(report_rml, preprocess.report): for pe in elements: if pe.get(rml_parser.localcontext['name_space']["meta"]+"name"): if pe.get(rml_parser.localcontext['name_space']["meta"]+"name") == "Info 3": - pe.getchildren()[0].text=data['id'] + pe[0].text=data['id'] if pe.get(rml_parser.localcontext['name_space']["meta"]+"name") == "Info 4": - pe.getchildren()[0].text=data['model'] - meta = etree.tostring(rml_dom_meta) + pe[0].text=data['model'] + meta = etree.tostring(rml_dom_meta, encoding='utf-8', + xml_declaration=True) rml_dom = etree.XML(rml) - body = rml_dom.getchildren()[-1] + body = rml_dom[-1] elements = [] key1 = rml_parser.localcontext['name_space']["text"]+"p" key2 = rml_parser.localcontext['name_space']["text"]+"drop-down" @@ -482,7 +483,7 @@ class report_sxw(report_rml, preprocess.report): pp=de.getparent() if de.text or de.tail: pe.text = de.text or de.tail - for cnd in de.getchildren(): + for cnd in de: if cnd.text or cnd.tail: if pe.text: pe.text += cnd.text or cnd.tail @@ -508,12 +509,11 @@ class report_sxw(report_rml, preprocess.report): rml_dom = self.preprocess_rml(rml_dom,report_type) create_doc = self.generators[report_type] - odt = etree.tostring(create_doc(rml_dom, rml_parser.localcontext)) + odt = etree.tostring(create_doc(rml_dom, rml_parser.localcontext), + encoding='utf-8', xml_declaration=True) sxw_z = zipfile.ZipFile(sxw_io, mode='a') - sxw_z.writestr('content.xml', "" + \ - odt) - sxw_z.writestr('meta.xml', "" + \ - meta) + sxw_z.writestr('content.xml', odt) + sxw_z.writestr('meta.xml', meta) if report_xml.header: #Add corporate header/footer @@ -528,9 +528,9 @@ class report_sxw(report_rml, preprocess.report): odt = create_doc(rml_dom,rml_parser.localcontext) if report_xml.header: rml_parser._add_header(odt) - odt = etree.tostring(odt) - sxw_z.writestr('styles.xml',"" + \ - odt) + odt = etree.tostring(odt, encoding='utf-8', + xml_declaration=True) + sxw_z.writestr('styles.xml', odt) sxw_z.close() final_op = sxw_io.getvalue() sxw_io.close() diff --git a/bin/tools/convert.py b/bin/tools/convert.py index 749867c3862..f48cb8e4817 100644 --- a/bin/tools/convert.py +++ b/bin/tools/convert.py @@ -57,17 +57,16 @@ def _eval_xml(self,node, pool, cr, uid, idref, context=None): if context is None: context = {} if node.tag in ('field','value'): - t = node.get('type','') or 'char' - f_model = node.get("model", '').encode('ascii') - if len(node.get('search','')): + t = node.get('type','char') + f_model = node.get('model', '').encode('ascii') + if node.get('search'): f_search = node.get("search",'').encode('utf-8') - f_use = node.get("use",'').encode('ascii') + f_use = node.get("use",'id').encode('ascii') f_name = node.get("name",'').encode('utf-8') - if len(f_use)==0: - f_use = "id" + q = eval(f_search, idref) ids = pool.get(f_model).search(cr, uid, q) - if f_use<>'id': + if f_use != 'id': ids = map(lambda x: x[f_use], pool.get(f_model).read(cr, uid, ids, [f_use])) _cols = pool.get(f_model)._columns if (f_name in _cols) and _cols[f_name]._type=='many2many': @@ -79,7 +78,7 @@ def _eval_xml(self,node, pool, cr, uid, idref, context=None): f_val = f_val[0] return f_val a_eval = node.get('eval','') - if len(a_eval): + if a_eval: import time from mx import DateTime idref2 = idref.copy() @@ -107,54 +106,53 @@ def _eval_xml(self,node, pool, cr, uid, idref, context=None): if not id in idref: idref[id]=self.id_get(cr, False, id) return s % idref - txt = '\n'+_process("".join([etree.tostring(i).encode("utf8") for i in node.getchildren()]), idref) - return txt + return '\n'\ + +_process("".join([etree.tostring(n, encoding='utf-8') + for n in node]), + idref) if t in ('char', 'int', 'float'): - d = "" d = node.text if t == 'int': d = d.strip() - if d=='None': + if d == 'None': return None else: - d=int(d.strip()) - elif t=='float': - d=float(d.strip()) + return int(d.strip()) + elif t == 'float': + return float(d.strip()) return d elif t in ('list','tuple'): res=[] - for n in [i for i in node.getchildren() if (i.tag=='value')]: + for n in node.findall('./value'): res.append(_eval_xml(self,n,pool,cr,uid,idref)) if t=='tuple': return tuple(res) return res elif node.tag == "getitem": - for n in [i for i in node.getchildren()]: + for n in node: res=_eval_xml(self,n,pool,cr,uid,idref) if not res: raise LookupError - elif node.get('type','') in ("int", "list"): - return res[int(node.get('index',''))] + elif node.get('type') in ("int", "list"): + return res[int(node.get('index'))] else: return res[node.get('index','').encode("utf8")] elif node.tag == "function": args = [] a_eval = node.get('eval','') - if len(a_eval): + if a_eval: idref['ref'] = lambda x: self.id_get(cr, False, x) args = eval(a_eval, idref) - for n in [i for i in node.getchildren()]: + for n in node: return_val = _eval_xml(self,n, pool, cr, uid, idref, context) - if return_val != None: + if return_val is not None: args.append(return_val) model = pool.get(node.get('model','')) method = node.get('name','') res = getattr(model, method)(cr, uid, *args) return res elif node.tag == "test": - d = node.text - return d - + return node.text escape_re = re.compile(r'(? 0,\ + 'You must define a child node if you dont give a ref' + assert number_children == 1,\ + 'Only one child node is accepted (%d given)' % number_children + id = _eval_xml(self, rec[0], self.pool, cr, self.uid, self.idref) uid = self.get_uid(cr, self.uid, data_node, rec) wf_service = netsvc.LocalService("workflow") wf_service.trg_validate(uid, model, id, str(rec.get('action','')), cr) - return False # # Support two types of notation: @@ -496,7 +490,7 @@ form: module.record_id""" % (xml_id,) menu_parent_id = self.id_get(cr, 'ir.ui.menu', rec.get('parent','')) values = {'parent_id': menu_parent_id} if rec.get('name'): - values['name'] = rec.get('name','') + values['name'] = rec.get('name') try: res = [ self.id_get(cr, 'ir.ui.menu', rec.get('id','')) ] except: @@ -544,9 +538,9 @@ form: module.record_id""" % (xml_id,) if (not values.get('name', False)) and resw: values['name'] = resw[0] if rec.get('sequence'): - values['sequence'] = int(rec.get('sequence','')) + values['sequence'] = int(rec.get('sequence')) if rec.get('icon'): - values['icon'] = str(rec.get('icon','')) + values['icon'] = str(rec.get('icon')) if rec.get('groups'): g_names = rec.get('groups','').split(',') @@ -569,7 +563,7 @@ form: module.record_id""" % (xml_id,) self.idref[rec_id] = int(pid) if rec.get('action') and pid: - a_action = rec.get('action','').encode('utf8') + a_action = rec.get('action').encode('utf8') a_type = rec.get('type','').encode('utf8') or 'act_window' a_id = self.id_get(cr, 'ir.actions.%s' % a_type, a_action) action = "ir.actions.%s,%d" % (a_type, a_id) @@ -589,7 +583,7 @@ form: module.record_id""" % (xml_id,) rec_id = rec.get("id",'').encode('ascii') self._test_xml_id(rec_id) rec_src = rec.get("search",'').encode('utf8') - rec_src_count = rec.get("count",'') + rec_src_count = rec.get("count") severity = rec.get("severity",'').encode('ascii') or netsvc.LOG_ERROR @@ -599,12 +593,12 @@ form: module.record_id""" % (xml_id,) eval_dict = {'ref': _ref(self, cr)} context = self.get_context(data_node, rec, eval_dict) uid = self.get_uid(cr, self.uid, data_node, rec) - if len(rec_id): + if rec_id: ids = [self.id_get(cr, rec_model, rec_id)] - elif len(rec_src): + elif rec_src: q = eval(rec_src, eval_dict) ids = self.pool.get(rec_model).search(cr, uid, q, context=context) - if len(rec_src_count): + if rec_src_count: count = int(rec_src_count) if len(ids) != count: self.assert_report.record_assertion(False, severity) @@ -620,8 +614,8 @@ form: module.record_id""" % (xml_id,) raise Exception('Severe assertion failure') return - assert ids != None, 'You must give either an id or a search criteria' - + assert ids is not None,\ + 'You must give either an id or a search criteria' ref = _ref(self, cr) for id in ids: brrec = model.browse(cr, uid, id, context) @@ -634,7 +628,7 @@ form: module.record_id""" % (xml_id,) globals['floatEqual'] = self._assert_equals globals['ref'] = ref globals['_ref'] = ref - for test in [i for i in rec.getchildren() if (i.tag=="test")]: + for test in rec.findall('./test'): f_expr = test.get("expr",'').encode('utf-8') expected_value = _eval_xml(self, test, self.pool, cr, uid, self.idref, context=context) or True expression_value = eval(f_expr, globals) @@ -686,7 +680,7 @@ form: module.record_id""" % (xml_id,) # otherwise it is skipped return None res = {} - for field in [i for i in rec.getchildren() if (i.tag == "field")]: + for field in rec.findall('./field'): #TODO: most of this code is duplicated above (in _eval_xml)... f_name = field.get("name",'').encode('utf-8') f_ref = field.get("ref",'').encode('ascii') @@ -697,7 +691,7 @@ form: module.record_id""" % (xml_id,) f_use = field.get("use",'').encode('ascii') or 'id' f_val = False - if len(f_search): + if f_search: q = eval(f_search, self.idref) field = [] assert f_model, 'Define an attribute model="..." in your .XML file !' @@ -713,7 +707,7 @@ form: module.record_id""" % (xml_id,) # otherwise (we are probably in a many2one field), # take the first element of the search f_val = s[0][f_use] - elif len(f_ref): + elif f_ref: if f_ref=="null": f_val = False else: @@ -741,9 +735,7 @@ form: module.record_id""" % (xml_id,) result = self.pool.get('ir.model.data')._get_id(cr, self.uid, mod, id_str) return int(self.pool.get('ir.model.data').read(cr, self.uid, [result], ['res_id'])[0]['res_id']) - def parse(self, xmlstr): - de = etree.XML(xmlstr) - + def parse(self, de): if not de.tag in ['terp', 'openerp']: self.logger.notifyChannel("init", netsvc.LOG_ERROR, "Mismatch xml format" ) raise Exception( "Mismatch xml format: only terp or openerp as root tag" ) @@ -751,8 +743,8 @@ form: module.record_id""" % (xml_id,) if de.tag == 'terp': self.logger.notifyChannel("init", netsvc.LOG_WARNING, "The tag is deprecated, use ") - for n in [i for i in de.getchildren() if (i.tag=="data")]: - for rec in n.getchildren(): + for n in de.findall('./data'): + for rec in n: if rec.tag in self._tags: try: self._tags[rec.tag](self.cr, rec, n) @@ -844,12 +836,9 @@ def convert_csv_import(cr, module, fname, csvcontent, idref=None, mode='init', # xml import/export # def convert_xml_import(cr, module, xmlfile, idref=None, mode='init', noupdate=False, report=None): - xmlstr = xmlfile.read() - xmlfile.seek(0) - relaxng_doc = etree.parse(file(os.path.join( config['root_path'], 'import_xml.rng' ))) - relaxng = etree.RelaxNG(relaxng_doc) - doc = etree.parse(xmlfile) + relaxng = etree.RelaxNG( + etree.parse(os.path.join(config['root_path'],'import_xml.rng' ))) try: relaxng.assert_(doc) except Exception, e: @@ -861,8 +850,7 @@ def convert_xml_import(cr, module, xmlfile, idref=None, mode='init', noupdate=Fa if idref is None: idref={} obj = xml_import(cr, module, idref, mode, report=report, noupdate=noupdate) - obj.parse(xmlstr) - del obj + obj.parse(doc.getroot()) return True def convert_xml_export(res): diff --git a/bin/tools/translate.py b/bin/tools/translate.py index ca833dfee6e..1080b10eca3 100644 --- a/bin/tools/translate.py +++ b/bin/tools/translate.py @@ -343,9 +343,9 @@ def trans_export(lang, modules, buffer, format, dbname=None): def trans_parse_xsl(de): res = [] - for n in [i for i in de.getchildren()]: + for n in de: if n.get("t"): - for m in [j for j in n.getchildren() if j.text]: + for m in [j for j in n if j.text]: l = m.text.strip().replace('\n',' ') if len(l): res.append(l.encode("utf8")) @@ -354,8 +354,8 @@ def trans_parse_xsl(de): def trans_parse_rml(de): res = [] - for n in [i for i in de.getchildren()]: - for m in [j for j in n.getchildren() if j.text]: + for n in de: + for m in [j for j in n if j.text]: string_list = [s.replace('\n', ' ').strip() for s in re.split('\[\[.+?\]\]', m.text)] for s in string_list: if s: @@ -366,14 +366,10 @@ def trans_parse_rml(de): def trans_parse_view(de): res = [] if de.get("string"): - s = de.get('string') - if s: - res.append(s.encode("utf8")) + res.append(de.get('string').encode("utf8")) if de.get("sum"): - s = de.get('sum') - if s: - res.append(s.encode("utf8")) - for n in [i for i in de.getchildren()]: + res.append(de.get('sum').encode("utf8")) + for n in de: res.extend(trans_parse_view(n)) return res diff --git a/bin/wizard/__init__.py b/bin/wizard/__init__.py index 378f9ac4563..428a85537db 100644 --- a/bin/wizard/__init__.py +++ b/bin/wizard/__init__.py @@ -54,7 +54,7 @@ class interface(netsvc.Service): trans = translate(cr, self.wiz_name+','+state, 'wizard_view', lang, node.get('string').encode('utf8')) if trans: node.set('string', trans) - for n in node.getchildren(): + for n in node: self.translate_view(cr, n, state, lang) def execute_cr(self, cr, uid, data, state='init', context=None): From aa7bb53d06bbb09af46ee14cd51ba75d3b5c2d84 Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Wed, 2 Dec 2009 11:01:14 +0100 Subject: [PATCH 11/29] Add pil* scripts to bzrignore bzr revid: xmo@tinyerp.com-20091202100114-ernxgc0qv6su5v8h --- .bzrignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.bzrignore b/.bzrignore index b44befc61b4..5581ee20f94 100644 --- a/.bzrignore +++ b/.bzrignore @@ -17,3 +17,4 @@ bin/python2.6 *.pyo build/ bin/yolk +bin/pil*.py From ff890fe234190b808e1aff5d6eecb4c58707a5e1 Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Wed, 2 Dec 2009 12:15:16 +0100 Subject: [PATCH 12/29] [fix] actually fix hang in OSX when trying to shutdown server via SIGINT lost during moves/merges from 5.0 to trunk bzr revid: xmo@tinyerp.com-20091202111516-enut1n34gtyvwic7 --- bin/service/http_server.py | 74 +++++++++++++++++--------------------- 1 file changed, 33 insertions(+), 41 deletions(-) diff --git a/bin/service/http_server.py b/bin/service/http_server.py index 6f74adbdf87..72dd787533c 100644 --- a/bin/service/http_server.py +++ b/bin/service/http_server.py @@ -108,77 +108,69 @@ class SecureMultiHandler2(SecureMultiHTTPHandler): def log_error(self, format, *args): netsvc.Logger().notifyChannel('http',netsvc.LOG_ERROR,format % args) -class HttpDaemon(threading.Thread, netsvc.Server): - def __init__(self, interface, port): +class BaseHttpDaemon(threading.Thread, netsvc.Server): + def __init__(self, interface, port, handler): threading.Thread.__init__(self) netsvc.Server.__init__(self) self.__port = port self.__interface = interface try: - self.server = ThreadedHTTPServer((interface, port), MultiHandler2) + self.server = ThreadedHTTPServer((interface, port), handler) self.server.vdirs = [] self.server.logRequests = True - netsvc.Logger().notifyChannel("web-services", netsvc.LOG_INFO, - "starting HTTP service at %s port %d" % (interface or '0.0.0.0', port,)) + netsvc.Logger().notifyChannel( + "web-services", netsvc.LOG_INFO, + "starting HTTPS service at %s port %d" % + (interface or '0.0.0.0', port,)) except Exception, e: - netsvc.Logger().notifyChannel('httpd', netsvc.LOG_CRITICAL, "Error occur when starting the server daemon: %s" % (e,)) + netsvc.Logger().notifyChannel( + 'httpd', netsvc.LOG_CRITICAL, + "Error occur when starting the server daemon: %s" % (e,)) raise - def attach(self, path, gw): pass def stop(self): self.running = False if os.name != 'nt': - self.server.socket.shutdown( hasattr(socket, 'SHUT_RDWR') and socket.SHUT_RDWR or 2 ) + try: + self.server.socket.shutdown( + hasattr(socket, 'SHUT_RDWR') and socket.SHUT_RDWR or 2) + except socket.error, e: + if e.errno != 57: raise + # OSX, socket shutdowns both sides if any side closes it + # causing an error 57 'Socket is not connected' on shutdown + # of the other side (or something), see + # http://bugs.python.org/issue4397 + netsvc.Logger().notifyChannel( + 'server', netsvc.LOG_DEBUG, + '"%s" when shutting down server socket, ' + 'this is normal under OS X'%e) self.server.socket.close() def run(self): - #self.server.register_introspection_functions() - self.running = True while self.running: self.server.handle_request() return True +class HttpDaemon(BaseHttpDaemon): + def __init__(self, interface, port): + super(HttpDaemon, self).__init__(interface, port, + handler=MultiHandler2) + class HttpSDaemon(threading.Thread, netsvc.Server): def __init__(self, interface, port): - threading.Thread.__init__(self) - netsvc.Server.__init__(self) - self.__port = port - self.__interface = interface - try: - self.server = ThreadedHTTPServer((interface, port), SecureMultiHandler2) - self.server.vdirs = [] - self.server.logRequests = True - netsvc.Logger().notifyChannel("web-services", netsvc.LOG_INFO, - "starting HTTPS service at %s port %d" % (interface or '0.0.0.0', port,)) + super(HttpDaemon, self).__init__(interface, port, + handler=SecureMultiHandler2) except SSLError, e: - netsvc.Logger().notifyChannel('httpd-ssl', netsvc.LOG_CRITICAL, "Can not load the certificate and/or the private key files") + netsvc.Logger().notifyChannel( + 'httpd-ssl', netsvc.LOG_CRITICAL, + "Can not load the certificate and/or the private key files") raise - except Exception, e: - netsvc.Logger().notifyChannel('httpd-ssl', netsvc.LOG_CRITICAL, "Error occur when starting the server daemon: %s" % (e,)) - raise - - def attach(self, path, gw): - pass - - def stop(self): - self.running = False - if os.name != 'nt': - self.server.socket.shutdown( hasattr(socket, 'SHUT_RDWR') and socket.SHUT_RDWR or 2 ) - self.server.socket.close() - - def run(self): - #self.server.register_introspection_functions() - - self.running = True - while self.running: - self.server.handle_request() - return True httpd = None httpsd = None From 99e05779ea1770d6bbe6ab225c8c9294a4f6a475 Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Sat, 12 Dec 2009 16:24:04 +0100 Subject: [PATCH 13/29] [imp] remove pointless check on xml package, sort required_modules bzr revid: xmo@tinyerp.com-20091212152404-j56ef6xzk95f0l00 --- setup.py | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/setup.py b/setup.py index f51cc2c69af..b7ce1dbe8d9 100755 --- a/setup.py +++ b/setup.py @@ -1,7 +1,7 @@ #!/usr/bin/env python # -*- coding: utf-8 -*- ############################################################################## -# +# # OpenERP, Open Source Management Solution # Copyright (C) 2004-2009 Tiny SPRL (). # @@ -16,7 +16,7 @@ # GNU Affero General Public License for more details. # # You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see . +# along with this program. If not, see . # ############################################################################## @@ -52,13 +52,11 @@ if sys.argv[1] == 'bdist_rpm': py_short_version = '%s.%s' % sys.version_info[:2] required_modules = [ + ('lxml', 'lxml module: pythonic libxml2 and libxslt bindings'), ('psycopg2', 'PostgreSQL module'), - ('xml', 'XML Tools for python'), - ('reportlab', 'reportlab module'), ('pychart', 'pychart module'), ('pydot', 'pydot module'), - ('lxml', 'lxml module: pythonic libxml2 and libxslt bindings'), - ('mako','Mako templating library'), + ('reportlab', 'reportlab module'), ] def check_modules(): @@ -184,7 +182,7 @@ options = { "packages": ["lxml", "lxml.builder", "lxml._elementpath", "lxml.etree", "lxml.objectify", "decimal", "xml", "xml.dom", "xml.xpath", "encodings","mx.DateTime","wizard","pychart","PIL", "pyparsing", - "pydot","asyncore","asynchat", "reportlab", "vobject","mako", + "pydot","asyncore","asynchat", "reportlab", "vobject", "HTMLParser", "select"], "excludes" : ["Tkconstants","Tkinter","tcl"], } @@ -218,7 +216,6 @@ setup(name = name, 'openerp-server.report.render.rml2html', 'openerp-server.report.render.rml2txt', 'openerp-server.report.render.html2html', - 'openerp-server.report.render.makohtml2html', 'openerp-server.wizard', 'openerp-server.report.render.odt2odt', 'openerp-server.workflow'] + \ From c7045fce5210459003d16c7b5b551b24e8a1f3e7 Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Sat, 12 Dec 2009 16:25:13 +0100 Subject: [PATCH 14/29] [imp] sort list of packages to install bzr revid: xmo@tinyerp.com-20091212152513-y07h8b86led1assr --- setup.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/setup.py b/setup.py index b7ce1dbe8d9..6d9fa1a5033 100755 --- a/setup.py +++ b/setup.py @@ -206,18 +206,18 @@ setup(name = name, 'openerp-server.addons', 'openerp-server.ir', 'openerp-server.osv', - 'openerp-server.service', - 'openerp-server.tools', 'openerp-server.report', 'openerp-server.report.printscreen', 'openerp-server.report.pyPdf', 'openerp-server.report.render', - 'openerp-server.report.render.rml2pdf', - 'openerp-server.report.render.rml2html', - 'openerp-server.report.render.rml2txt', 'openerp-server.report.render.html2html', - 'openerp-server.wizard', 'openerp-server.report.render.odt2odt', + 'openerp-server.report.render.rml2html', + 'openerp-server.report.render.rml2pdf', + 'openerp-server.report.render.rml2txt', + 'openerp-server.service', + 'openerp-server.tools', + 'openerp-server.wizard', 'openerp-server.workflow'] + \ list(map( lambda (a, p): 'openerp-server.addons.'+ a ,find_addons())), package_dir = find_package_dirs(), From bab0cbd03f211caeddac178a4835696f54ba64ca Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Sat, 12 Dec 2009 16:26:31 +0100 Subject: [PATCH 15/29] [add] missing packages pychart and report.render.makohtml2html leading to broken server when installing via setup.py bzr revid: xmo@tinyerp.com-20091212152631-0b45yz4iit6n8raj --- setup.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/setup.py b/setup.py index 6d9fa1a5033..3024e3f5d37 100755 --- a/setup.py +++ b/setup.py @@ -206,11 +206,13 @@ setup(name = name, 'openerp-server.addons', 'openerp-server.ir', 'openerp-server.osv', + 'openerp-server.pychart', 'openerp-server.report', 'openerp-server.report.printscreen', 'openerp-server.report.pyPdf', 'openerp-server.report.render', 'openerp-server.report.render.html2html', + 'openerp-server.report.render.makohtml2html', 'openerp-server.report.render.odt2odt', 'openerp-server.report.render.rml2html', 'openerp-server.report.render.rml2pdf', From 0a03e0495d6d430d7a312d0b78a9f49ee230cedc Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Sat, 12 Dec 2009 16:35:09 +0100 Subject: [PATCH 16/29] [add] missing package mako leading to broken server when installing via setup.py (or requirement to install mako separately) bzr revid: xmo@tinyerp.com-20091212153509-068lwixdebc258pq --- setup.py | 1 + 1 file changed, 1 insertion(+) diff --git a/setup.py b/setup.py index 3024e3f5d37..06229aacac5 100755 --- a/setup.py +++ b/setup.py @@ -205,6 +205,7 @@ setup(name = name, packages = ['openerp-server', 'openerp-server.addons', 'openerp-server.ir', + 'openerp-server.mako', 'openerp-server.osv', 'openerp-server.pychart', 'openerp-server.report', From 5f2c53c0af17a70ec59d419fcc9d12002b193667 Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Sat, 12 Dec 2009 16:53:06 +0100 Subject: [PATCH 17/29] [imp] add mx and pytz to the list of required modules bzr revid: xmo@tinyerp.com-20091212155306-nb963a9wkh1w23io --- setup.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/setup.py b/setup.py index 06229aacac5..f5d5adce5c5 100755 --- a/setup.py +++ b/setup.py @@ -53,9 +53,11 @@ py_short_version = '%s.%s' % sys.version_info[:2] required_modules = [ ('lxml', 'lxml module: pythonic libxml2 and libxslt bindings'), + ('mx', "egenix's mx library for its extended DateTime module"), ('psycopg2', 'PostgreSQL module'), ('pychart', 'pychart module'), ('pydot', 'pydot module'), + ('pytz', 'Timezone handling library for Python'), ('reportlab', 'reportlab module'), ] From 7daf1bc09a7ce4717f6526625992ff6d99a05b68 Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Sat, 12 Dec 2009 17:00:04 +0100 Subject: [PATCH 18/29] [imp] use imp.find_module instead of exec('import %s') bzr revid: xmo@tinyerp.com-20091212160004-0u8m6v9w3o9p97hp --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index f5d5adce5c5..87dd1781dec 100755 --- a/setup.py +++ b/setup.py @@ -65,7 +65,7 @@ def check_modules(): ok = True for modname, desc in required_modules: try: - exec('import %s' % modname) + imp.find_module(modname) except ImportError: ok = False print 'Error: python module %s (%s) is required' % (modname, desc) From 7b50872ce45ba0236709b2fbba69e75be54552b7 Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Sat, 12 Dec 2009 17:02:37 +0100 Subject: [PATCH 19/29] [imp] remove unclear boolean flags, replace with error list bzr revid: xmo@tinyerp.com-20091212160237-n6r949cimnwlrzvj --- setup.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/setup.py b/setup.py index 87dd1781dec..28f2e0a6af8 100755 --- a/setup.py +++ b/setup.py @@ -62,15 +62,16 @@ required_modules = [ ] def check_modules(): - ok = True + errors = [] for modname, desc in required_modules: try: imp.find_module(modname) except ImportError: - ok = False - print 'Error: python module %s (%s) is required' % (modname, desc) + errors.append( + 'Error: python module %s (%s) is required' % (modname, desc)) - if not ok: + if errors: + print '\n'.join(errors) sys.exit(1) def _find_addons(): From 4ee25261c07119024648af0b29d93844388a351b Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Sat, 12 Dec 2009 17:06:21 +0100 Subject: [PATCH 20/29] [imp] remove aliasing of os.path.join, just import it unqualified bzr revid: xmo@tinyerp.com-20091212160621-x92wjfzmvl27n5hg --- setup.py | 67 ++++++++++++++++++++++++++++---------------------------- 1 file changed, 33 insertions(+), 34 deletions(-) diff --git a/setup.py b/setup.py index 28f2e0a6af8..37a2d4d3fbc 100755 --- a/setup.py +++ b/setup.py @@ -29,6 +29,7 @@ import imp import sys import os +from os.path import join import glob from distutils.core import setup, Command @@ -39,11 +40,9 @@ if os.name == 'nt': import py2exe has_py2exe = True -sys.path.append(os.path.join(os.path.abspath(os.path.dirname(__file__)), "bin")) +sys.path.append(join(os.path.abspath(os.path.dirname(__file__)), "bin")) -opj = os.path.join - -execfile(opj('bin', 'release.py')) +execfile(join('bin', 'release.py')) if sys.argv[1] == 'bdist_rpm': version = version.split('-')[0] @@ -75,22 +74,22 @@ def check_modules(): sys.exit(1) def _find_addons(): - for (dp, dn, names) in os.walk(opj('bin', 'addons')): + for (dp, dn, names) in os.walk(join('bin', 'addons')): if '__terp__.py' in names: modname = os.path.basename(dp) yield (modname, dp) #look for extra modules try: empath = os.getenv('EXTRA_MODULES_PATH','../addons/') - f = open(opj(empath,'server_modules.list'),'r') - # print 'Getting modules from:' , opj(empath,'server_modules.list') + f = open(join(empath,'server_modules.list'),'r') + # print 'Getting modules from:' , join(empath,'server_modules.list') mods = f.readlines() for mname in mods: mname = mname.strip() if not mname: continue - if os.path.exists(opj(empath,mname,'__terp__.py')): - yield ( mname, opj(empath,mname) ) + if os.path.exists(join(empath,mname,'__terp__.py')): + yield ( mname, join(empath,mname) ) else: print "Module %s specified, but no valid path." % mname except: @@ -110,42 +109,42 @@ def data_files(): if os.name == 'nt': os.chdir('bin') for (dp,dn,names) in os.walk('addons'): - files.append((dp, map(lambda x: opj('bin', dp, x), names))) + files.append((dp, map(lambda x: join('bin', dp, x), names))) os.chdir('..') for (dp,dn,names) in os.walk('doc'): - files.append((dp, map(lambda x: opj(dp, x), names))) - files.append(('.', [opj('bin', 'import_xml.rng'), - opj('bin', 'server.pkey'), - opj('bin', 'server.cert')])) + files.append((dp, map(lambda x: join(dp, x), names))) + files.append(('.', [join('bin', 'import_xml.rng'), + join('bin', 'server.pkey'), + join('bin', 'server.cert')])) else: - man_directory = opj('share', 'man') - files.append((opj(man_directory, 'man1'), ['man/openerp-server.1'])) - files.append((opj(man_directory, 'man5'), ['man/openerp_serverrc.5'])) + man_directory = join('share', 'man') + files.append((join(man_directory, 'man1'), ['man/openerp-server.1'])) + files.append((join(man_directory, 'man5'), ['man/openerp_serverrc.5'])) - doc_directory = opj('share', 'doc', 'openerp-server-%s' % version) + doc_directory = join('share', 'doc', 'openerp-server-%s' % version) files.append((doc_directory, [f for f in glob.glob('doc/*') if os.path.isfile(f)])) - files.append((opj(doc_directory, 'migrate', '3.3.0-3.4.0'), [f for f in glob.glob('doc/migrate/3.3.0-3.4.0/*') if os.path.isfile(f)])) - files.append((opj(doc_directory, 'migrate', '3.4.0-4.0.0'), [f for f in glob.glob('doc/migrate/3.4.0-4.0.0/*') if os.path.isfile(f)])) + files.append((join(doc_directory, 'migrate', '3.3.0-3.4.0'), [f for f in glob.glob('doc/migrate/3.3.0-3.4.0/*') if os.path.isfile(f)])) + files.append((join(doc_directory, 'migrate', '3.4.0-4.0.0'), [f for f in glob.glob('doc/migrate/3.4.0-4.0.0/*') if os.path.isfile(f)])) - openerp_site_packages = opj('lib', 'python%s' % py_short_version, 'site-packages', 'openerp-server') + openerp_site_packages = join('lib', 'python%s' % py_short_version, 'site-packages', 'openerp-server') - files.append((openerp_site_packages, [opj('bin', 'import_xml.rng'), - opj('bin', 'server.pkey'), - opj('bin', 'server.cert')])) + files.append((openerp_site_packages, [join('bin', 'import_xml.rng'), + join('bin', 'server.pkey'), + join('bin', 'server.cert')])) if sys.version_info[0:2] == (2,5): - files.append((openerp_site_packages, [ opj('python25-compat','BaseHTTPServer.py'), - opj('python25-compat','SimpleXMLRPCServer.py'), - opj('python25-compat','SocketServer.py')])) + files.append((openerp_site_packages, [ join('python25-compat','BaseHTTPServer.py'), + join('python25-compat','SimpleXMLRPCServer.py'), + join('python25-compat','SocketServer.py')])) for (addonname, add_path) in find_addons(): - addon_path = opj('lib', 'python%s' % py_short_version, 'site-packages', 'openerp-server','addons', addonname) + addon_path = join('lib', 'python%s' % py_short_version, 'site-packages', 'openerp-server','addons', addonname) pathfiles = [] for root, dirs, innerfiles in os.walk(add_path): innerfiles = filter(lambda fil: os.path.splitext(fil)[1] not in ('.pyc', '.pyd', '.pyo'), innerfiles) if innerfiles: - res = os.path.normpath(opj(addon_path, root.replace(opj(add_path), '.'))) - pathfiles.extend(((res, map(lambda fil: opj(root, fil), innerfiles)),)) + res = os.path.normpath(join(addon_path, root.replace(join(add_path), '.'))) + pathfiles.extend(((res, map(lambda fil: join(root, fil), innerfiles)),)) files.extend(pathfiles) # for tup in files: @@ -170,7 +169,7 @@ def find_package_dirs(): class openerp_server_install(install): def run(self): # create startup script - start_script = "#!/bin/sh\ncd %s\nexec %s ./openerp-server.py $@\n" % (opj(self.install_libbase, "openerp-server"), sys.executable) + start_script = "#!/bin/sh\ncd %s\nexec %s ./openerp-server.py $@\n" % (join(self.install_libbase, "openerp-server"), sys.executable) # write script f = open('openerp-server', 'w') f.write(start_script) @@ -246,15 +245,15 @@ if has_py2exe: # Make sure the layout of pytz hasn't changed assert (pytz.__file__.endswith('__init__.pyc') or pytz.__file__.endswith('__init__.py')), pytz.__file__ - zoneinfo_dir = os.path.join(os.path.dirname(pytz.__file__), 'zoneinfo') + zoneinfo_dir = join(os.path.dirname(pytz.__file__), 'zoneinfo') # '..\\Lib\\pytz\\__init__.py' -> '..\\Lib' disk_basedir = os.path.dirname(os.path.dirname(pytz.__file__)) - zipfile_path = os.path.join(options['py2exe']['dist_dir'], 'library.zip') + zipfile_path = join(options['py2exe']['dist_dir'], 'library.zip') z = zipfile.ZipFile(zipfile_path, 'a') for absdir, directories, filenames in os.walk(zoneinfo_dir): assert absdir.startswith(disk_basedir), (absdir, disk_basedir) zip_dir = absdir[len(disk_basedir):] for f in filenames: - z.write(os.path.join(absdir, f), os.path.join(zip_dir, f)) + z.write(join(absdir, f), join(zip_dir, f)) z.close() From 5221a2514ef491bc3b3774649af26796f8c5ba46 Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Sat, 12 Dec 2009 17:09:59 +0100 Subject: [PATCH 21/29] [imp] import os.path.isfile unqualified, use filter instead of listcomp when we just apply a function bzr revid: xmo@tinyerp.com-20091212160959-w9hgcf4btkx7yde3 --- setup.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/setup.py b/setup.py index 37a2d4d3fbc..27354ff0161 100755 --- a/setup.py +++ b/setup.py @@ -29,7 +29,7 @@ import imp import sys import os -from os.path import join +from os.path import join, isfile import glob from distutils.core import setup, Command @@ -122,9 +122,11 @@ def data_files(): files.append((join(man_directory, 'man5'), ['man/openerp_serverrc.5'])) doc_directory = join('share', 'doc', 'openerp-server-%s' % version) - files.append((doc_directory, [f for f in glob.glob('doc/*') if os.path.isfile(f)])) - files.append((join(doc_directory, 'migrate', '3.3.0-3.4.0'), [f for f in glob.glob('doc/migrate/3.3.0-3.4.0/*') if os.path.isfile(f)])) - files.append((join(doc_directory, 'migrate', '3.4.0-4.0.0'), [f for f in glob.glob('doc/migrate/3.4.0-4.0.0/*') if os.path.isfile(f)])) + files.append((doc_directory, filter(isfile, glob.glob('doc/*')))) + files.append((join(doc_directory, 'migrate', '3.3.0-3.4.0'), + filter(isfile, glob.glob('doc/migrate/3.3.0-3.4.0/*')))) + files.append((join(doc_directory, 'migrate', '3.4.0-4.0.0'), + filter(isfile, glob.glob('doc/migrate/3.4.0-4.0.0/*')))) openerp_site_packages = join('lib', 'python%s' % py_short_version, 'site-packages', 'openerp-server') From a3c3b169740e4834711c752f2e7c78d41744f6d0 Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Sat, 12 Dec 2009 17:13:14 +0100 Subject: [PATCH 22/29] [fix] don't chdir when there is no need to bzr revid: xmo@tinyerp.com-20091212161314-ugcveociv6v85u8z --- setup.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/setup.py b/setup.py index 27354ff0161..abbaa11a2e6 100755 --- a/setup.py +++ b/setup.py @@ -107,10 +107,8 @@ def data_files(): '''Build list of data files to be installed''' files = [] if os.name == 'nt': - os.chdir('bin') - for (dp,dn,names) in os.walk('addons'): - files.append((dp, map(lambda x: join('bin', dp, x), names))) - os.chdir('..') + for (dp,dn,names) in os.walk(join('bin','addons')): + files.append((dp, map(lambda x: join(dp, x), names))) for (dp,dn,names) in os.walk('doc'): files.append((dp, map(lambda x: join(dp, x), names))) files.append(('.', [join('bin', 'import_xml.rng'), From bf00e82591bdd9f16b74cb37cc765d1384aac6df Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Sat, 12 Dec 2009 17:18:00 +0100 Subject: [PATCH 23/29] [rem] useless 'caching' indirection which doesn't cache anything bzr revid: xmo@tinyerp.com-20091212161800-r09hukkkibib4byf --- setup.py | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/setup.py b/setup.py index abbaa11a2e6..4822de9f492 100755 --- a/setup.py +++ b/setup.py @@ -73,7 +73,7 @@ def check_modules(): print '\n'.join(errors) sys.exit(1) -def _find_addons(): +def find_addons(): for (dp, dn, names) in os.walk(join('bin', 'addons')): if '__terp__.py' in names: modname = os.path.basename(dp) @@ -95,14 +95,6 @@ def _find_addons(): except: pass -__found_addons = None - -# Cache the results of _find_addons() and return them -def find_addons(found_addons = None): - if not found_addons: - found_addons = _find_addons() - return found_addons - def data_files(): '''Build list of data files to be installed''' files = [] From 16e8780b5c801c759af0540ddb1e800b32a25e95 Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Sat, 12 Dec 2009 17:21:14 +0100 Subject: [PATCH 24/29] [imp] directly iterate on open file instead of using readlines() bzr revid: xmo@tinyerp.com-20091212162114-5e508sxp40t8bimx --- setup.py | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/setup.py b/setup.py index 4822de9f492..289f4b92830 100755 --- a/setup.py +++ b/setup.py @@ -81,10 +81,7 @@ def find_addons(): #look for extra modules try: empath = os.getenv('EXTRA_MODULES_PATH','../addons/') - f = open(join(empath,'server_modules.list'),'r') - # print 'Getting modules from:' , join(empath,'server_modules.list') - mods = f.readlines() - for mname in mods: + for mname in open(join(empath,'server_modules.list')): mname = mname.strip() if not mname: continue From f95956aaa3df89fed985db2a4b8d76f03759ff3e Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Sat, 12 Dec 2009 17:29:22 +0100 Subject: [PATCH 25/29] [imp] remove pointless points, parens bzr revid: xmo@tinyerp.com-20091212162922-mcvchh3kuus05k5c --- setup.py | 31 ++++++++++++++----------------- 1 file changed, 14 insertions(+), 17 deletions(-) diff --git a/setup.py b/setup.py index 289f4b92830..e653e97a9ba 100755 --- a/setup.py +++ b/setup.py @@ -29,7 +29,7 @@ import imp import sys import os -from os.path import join, isfile +from os.path import join, isfile, basename import glob from distutils.core import setup, Command @@ -74,10 +74,9 @@ def check_modules(): sys.exit(1) def find_addons(): - for (dp, dn, names) in os.walk(join('bin', 'addons')): + for dp, dn, names in os.walk(join('bin', 'addons')): if '__terp__.py' in names: - modname = os.path.basename(dp) - yield (modname, dp) + yield basename(dp), dp #look for extra modules try: empath = os.getenv('EXTRA_MODULES_PATH','../addons/') @@ -86,7 +85,7 @@ def find_addons(): if not mname: continue if os.path.exists(join(empath,mname,'__terp__.py')): - yield ( mname, join(empath,mname) ) + yield mname, join(empath,mname) else: print "Module %s specified, but no valid path." % mname except: @@ -96,9 +95,9 @@ def data_files(): '''Build list of data files to be installed''' files = [] if os.name == 'nt': - for (dp,dn,names) in os.walk(join('bin','addons')): + for dp,dn,names in os.walk(join('bin','addons')): files.append((dp, map(lambda x: join(dp, x), names))) - for (dp,dn,names) in os.walk('doc'): + for dp,dn,names in os.walk('doc'): files.append((dp, map(lambda x: join(dp, x), names))) files.append(('.', [join('bin', 'import_xml.rng'), join('bin', 'server.pkey'), @@ -126,31 +125,29 @@ def data_files(): join('python25-compat','SimpleXMLRPCServer.py'), join('python25-compat','SocketServer.py')])) - for (addonname, add_path) in find_addons(): + for addonname, add_path in find_addons(): addon_path = join('lib', 'python%s' % py_short_version, 'site-packages', 'openerp-server','addons', addonname) - pathfiles = [] for root, dirs, innerfiles in os.walk(add_path): innerfiles = filter(lambda fil: os.path.splitext(fil)[1] not in ('.pyc', '.pyd', '.pyo'), innerfiles) if innerfiles: res = os.path.normpath(join(addon_path, root.replace(join(add_path), '.'))) - pathfiles.extend(((res, map(lambda fil: join(root, fil), innerfiles)),)) - files.extend(pathfiles) + files.extend(((res, map(lambda fil: join(root, fil), + innerfiles)),)) - # for tup in files: - # print "Files:", tup[0], tup[1] return files -if not os.getenv('NO_CHECK_MODULES',False) : +if not os.getenv('NO_CHECK_MODULES') : check_modules() f = file('openerp-server','w') -start_script = """#!/bin/sh\necho "OpenERP Setup - The content of this file is generated at the install stage\n" """ -f.write(start_script) +f.write("""#!/bin/sh +echo "OpenERP Setup - The content of this file is generated at the install stage\n" +""") f.close() def find_package_dirs(): res = {} - for (mod, path) in find_addons(): + for mod, path in find_addons(): res ['openerp-server.addons.'+ mod ] = path res ['openerp-server'] = 'bin' return res From 466b6e5d7d20a0ca12a979775ab7af4661cf8fb2 Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Sat, 12 Dec 2009 17:33:05 +0100 Subject: [PATCH 26/29] [imp] display more interesting message in temporary script, exit with status 1 bzr revid: xmo@tinyerp.com-20091212163305-1f34mz6m0h21u41p --- setup.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/setup.py b/setup.py index e653e97a9ba..764306b907e 100755 --- a/setup.py +++ b/setup.py @@ -141,7 +141,9 @@ if not os.getenv('NO_CHECK_MODULES') : f = file('openerp-server','w') f.write("""#!/bin/sh -echo "OpenERP Setup - The content of this file is generated at the install stage\n" +echo "Error: the content of this file should have been replaced during " +echo "installation\n" +exit 1 """) f.close() From 43e9f81873c0cde7b578d2e3f214ad57ee590e2b Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Sat, 12 Dec 2009 17:46:00 +0100 Subject: [PATCH 27/29] [fix] style fixes bzr revid: xmo@tinyerp.com-20091212164600-1o0i5ka83c67m9mj --- setup.py | 45 ++++++++++++++++++++++++--------------------- 1 file changed, 24 insertions(+), 21 deletions(-) diff --git a/setup.py b/setup.py index 764306b907e..9571c90a1c8 100755 --- a/setup.py +++ b/setup.py @@ -74,18 +74,18 @@ def check_modules(): sys.exit(1) def find_addons(): - for dp, dn, names in os.walk(join('bin', 'addons')): + for root, _, names in os.walk(join('bin', 'addons')): if '__terp__.py' in names: - yield basename(dp), dp + yield basename(root), root #look for extra modules try: - empath = os.getenv('EXTRA_MODULES_PATH','../addons/') - for mname in open(join(empath,'server_modules.list')): + empath = os.getenv('EXTRA_MODULES_PATH', '../addons/') + for mname in open(join(empath, 'server_modules.list')): mname = mname.strip() if not mname: continue - if os.path.exists(join(empath,mname,'__terp__.py')): - yield mname, join(empath,mname) + if os.path.exists(join(empath, mname, '__terp__.py')): + yield mname, join(empath, mname) else: print "Module %s specified, but no valid path." % mname except: @@ -95,10 +95,10 @@ def data_files(): '''Build list of data files to be installed''' files = [] if os.name == 'nt': - for dp,dn,names in os.walk(join('bin','addons')): - files.append((dp, map(lambda x: join(dp, x), names))) - for dp,dn,names in os.walk('doc'): - files.append((dp, map(lambda x: join(dp, x), names))) + for root, _, names in os.walk(join('bin','addons')): + files.append((root, [join(root, name) for name in names])) + for root, _, names in os.walk('doc'): + files.append((root, [join(root, name) for name in names])) files.append(('.', [join('bin', 'import_xml.rng'), join('bin', 'server.pkey'), join('bin', 'server.cert')])) @@ -148,21 +148,21 @@ exit 1 f.close() def find_package_dirs(): - res = {} + package_dirs = {'openerp-server': 'bin'} for mod, path in find_addons(): - res ['openerp-server.addons.'+ mod ] = path - res ['openerp-server'] = 'bin' - return res + package_dirs['openerp-server.addons.' + mod] = path + return package_dirs class openerp_server_install(install): def run(self): # create startup script - start_script = "#!/bin/sh\ncd %s\nexec %s ./openerp-server.py $@\n" % (join(self.install_libbase, "openerp-server"), sys.executable) + start_script = "#!/bin/sh\ncd %s\nexec %s ./openerp-server.py $@\n"\ + % (join(self.install_libbase, "openerp-server"), sys.executable) # write script f = open('openerp-server', 'w') f.write(start_script) f.close() - install.run(self) + super(openerp_server_install, self).run() options = { "py2exe": { @@ -171,9 +171,9 @@ options = { "dist_dir": 'dist', "packages": ["lxml", "lxml.builder", "lxml._elementpath", "lxml.etree", "lxml.objectify", "decimal", "xml", "xml.dom", "xml.xpath", - "encodings","mx.DateTime","wizard","pychart","PIL", "pyparsing", - "pydot","asyncore","asynchat", "reportlab", "vobject", - "HTMLParser", "select"], + "encodings","mx.DateTime","wizard","pychart","PIL", + "pyparsing", "pydot","asyncore","asynchat", "reportlab", + "vobject", "HTMLParser", "select"], "excludes" : ["Tkconstants","Tkinter","tcl"], } } @@ -212,9 +212,12 @@ setup(name = name, 'openerp-server.tools', 'openerp-server.wizard', 'openerp-server.workflow'] + \ - list(map( lambda (a, p): 'openerp-server.addons.'+ a ,find_addons())), + [('openerp-server.addons.' + name) + for name, _ in find_addons()] package_dir = find_package_dirs(), - console = [ { "script" : "bin\\openerp-server.py", "icon_resources" : [ (1,"pixmaps\\openerp-icon.ico") ] } ], + console = [{"script": join("bin", "openerp-server.py"), + "icon_resources": [(1,join("pixmaps","openerp-icon.ico"))] + }], options = options, ) From 62caee00e3a5d8d73109fe763ad078740ec67b5f Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Sat, 12 Dec 2009 17:52:49 +0100 Subject: [PATCH 28/29] [fix] broken stuff bzr revid: xmo@tinyerp.com-20091212165249-ffujxd6xz38438ba --- setup.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/setup.py b/setup.py index 9571c90a1c8..706faa54721 100755 --- a/setup.py +++ b/setup.py @@ -162,7 +162,7 @@ class openerp_server_install(install): f = open('openerp-server', 'w') f.write(start_script) f.close() - super(openerp_server_install, self).run() + install.run(self) options = { "py2exe": { @@ -213,7 +213,7 @@ setup(name = name, 'openerp-server.wizard', 'openerp-server.workflow'] + \ [('openerp-server.addons.' + name) - for name, _ in find_addons()] + for name, _ in find_addons()], package_dir = find_package_dirs(), console = [{"script": join("bin", "openerp-server.py"), "icon_resources": [(1,join("pixmaps","openerp-icon.ico"))] From 1adf66b4720831c9b6b887904fceb0276c9fba8f Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Sat, 12 Dec 2009 17:55:08 +0100 Subject: [PATCH 29/29] [fix] forgot afm subpackage of pychart bzr revid: xmo@tinyerp.com-20091212165508-t55d90m1dj2p60q3 --- setup.py | 1 + 1 file changed, 1 insertion(+) diff --git a/setup.py b/setup.py index 706faa54721..9533434e039 100755 --- a/setup.py +++ b/setup.py @@ -198,6 +198,7 @@ setup(name = name, 'openerp-server.mako', 'openerp-server.osv', 'openerp-server.pychart', + 'openerp-server.pychart.afm', 'openerp-server.report', 'openerp-server.report.printscreen', 'openerp-server.report.pyPdf',