Reviewers: ,
Please review this at http://codereview.tryton.org/233003/
Affected files:
M tryton/gui/window/win_export.py
M tryton/gui/window/win_import.py
Index: tryton/gui/window/win_export.py
===================================================================
--- a/tryton/gui/window/win_export.py
+++ b/tryton/gui/window/win_export.py
@@ -325,7 +325,7 @@
try:
new_id = rpc.execute(*args)
except TrytonServerError, exception:
- new_id = common.process_exception(exception, self.dialog,
*args)
+ new_id = common.process_exception(exception, *args)
if not new_id:
return
self.predef_model.append((
@@ -346,7 +346,7 @@
try:
rpc.execute(*args)
except TrytonServerError, exception:
- if not common.process_exception(exception, self.dialog, *args):
+ if not common.process_exception(exception, *args):
return
for i in range(len(self.predef_model)):
if self.predef_model[i][0] == export_id:
@@ -442,6 +442,6 @@
datas = rpc.execute('model', model,
'export_data', ids, fields, ctx)
except TrytonServerError, exception:
- common.process_exception(exception, self.dialog)
+ common.process_exception(exception)
return []
return datas
Index: tryton/gui/window/win_import.py
===================================================================
--- a/tryton/gui/window/win_import.py
+++ b/tryton/gui/window/win_import.py
@@ -228,7 +228,7 @@
try:
return rpc.execute(*args)
except TrytonServerError, exception:
- return common.process_exception(exception, self.dialog, *args)
+ return common.process_exception(exception, *args)
def on_row_expanded(self, treeview, iter, path):
child = self.model1.iter_children(iter)
@@ -242,8 +242,7 @@
def sig_autodetect(self, widget=None):
fname = self.import_csv_file.get_filename()
if not fname:
- common.message(_('You must select an import file first!'),
- self.dialog)
+ common.message(_('You must select an import file first!'))
return True
csvsep = self.import_csv_sep.get_text()
csvdel = self.import_csv_del.get_text()
@@ -255,8 +254,7 @@
data = csv.reader(open(fname, 'rb'), quotechar=csvdel,
delimiter=csvsep)
except IOError:
- common.warning(_('Error opening CSV file'), self.dialog,
- _('Error'))
+ common.warning(_('Error opening CSV file'), _('Error'))
return True
self.sig_unsel_all()
word = ''
@@ -283,9 +281,8 @@
name = self.fields[word][0]
field = word
else:
- common.warning(
- _('Error processing the file at field %s.') %
- word, self.dialog, _('Error'))
+ common.warning(_('Error processing the file at
field %s.')
+ % word, _('Error'))
return True
num = self.model2.append()
self.model2.set(num, 0, name, 1, field)
@@ -352,7 +349,7 @@
res = rpc.execute('model', model, 'import_data', fields, datas,
rpc.CONTEXT)
except TrytonServerError, exception:
- common.process_exception(exception, self.dialog)
+ common.process_exception(exception)
return False
if res[0] >= 0:
if res[0] == 1:
--
[email protected] mailing list
