odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[MERGE] openerp.report: remove unused imports and vars 

bzr revid: stw@openerp.com-20120910143835-85lcla35odoeanbi
This commit is contained in:
Stephane Wirtel 2012-09-10 16:38:35 +02:00
parent 29de4b2ade 6312fd9426
commit 8dc0bcf21c
14 changed files with 44 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
openerp/report/custom.py
View File

@ -21,7 +21,6 @@
import os import os
import time import time
import openerp.netsvc as netsvc
import openerp.tools as tools import openerp.tools as tools
from openerp.tools.safe_eval import safe_eval as eval from openerp.tools.safe_eval import safe_eval as eval
@ -67,7 +66,6 @@ class report_custom(report_int):
# #
def _row_get(self, cr, uid, objs, fields, conditions, row_canvas=None, group_by=None): def _row_get(self, cr, uid, objs, fields, conditions, row_canvas=None, group_by=None):
result = [] result = []
tmp = []
for obj in objs: for obj in objs:
tobreak = False tobreak = False
for cond in conditions: for cond in conditions:
@ -108,7 +106,7 @@ class report_custom(report_int):
key = levels.keys() key = levels.keys()
for l in key: for l in key:
objs = eval('obj.'+l,{'obj': obj}) objs = eval('obj.'+l,{'obj': obj})
if not isinstance(objs, browse_record_list) and type(objs) <> type([]): if not isinstance(objs, (browse_record_list, list)):
objs = [objs] objs = [objs]
field_new = [] field_new = []
cond_new = [] cond_new = []
@ -221,11 +219,9 @@ class report_custom(report_int):
res_dic[prev].append(line) res_dic[prev].append(line)
else: else:
prev = line[groupby] prev = line[groupby]
if res_dic.has_key(line[groupby]): res_dic.setdefault(line[groupby], [])
res_dic[line[groupby]].append(line) res_dic[line[groupby]].append(line)
else:
res_dic[line[groupby]] = []
res_dic[line[groupby]].append(line)
#we use the keys in results since they are ordered, whereas in res_dic.heys() they aren't #we use the keys in results since they are ordered, whereas in res_dic.heys() they aren't
for key in filter(None, [x[groupby] for x in results]): for key in filter(None, [x[groupby] for x in results]):
row = [] row = []
@ -267,7 +263,7 @@ class report_custom(report_int):
else: else:
try: try:
row.append(float(r[j])) row.append(float(r[j]))
except: except Exception:
row.append(r[j]) row.append(r[j])
results2.append(row) results2.append(row)
if report['type']=='pie': if report['type']=='pie':
@ -365,7 +361,6 @@ class report_custom(report_int):
order_date['Y'] = lambda x : x order_date['Y'] = lambda x : x
abscissa = [] abscissa = []
tmp = {}
idx = 0 idx = 0
date_idx = None date_idx = None
@ -389,7 +384,7 @@ class report_custom(report_int):
if date_idx != None: if date_idx != None:
for r in results: for r in results:
key = process_date['Y'](r[date_idx]) key = process_date['Y'](r[date_idx])
if not data_by_year.has_key(key): if key not in data_by_year:
data_by_year[key] = [] data_by_year[key] = []
for i in range(len(r)): for i in range(len(r)):
r[i] = fct[i](r[i]) r[i] = fct[i](r[i])
@ -407,14 +402,14 @@ class report_custom(report_int):
for d in data_by_year[line]: for d in data_by_year[line]:
for idx in range(len(fields)-1): for idx in range(len(fields)-1):
fields_bar.append({}) fields_bar.append({})
if fields_bar[idx].has_key(d[0]): if d[0] in fields_bar[idx]:
fields_bar[idx][d[0]] += d[idx+1] fields_bar[idx][d[0]] += d[idx+1]
else: else:
fields_bar[idx][d[0]] = d[idx+1] fields_bar[idx][d[0]] = d[idx+1]
for idx in range(len(fields)-1): for idx in range(len(fields)-1):
data = {} data = {}
for k in fields_bar[idx].keys(): for k in fields_bar[idx].keys():
if data.has_key(k): if k in data:
data[k] += fields_bar[idx][k] data[k] += fields_bar[idx][k]
else: else:
data[k] = fields_bar[idx][k] data[k] = fields_bar[idx][k]
@ -488,7 +483,7 @@ class report_custom(report_int):
if date_idx != None: if date_idx != None:
for r in results: for r in results:
key = process_date['Y'](r[date_idx]) key = process_date['Y'](r[date_idx])
if not data_by_year.has_key(key): if key not in data_by_year:
data_by_year[key] = [] data_by_year[key] = []
for i in range(len(r)): for i in range(len(r)):
r[i] = fct[i](r[i]) r[i] = fct[i](r[i])
@ -507,14 +502,14 @@ class report_custom(report_int):
for d in data_by_year[line]: for d in data_by_year[line]:
for idx in range(len(fields)-1): for idx in range(len(fields)-1):
fields_bar.append({}) fields_bar.append({})
if fields_bar[idx].has_key(d[0]): if d[0] in fields_bar[idx]:
fields_bar[idx][d[0]] += d[idx+1] fields_bar[idx][d[0]] += d[idx+1]
else: else:
fields_bar[idx][d[0]] = d[idx+1] fields_bar[idx][d[0]] = d[idx+1]
for idx in range(len(fields)-1): for idx in range(len(fields)-1):
data = {} data = {}
for k in fields_bar[idx].keys(): for k in fields_bar[idx].keys():
if data.has_key(k): if k in data:
data[k] += fields_bar[idx][k] data[k] += fields_bar[idx][k]
else: else:
data[k] = fields_bar[idx][k] data[k] = fields_bar[idx][k]

