pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[REM] import_data: unused variables, redundant parens and variables

Browse Source 
bzr revid: xmo@openerp.com-20111201121257-3uq3fyjumd9bvi9a
This commit is contained in:
Xavier Morel
2011-12-01 13:12:57 +01:00
parent f17633dad7
commit 84004e8923
1 changed files with 5 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
openerp/osv/orm.py
+5 -9
View File
@@ -1212,7 +1212,6 @@ class BaseModel(object):
if not context:
context = {}
fields = map(fix_import_export_id_paths, fields)
logger = netsvc.Logger()
ir_model_data_obj = self.pool.get('ir.model.data')
# mode: id (XML id) or .id (database id) or False for name_get
@@ -1290,7 +1289,7 @@ class BaseModel(object):
# ID of the record using a XML ID
if field_name == 'id':
try:
data_res_id = _get_id(model_name, line[i], current_module, 'id')
data_res_id = _get_id(model_name, line[i], current_module)
except ValueError:
pass
xml_id = line[i]
@@ -1363,8 +1362,7 @@ class BaseModel(object):
row[field_name] = res or False
result = (row, nbrmax, warning, data_res_id, xml_id)
return result
return row, nbrmax, warning, data_res_id, xml_id
fields_def = self.fields_get(cr, uid, context=context)
@@ -1375,20 +1373,18 @@ class BaseModel(object):
position = data.get(filename, 0)
while position<len(datas):
res = {}
(res, position, warning, res_id, xml_id) = \
process_liness(self, datas, [], current_module, self._name, fields_def, position=position)
if len(warning):
cr.rollback()
return (-1, res, 'Line ' + str(position) +' : ' + '!\n'.join(warning), '')
return -1, res, 'Line ' + str(position) +' : ' + '!\n'.join(warning), ''
try:
ir_model_data_obj._update(cr, uid, self._name,
current_module, res, mode=mode, xml_id=xml_id,
noupdate=noupdate, res_id=res_id, context=context)
except Exception, e:
return (-1, res, 'Line ' + str(position) + ' : ' + tools.ustr(e), '')
return -1, res, 'Line ' + str(position) + ' : ' + tools.ustr(e), ''
if config.get('import_partial') and filename and (not (position%100)):
with open(config.get('import_partial'), 'rb') as partial_import:
@@ -1402,7 +1398,7 @@ class BaseModel(object):
if context.get('defer_parent_store_computation'):
self._parent_store_compute(cr)
return (position, 0, 0, 0)
return position, 0, 0, 0
def get_invalid_fields(self, cr, uid):
return list(self._invalids)