diff --git a/.flake8 b/.flake8 new file mode 100644 index 0000000000..bb03d08a82 --- /dev/null +++ b/.flake8 @@ -0,0 +1,2 @@ +[flake8] +ignore=E123,E124,E126,E128,W503 diff --git a/__init__.py b/__init__.py index f449a8f1a3..7b31bc0030 100644 --- a/__init__.py +++ b/__init__.py @@ -2,18 +2,18 @@ # this repository contains the full copyright notices and license terms. from trytond.pool import Pool -from .bank import * -from .party import * +from . import bank +from . import party def register(): Pool.register( - Bank, - BankAccount, - BankAccountNumber, - BankAccountParty, - Party, + bank.Bank, + bank.Account, + bank.AccountNumber, + bank.AccountParty, + party.Party, module='bank', type_='model') Pool.register( - PartyReplace, + party.Replace, module='bank', type_='wizard') diff --git a/bank.py b/bank.py index dc516a2bc9..9c3f0858db 100644 --- a/bank.py +++ b/bank.py @@ -11,9 +11,6 @@ from trytond.model import ( from .exceptions import IBANValidationError, InvalidBIC -__all__ = ['Bank', 'BankAccount', 'BankAccountNumber', 'BankAccountParty'] - - class Bank(ModelSQL, ModelView): 'Bank' __name__ = 'bank' @@ -46,7 +43,7 @@ class Bank(ModelSQL, ModelView): raise InvalidBIC(gettext('bank.msg_invalid_bic', bic=self.bic)) -class BankAccount(DeactivableMixin, ModelSQL, ModelView): +class Account(DeactivableMixin, ModelSQL, ModelView): 'Bank Account' __name__ = 'bank.account' bank = fields.Many2One('bank', 'Bank', required=True, @@ -77,7 +74,7 @@ class BankAccount(DeactivableMixin, ModelSQL, ModelView): ] -class BankAccountNumber(sequence_ordered(), ModelSQL, ModelView): +class AccountNumber(sequence_ordered(), ModelSQL, ModelView): 'Bank Account Number' __name__ = 'bank.account.number' _rec_name = 'number' @@ -93,7 +90,7 @@ class BankAccountNumber(sequence_ordered(), ModelSQL, ModelView): @classmethod def __setup__(cls): - super(BankAccountNumber, cls).__setup__() + super().__setup__() cls._order.insert(0, ('account', 'ASC')) @classmethod @@ -134,7 +131,7 @@ class BankAccountNumber(sequence_ordered(), ModelSQL, ModelView): if values.get('type') == 'iban' and 'number' in values: values['number'] = iban.format(values['number']) values['number_compact'] = iban.compact(values['number']) - return super(BankAccountNumber, cls).create(vlist) + return super().create(vlist) @classmethod def write(cls, *args): @@ -147,7 +144,7 @@ class BankAccountNumber(sequence_ordered(), ModelSQL, ModelView): values['number_compact'] = iban.compact(values['number']) args.extend((numbers, values)) - super(BankAccountNumber, cls).write(*args) + super().write(*args) to_write = [] for number in sum(args[::2], []): @@ -165,7 +162,7 @@ class BankAccountNumber(sequence_ordered(), ModelSQL, ModelView): @fields.depends('type', 'number') def pre_validate(self): - super(BankAccountNumber, self).pre_validate() + super().pre_validate() if (self.type == 'iban' and self.number and not iban.is_valid(self.number)): raise IBANValidationError( @@ -173,7 +170,7 @@ class BankAccountNumber(sequence_ordered(), ModelSQL, ModelView): number=self.number)) -class BankAccountParty(ModelSQL): +class AccountParty(ModelSQL): 'Bank Account - Party' __name__ = 'bank.account-party.party' account = fields.Many2One('bank.account', 'Account', diff --git a/party.py b/party.py index 8adf348fe5..801ab03d64 100644 --- a/party.py +++ b/party.py @@ -5,9 +5,6 @@ from trytond.model import fields from trytond.tools import lstrip_wildcard -__all__ = ['Party', 'PartyReplace'] - - class Party(metaclass=PoolMeta): __name__ = 'party.party' bank_accounts = fields.Many2Many('bank.account-party.party', 'owner', @@ -30,12 +27,12 @@ class Party(metaclass=PoolMeta): ] -class PartyReplace(metaclass=PoolMeta): +class Replace(metaclass=PoolMeta): __name__ = 'party.replace' @classmethod def fields_to_replace(cls): - return super(PartyReplace, cls).fields_to_replace() + [ + return super().fields_to_replace() + [ ('bank', 'party'), ('bank.account-party.party', 'owner'), ] diff --git a/setup.py b/setup.py index e6ca6f67ee..db60e77b64 100755 --- a/setup.py +++ b/setup.py @@ -78,8 +78,8 @@ setup(name=name, keywords='tryton bank', package_dir={'trytond.modules.bank': '.'}, packages=( - ['trytond.modules.bank'] + - ['trytond.modules.bank.%s' % p for p in find_packages()] + ['trytond.modules.bank'] + + ['trytond.modules.bank.%s' % p for p in find_packages()] ), package_data={ 'trytond.modules.bank': (info.get('xml', []) @@ -93,7 +93,8 @@ setup(name=name, 'Intended Audience :: Financial and Insurance Industry', 'Intended Audience :: Legal Industry', 'Intended Audience :: Manufacturing', - 'License :: OSI Approved :: GNU General Public License v3 or later (GPLv3+)', + 'License :: OSI Approved :: ' + 'GNU General Public License v3 or later (GPLv3+)', 'Natural Language :: Bulgarian', 'Natural Language :: Catalan', 'Natural Language :: Chinese (Simplified)',