6
openerp/report/interface.py
View File

@ -44,8 +44,8 @@ class report_int(netsvc.Service):
def __init__(self, name): def __init__(self, name):
assert not self.exists(name), 'The report "%s" already exists!' % name assert not self.exists(name), 'The report "%s" already exists!' % name
super(report_int, self).__init__(name) super(report_int, self).__init__(name)
if name[0:7]<>'report.': if not name.startswith('report.'):
raise Exception, 'ConceptionError, bad report name, should start with "report."' raise Exception('ConceptionError, bad report name, should start with "report."')
self.name = name self.name = name
self.id = 0 self.id = 0
self.name2 = '.'.join(name.split('.')[1:]) self.name2 = '.'.join(name.split('.')[1:])
@ -181,7 +181,7 @@ class report_rml(report_int):
def create_pdf(self, rml, localcontext = None, logo=None, title=None): def create_pdf(self, rml, localcontext = None, logo=None, title=None):
if not localcontext: if not localcontext:
localcontext={} localcontext = {}
localcontext.update({'internal_header':self.internal_header}) localcontext.update({'internal_header':self.internal_header})
if logo: if logo:
self.bin_datas['logo'] = logo self.bin_datas['logo'] = logo

2
openerp/report/preprocess.py
View File

@ -48,7 +48,7 @@ class report(object):
try: try:
while n.tag != txt.group(3): while n.tag != txt.group(3):
n = n.getparent() n = n.getparent()
except: except Exception:
n = node n = node
else: else:
n = node.getparent() n = node.getparent()

6
openerp/report/print_xml.py
View File

@ -200,7 +200,7 @@ class document(object):
else: else:
args = [] args = []
# get the object # get the object
if attrs.has_key('model'): if 'model' in attrs:
obj = self.pool.get(attrs['model']) obj = self.pool.get(attrs['model'])
else: else:
if isinstance(browser, list): if isinstance(browser, list):
@ -209,7 +209,7 @@ class document(object):
obj = browser._table obj = browser._table
# get the ids # get the ids
if attrs.has_key('ids'): if 'ids' in attrs:
ids = self.eval(browser, attrs['ids']) ids = self.eval(browser, attrs['ids'])
else: else:
if isinstance(browser, list): if isinstance(browser, list):
@ -228,7 +228,7 @@ class document(object):
if not isinstance(datas[atr['value']], (str, unicode)): if not isinstance(datas[atr['value']], (str, unicode)):
txt = str(datas[atr['value']]) txt = str(datas[atr['value']])
else: else:
txt = datas[atr['value']] txt = datas[atr['value']]
el.text = txt el.text = txt
else: else:
for el_cld in node: for el_cld in node:

2
openerp/report/printscreen/ps_form.py
View File

@ -120,7 +120,7 @@ class report_printscreen_list(report_int):
line[f]=round(line[f],precision) line[f]=round(line[f],precision)
col = etree.SubElement(node_line, 'col', tree='no') col = etree.SubElement(node_line, 'col', tree='no')
if line[f] != None: if line[f] != None:
col.text = tools.ustr(line[f] or '') col.text = tools.ustr(line[f] or '')
else: else:
col.text = '/' col.text = '/'

