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

[REF] openerp.report: replace deprecated has_key. 

bzr revid: florent.xicluna@gmail.com-20120208170351-1vmewmuufmxn7x52
This commit is contained in:
Florent Xicluna 2012-02-08 18:03:51 +01:00
parent b5fa51f4a6
commit 9621008df1
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
openerp/report/custom.py
View File

@ -221,7 +221,7 @@ class report_custom(report_int):
res_dic[prev].append(line)
else:
prev = line[groupby]
if res_dic.has_key(line[groupby]):
if line[groupby] in res_dic:
res_dic[line[groupby]].append(line)
else:
res_dic[line[groupby]] = []
@ -389,7 +389,7 @@ class report_custom(report_int):
if date_idx != None:
for r in results:
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] = []
for i in range(len(r)):
r[i] = fct[i](r[i])
@ -407,14 +407,14 @@ class report_custom(report_int):
for d in data_by_year[line]:
for idx in range(len(fields)-1):
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]
else:
fields_bar[idx][d[0]] = d[idx+1]
for idx in range(len(fields)-1):
data = {}
for k in fields_bar[idx].keys():
if data.has_key(k):
if k in data:
data[k] += fields_bar[idx][k]
else:
data[k] = fields_bar[idx][k]
@ -488,7 +488,7 @@ class report_custom(report_int):
if date_idx != None:
for r in results:
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] = []
for i in range(len(r)):
r[i] = fct[i](r[i])
@ -507,14 +507,14 @@ class report_custom(report_int):
for d in data_by_year[line]:
for idx in range(len(fields)-1):
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]
else:
fields_bar[idx][d[0]] = d[idx+1]
for idx in range(len(fields)-1):
data = {}
for k in fields_bar[idx].keys():
if data.has_key(k):
if k in data:
data[k] += fields_bar[idx][k]
else:
data[k] = fields_bar[idx][k]

4
openerp/report/print_xml.py
View File

@ -200,7 +200,7 @@ class document(object):
else:
args = []
# get the object
if attrs.has_key('model'):
if 'model' in attrs:
obj = self.pool.get(attrs['model'])
else:
if isinstance(browser, list):
@ -209,7 +209,7 @@ class document(object):
obj = browser._table
# get the ids
if attrs.has_key('ids'):
if 'ids' in attrs:
ids = self.eval(browser, attrs['ids'])
else:
if isinstance(browser, list):