changeset 0885ea605264 in modules/bank:default
details: https://hg.tryton.org/modules/bank?cmd=changeset;node=0885ea605264
description:
Fix flake8 errors and warnings
We add the flake8 configuration used so we ensure everyone uses the
same.
We remove the usage of __all__ for non public API.
When possible, we rationalize the class name according to its __name__
and module.
issue9082
review297061002
diffstat:
.flake8 | 2 ++
__init__.py | 16 ++++++++--------
bank.py | 17 +++++++----------
party.py | 7 ++-----
setup.py | 7 ++++---
5 files changed, 23 insertions(+), 26 deletions(-)
diffs (164 lines):
diff -r 93e9dbf220cc -r 0885ea605264 .flake8
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/.flake8 Sun Mar 01 12:33:52 2020 +0100
@@ -0,0 +1,2 @@
+[flake8]
+ignore=E123,E124,E126,E128,W503
diff -r 93e9dbf220cc -r 0885ea605264 __init__.py
--- a/__init__.py Mon Jan 20 11:27:53 2020 +0100
+++ b/__init__.py Sun Mar 01 12:33:52 2020 +0100
@@ -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 -r 93e9dbf220cc -r 0885ea605264 bank.py
--- a/bank.py Mon Jan 20 11:27:53 2020 +0100
+++ b/bank.py Sun Mar 01 12:33:52 2020 +0100
@@ -11,9 +11,6 @@
from .exceptions import IBANValidationError, InvalidBIC
-__all__ = ['Bank', 'BankAccount', 'BankAccountNumber', 'BankAccountParty']
-
-
class Bank(ModelSQL, ModelView):
'Bank'
__name__ = 'bank'
@@ -46,7 +43,7 @@
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 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 @@
@classmethod
def __setup__(cls):
- super(BankAccountNumber, cls).__setup__()
+ super().__setup__()
cls._order.insert(0, ('account', 'ASC'))
@classmethod
@@ -134,7 +131,7 @@
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 @@
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 @@
@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 @@
number=self.number))
-class BankAccountParty(ModelSQL):
+class AccountParty(ModelSQL):
'Bank Account - Party'
__name__ = 'bank.account-party.party'
account = fields.Many2One('bank.account', 'Account',
diff -r 93e9dbf220cc -r 0885ea605264 party.py
--- a/party.py Mon Jan 20 11:27:53 2020 +0100
+++ b/party.py Sun Mar 01 12:33:52 2020 +0100
@@ -5,9 +5,6 @@
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 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 -r 93e9dbf220cc -r 0885ea605264 setup.py
--- a/setup.py Mon Jan 20 11:27:53 2020 +0100
+++ b/setup.py Sun Mar 01 12:33:52 2020 +0100
@@ -78,8 +78,8 @@
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 @@
'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)',