2
openerp/report/printscreen/ps_list.py
View File

@ -56,7 +56,7 @@ class report_printscreen_list(report_int):
def _parse_string(self, view): def _parse_string(self, view):
try: try:
dom = etree.XML(view.encode('utf-8')) dom = etree.XML(view.encode('utf-8'))
except: except Exception:
dom = etree.XML(view) dom = etree.XML(view)
return self._parse_node(dom) return self._parse_node(dom)

2
openerp/report/render/html2html/html2html.py
View File

@ -20,9 +20,7 @@
############################################################################## ##############################################################################
from openerp.report.render.rml2pdf import utils from openerp.report.render.rml2pdf import utils
from lxml import etree
import copy import copy
import openerp.pooler as pooler
import base64 import base64
import cStringIO import cStringIO
import re import re

8
openerp/report/render/makohtml2html/makohtml2html.py
View File

@ -23,8 +23,7 @@ import mako
from lxml import etree from lxml import etree
from mako.template import Template from mako.template import Template
from mako.lookup import TemplateLookup from mako.lookup import TemplateLookup
import openerp.netsvc as netsvc import os
import traceback, sys, os
_logger = logging.getLogger(__name__) _logger = logging.getLogger(__name__)
@ -126,9 +125,8 @@ class makohtml2html(object):
final_html += self.format_header(etree_obj) final_html += self.format_header(etree_obj)
final_html += self.format_body(etree_obj) final_html += self.format_body(etree_obj)
return final_html return final_html
except Exception,e: except Exception:
tb_s = reduce(lambda x, y: x+y, traceback.format_exception(sys.exc_type, sys.exc_value, sys.exc_traceback)) _logger.exception('report :')
_logger.error('report :\n%s\n%s\n', tb_s, str(e))
def parseNode(html, localcontext = {}): def parseNode(html, localcontext = {}):
r = makohtml2html(html, localcontext) r = makohtml2html(html, localcontext)

1
openerp/report/render/odt2odt/odt2odt.py
View File

@ -20,7 +20,6 @@
############################################################################## ##############################################################################
from openerp.report.render.rml2pdf import utils from openerp.report.render.rml2pdf import utils
from lxml import etree
import copy import copy
class odt2odt(object): class odt2odt(object):

20
openerp/report/render/rml2html/rml2html.py
View File

@ -39,7 +39,7 @@ import sys
import cStringIO import cStringIO
from lxml import etree from lxml import etree
import copy import copy
import utils
from openerp.report.render.rml2pdf import utils from openerp.report.render.rml2pdf import utils
class _flowable(object): class _flowable(object):
@ -98,7 +98,7 @@ class _flowable(object):
try: try:
if new_child.get('style').find('terp_tblheader')!= -1: if new_child.get('style').find('terp_tblheader')!= -1:
new_node.tag = 'th' new_node.tag = 'th'
except: except Exception:
pass pass
process(node,new_node) process(node,new_node)
if new_node.get('colWidths',False): if new_node.get('colWidths',False):
@ -232,7 +232,7 @@ class _rml_stylesheet(object):
attr = {} attr = {}
attrs = ps.attrib attrs = ps.attrib
for key, val in attrs.items(): for key, val in attrs.items():
attr[key] = val attr[key] = val
attrs = [] attrs = []
for a in attr: for a in attr:
if a in self._tags: if a in self._tags:
@ -296,13 +296,13 @@ class _rml_template(object):
frames[(posy,posx,tmpl.get('id'))] = _rml_tmpl_frame(posx, utils.unit_get(tmpl.get('width'))) frames[(posy,posx,tmpl.get('id'))] = _rml_tmpl_frame(posx, utils.unit_get(tmpl.get('width')))
for tmpl in pt.findall('pageGraphics'): for tmpl in pt.findall('pageGraphics'):
for n in tmpl: for n in tmpl:
if n.tag == 'image': if n.tag == 'image':
self.data = rc + utils._process_text(self, n.text) self.data = rc + utils._process_text(self, n.text)
if n.tag in self._tags: if n.tag in self._tags:
t = self._tags[n.tag](n, self.style,self.localcontext) t = self._tags[n.tag](n, self.style,self.localcontext)
frames[(t.posy,t.posx,n.tag)] = t frames[(t.posy,t.posx,n.tag)] = t
else: else:
self.style.update(n) self.style.update(n)
keys = frames.keys() keys = frames.keys()
keys.sort() keys.sort()
keys.reverse() keys.reverse()

