From 05a2b6aeb8ae5b4da87eb1ed031c3cc6908dd3f8 Mon Sep 17 00:00:00 2001 From: Akim Juillerat Date: Mon, 8 Oct 2018 14:17:33 +0200 Subject: [PATCH] Improve calls to super with Python3 --- account_asset_management/models/account_asset.py | 8 ++++---- account_asset_management/models/account_asset_line.py | 2 +- .../models/account_asset_profile.py | 4 ++-- account_asset_management/models/account_invoice.py | 10 +++++----- account_asset_management/models/account_move.py | 8 ++++---- account_asset_management/models/date_range.py | 4 ++-- .../tests/test_account_asset_management.py | 2 +- 7 files changed, 19 insertions(+), 19 deletions(-) diff --git a/account_asset_management/models/account_asset.py b/account_asset_management/models/account_asset.py index fefb0816d..24abc5717 100644 --- a/account_asset_management/models/account_asset.py +++ b/account_asset_management/models/account_asset.py @@ -249,7 +249,7 @@ class AccountAsset(models.Model): @api.multi @api.constrains('parent_id') def _check_recursion(self, parent=None): - res = super(AccountAsset, self)._check_recursion(parent=parent) + res = super()._check_recursion(parent=parent) if not res: raise UserError( _("Error ! You can not create recursive assets.")) @@ -332,7 +332,7 @@ class AccountAsset(models.Model): vals['prorata'] = True if vals.get('type') == 'view': vals['date_start'] = False - asset = super(AccountAsset, self).create(vals) + asset = super().create(vals) if self.env.context.get('create_asset_from_move_line'): # Trigger compute of depreciation_base asset.salvage_value = 0.0 @@ -345,7 +345,7 @@ class AccountAsset(models.Model): if vals.get('method_time'): if vals['method_time'] != 'year' and not vals.get('prorata'): vals['prorata'] = True - res = super(AccountAsset, self).write(vals) + res = super().write(vals) for asset in self: asset_type = vals.get('type') or asset.type if asset_type == 'view' or \ @@ -392,7 +392,7 @@ class AccountAsset(models.Model): allow_asset_removal=True, from_parent_object=True ).mapped('account_move_line_ids') amls.write({'asset_id': False}) - return super(AccountAsset, self).unlink() + return super().unlink() @api.model def name_search(self, name, args=None, operator='ilike', limit=100): diff --git a/account_asset_management/models/account_asset_line.py b/account_asset_management/models/account_asset_line.py index 0512cfb9d..4387660b5 100644 --- a/account_asset_management/models/account_asset_line.py +++ b/account_asset_management/models/account_asset_line.py @@ -156,7 +156,7 @@ class AccountAssetLine(models.Model): raise UserError(_( "You cannot set the date on a depreciation line " "prior to already posted entries.")) - return super(AccountAssetLine, self).write(vals) + return super().write(vals) @api.multi def unlink(self): diff --git a/account_asset_management/models/account_asset_profile.py b/account_asset_management/models/account_asset_profile.py index 705a61438..7b377a72c 100644 --- a/account_asset_management/models/account_asset_profile.py +++ b/account_asset_management/models/account_asset_profile.py @@ -157,7 +157,7 @@ class AccountAssetProfile(models.Model): def create(self, vals): if vals.get('method_time') != 'year' and not vals.get('prorata'): vals['prorata'] = True - profile = super(AccountAssetProfile, self).create(vals) + profile = super().create(vals) acc_id = vals.get('account_asset_id') if acc_id: account = self.env['account.account'].browse(acc_id) @@ -170,7 +170,7 @@ class AccountAssetProfile(models.Model): if vals.get('method_time'): if vals['method_time'] != 'year' and not vals.get('prorata'): vals['prorata'] = True - res = super(AccountAssetProfile, self).write(vals) + res = super().write(vals) # TODO last profile in self is defined as default on the related # account. must be improved. account = self.env['account.account'].browse( diff --git a/account_asset_management/models/account_invoice.py b/account_asset_management/models/account_invoice.py index da71d1bc3..868b2310f 100644 --- a/account_asset_management/models/account_invoice.py +++ b/account_asset_management/models/account_invoice.py @@ -91,14 +91,14 @@ class AccountInvoice(models.Model): for inv in self: move = inv.move_id assets = move.line_ids.mapped('asset_id') - super(AccountInvoice, self).action_cancel() + super().action_cancel() if assets: assets.unlink() return True @api.model def line_get_convert(self, line, part): - res = super(AccountInvoice, self).line_get_convert(line, part) + res = super().line_get_convert(line, part) if line.get('asset_profile_id'): # skip empty debit/credit if res.get('debit') or res.get('credit'): @@ -107,14 +107,14 @@ class AccountInvoice(models.Model): @api.model def inv_line_characteristic_hashcode(self, invoice_line): - res = super(AccountInvoice, self).inv_line_characteristic_hashcode( + res = super().inv_line_characteristic_hashcode( invoice_line) res += '-%s' % invoice_line.get('asset_profile_id', 'False') return res @api.model def invoice_line_move_line_get(self): - res = super(AccountInvoice, self).invoice_line_move_line_get() + res = super().invoice_line_move_line_get() invoice_line_obj = self.env['account.invoice.line'] for vals in res: if vals.get('invl_id'): @@ -143,4 +143,4 @@ class AccountInvoiceLine(models.Model): @api.onchange('account_id') def _onchange_account_id(self): self.asset_profile_id = self.account_id.asset_profile_id.id - return super(AccountInvoiceLine, self)._onchange_account_id() + return super()._onchange_account_id() diff --git a/account_asset_management/models/account_move.py b/account_asset_management/models/account_move.py index 99d2522e2..6731af86a 100644 --- a/account_asset_management/models/account_move.py +++ b/account_asset_management/models/account_move.py @@ -34,7 +34,7 @@ class AccountMove(models.Model): "\nYou should remove such entries from the asset.")) # trigger store function deprs.write({'move_id': False}) - return super(AccountMove, self).unlink() + return super().unlink() @api.multi def write(self, vals): @@ -45,7 +45,7 @@ class AccountMove(models.Model): raise UserError( _("You cannot change an accounting entry " "linked to an asset depreciation line.")) - return super(AccountMove, self).write(vals) + return super().write(vals) class AccountMoveLine(models.Model): @@ -91,7 +91,7 @@ class AccountMoveLine(models.Model): create_asset_from_move_line=True, move_id=vals['move_id']).create(asset_vals) vals['asset_id'] = asset.id - return super(AccountMoveLine, self).create(vals) + return super().create(vals) @api.multi def _prepare_asset_create(self, vals): @@ -147,7 +147,7 @@ class AccountMoveLine(models.Model): create_asset_from_move_line=True, move_id=aml.move_id.id).create(asset_vals) vals['asset_id'] = asset.id - return super(AccountMoveLine, self).write(vals) + return super().write(vals) @api.model def _get_asset_analytic_values(self, vals, asset_vals): diff --git a/account_asset_management/models/date_range.py b/account_asset_management/models/date_range.py index 840ad21a3..faf21a31c 100644 --- a/account_asset_management/models/date_range.py +++ b/account_asset_management/models/date_range.py @@ -28,7 +28,7 @@ class DateRange(models.Model): } self.env['account.asset.recompute.trigger'].sudo().create( recompute_vals) - return super(DateRange, self).create(vals) + return super().create(vals) @api.multi def write(self, vals): @@ -47,4 +47,4 @@ class DateRange(models.Model): } self.env['account.asset.recompute.trigger'].sudo().\ create(recompute_vals) - return super(DateRange, self).write(vals) + return super().write(vals) diff --git a/account_asset_management/tests/test_account_asset_management.py b/account_asset_management/tests/test_account_asset_management.py index 5810a9f35..34b592c61 100644 --- a/account_asset_management/tests/test_account_asset_management.py +++ b/account_asset_management/tests/test_account_asset_management.py @@ -20,7 +20,7 @@ class TestAssetManagement(common.TransactionCase): self.registry._assertion_report) def setUp(self): - super(TestAssetManagement, self).setUp() + super().setUp() self._load('account', 'test', 'account_minimal_test.xml') self._load('account_asset_management', 'tests',