4
openerp/report/render/rml2pdf/trml2pdf.py
View File

@ -82,7 +82,7 @@ class NumberedCanvas(canvas.Canvas):
def showPage(self): def showPage(self):
self._currentPage +=1 self._currentPage +=1
if not self._flag: if not self._flag:
self._pageCount += 1 self._pageCount += 1
else: else:
self.pages.update({self._currentPage:self._pageCount}) self.pages.update({self._currentPage:self._pageCount})
self._codes.append({'code': self._code, 'stack': self._codeStack}) self._codes.append({'code': self._code, 'stack': self._codeStack})
@ -424,7 +424,7 @@ class _rml_canvas(object):
flow.drawOn(self.canvas,infos['x'],infos['y']) flow.drawOn(self.canvas,infos['x'],infos['y'])
infos['height']-=h infos['height']-=h
else: else:
raise ValueError, "Not enough space" raise ValueError("Not enough space")
def _line_mode(self, node): def _line_mode(self, node):
ljoin = {'round':1, 'mitered':0, 'bevelled':2} ljoin = {'round':1, 'mitered':0, 'bevelled':2}

6
openerp/report/render/rml2txt/rml2txt.py
View File

@ -22,9 +22,7 @@
import sys import sys
import StringIO import StringIO
import copy
from lxml import etree from lxml import etree
import base64
import utils import utils
@ -336,8 +334,8 @@ class _rml_stylesheet(object):
attr = {} attr = {}
attrs = ps.attributes attrs = ps.attributes
for i in range(attrs.length): for i in range(attrs.length):
name = attrs.item(i).localName name = attrs.item(i).localName
attr[name] = ps.get(name) attr[name] = ps.get(name)
attrs = [] attrs = []
for a in attr: for a in attr:
if a in self._tags: if a in self._tags:

13
openerp/report/render/rml2txt/utils.py
View File

@ -23,7 +23,6 @@ import copy
import re import re
import reportlab import reportlab
import reportlab.lib.units import reportlab.lib.units
from lxml import etree
from openerp.tools.safe_eval import safe_eval as eval from openerp.tools.safe_eval import safe_eval as eval
_regex = re.compile('\[\[(.+?)\]\]') _regex = re.compile('\[\[(.+?)\]\]')
@ -38,7 +37,7 @@ def _child_get(node, self=None, tagname=None):
if n.get('rml_except', False): if n.get('rml_except', False):
try: try:
eval(n.get('rml_except'), {}, self.localcontext) eval(n.get('rml_except'), {}, self.localcontext)
except: except Exception:
continue continue
if n.get('rml_tag'): if n.get('rml_tag'):
try: try:
@ -47,7 +46,7 @@ def _child_get(node, self=None, tagname=None):
n2.tag = tag n2.tag = tag
n2.attrib.update(attr) n2.attrib.update(attr)
yield n2 yield n2
except: except Exception:
yield n yield n
else: else:
yield n yield n
@ -56,7 +55,7 @@ def _child_get(node, self=None, tagname=None):
if self and self.localcontext and n.get('rml_except', False): if self and self.localcontext and n.get('rml_except', False):
try: try:
eval(n.get('rml_except'), {}, self.localcontext) eval(n.get('rml_except'), {}, self.localcontext)
except: except Exception:
continue continue
if (tagname is None) or (n.tag==tagname): if (tagname is None) or (n.tag==tagname):
yield n yield n
@ -74,11 +73,11 @@ def _process_text(self, txt):
if sps: if sps:
try: try:
txt2 = eval(sps.pop(0),self.localcontext) txt2 = eval(sps.pop(0),self.localcontext)
except: except Exception:
txt2 = '' txt2 = ''
if type(txt2) == type(0) or type(txt2) == type(0.0): if isinstance(txt2, (int, float)):
txt2 = str(txt2) txt2 = str(txt2)
if type(txt2)==type('') or type(txt2)==type(u''): if isinstance(txt2, basestring):
result += txt2 result += txt2
return result return result

3
openerp/report/render/simple.py
View File

@ -66,7 +66,6 @@ class simple(render.render):
return self.result.getvalue() return self.result.getvalue()
if __name__=='__main__': if __name__=='__main__':
import time
s = simple() s = simple()
s.xml = '''<test> s.xml = '''<test>
<author-list> <author-list>
@ -82,7 +81,7 @@ if __name__=='__main__':
</author-list> </author-list>
</test>''' </test>'''
if s.render(): if s.render():
print s.get() print s.get()
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: