changeset bc5628c3ae1c in modules/account_statement:default
details:
https://hg.tryton.org/modules/account_statement?cmd=changeset;node=bc5628c3ae1c
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 | 2 +-
account.py | 2 --
journal.py | 8 +++-----
party.py | 6 ++----
setup.py | 7 ++++---
statement.py | 11 +++++++----
tests/__init__.py | 2 +-
8 files changed, 20 insertions(+), 20 deletions(-)
diffs (153 lines):
diff -r 852f9ab8ad91 -r bc5628c3ae1c .flake8
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/.flake8 Sun Mar 01 12:33:51 2020 +0100
@@ -0,0 +1,2 @@
+[flake8]
+ignore=E123,E124,E126,E128,W503
diff -r 852f9ab8ad91 -r bc5628c3ae1c __init__.py
--- a/__init__.py Sat Jan 25 20:18:49 2020 +0100
+++ b/__init__.py Sun Mar 01 12:33:51 2020 +0100
@@ -21,7 +21,7 @@
statement.ImportStatementStart,
module='account_statement', type_='model')
Pool.register(
- party.PartyReplace,
+ party.Replace,
statement.ImportStatement,
statement.ReconcileStatement,
module='account_statement', type_='wizard')
diff -r 852f9ab8ad91 -r bc5628c3ae1c account.py
--- a/account.py Sat Jan 25 20:18:49 2020 +0100
+++ b/account.py Sun Mar 01 12:33:51 2020 +0100
@@ -13,8 +13,6 @@
from trytond.modules.account.exceptions import PostError
-__all__ = ['Journal', 'Move']
-
class Journal(metaclass=PoolMeta):
__name__ = 'account.journal'
diff -r 852f9ab8ad91 -r bc5628c3ae1c journal.py
--- a/journal.py Sat Jan 25 20:18:49 2020 +0100
+++ b/journal.py Sun Mar 01 12:33:51 2020 +0100
@@ -8,8 +8,6 @@
from trytond.pool import Pool
from trytond.pyson import Eval
-__all__ = ['Journal']
-
class Journal(ModelSQL, ModelView):
'Statement Journal'
@@ -68,9 +66,9 @@
# Migration from 4.8: new account field
if created_account and table.table_exist('account_journal_account'):
value = journal_account.select(journal_account.credit_account,
- where=((journal_account.journal == sql_table.journal) &
- (journal_account.credit_account ==
- journal_account.debit_account)))
+ where=((journal_account.journal == sql_table.journal)
+ & (journal_account.credit_account
+ == journal_account.debit_account)))
# Don't use UPDATE FROM because SQLite does not support it.
cursor.execute(*sql_table.update([sql_table.account], [value]))
diff -r 852f9ab8ad91 -r bc5628c3ae1c party.py
--- a/party.py Sat Jan 25 20:18:49 2020 +0100
+++ b/party.py Sun Mar 01 12:33:51 2020 +0100
@@ -2,14 +2,12 @@
# this repository contains the full copyright notices and license terms.
from trytond.pool import PoolMeta
-__all__ = ['PartyReplace']
-
-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() + [
('account.statement.line', 'party'),
]
diff -r 852f9ab8ad91 -r bc5628c3ae1c setup.py
--- a/setup.py Sat Jan 25 20:18:49 2020 +0100
+++ b/setup.py Sun Mar 01 12:33:51 2020 +0100
@@ -79,8 +79,8 @@
keywords='tryton account statement',
package_dir={'trytond.modules.account_statement': '.'},
packages=(
- ['trytond.modules.account_statement'] +
- ['trytond.modules.account_statement.%s' % p for p in find_packages()]
+ ['trytond.modules.account_statement']
+ + ['trytond.modules.account_statement.%s' % p for p in find_packages()]
),
package_data={
'trytond.modules.account_statement': (info.get('xml', [])
@@ -94,7 +94,8 @@
'Intended Audience :: Developers',
'Intended Audience :: Financial and Insurance Industry',
'Intended Audience :: Legal Industry',
- '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)',
diff -r 852f9ab8ad91 -r bc5628c3ae1c statement.py
--- a/statement.py Sat Jan 25 20:18:49 2020 +0100
+++ b/statement.py Sun Mar 01 12:33:51 2020 +0100
@@ -748,8 +748,8 @@
super(Line, cls).__setup__()
if 'origin' not in cls.date.depends:
cls.date.states.update({
- 'readonly': (cls.date.states['readonly'] |
- Bool(Eval('origin', 0))),
+ 'readonly': (cls.date.states['readonly']
+ | Bool(Eval('origin', 0))),
})
cls.date.depends.append('origin')
cls.account.required = True
@@ -959,6 +959,7 @@
amount_second_currency=amount_second_currency,
)
+
del _states, _depends
@@ -1049,8 +1050,8 @@
lines = fields.One2Many(
'account.statement.line', 'origin', "Lines",
states={
- 'readonly': ((Eval('statement_id', -1) < 0) |
- ~Eval('statement_state').in_(['draft', 'validated'])),
+ 'readonly': ((Eval('statement_id', -1) < 0)
+ | ~Eval('statement_state').in_(['draft', 'validated'])),
},
domain=[
('statement', '=', Eval('statement')),
@@ -1104,6 +1105,8 @@
table.amount - Coalesce(Sum(line.amount), 0), value),
group_by=table.id))
return [('id', 'in', query)]
+
+
del _states, _depends
diff -r 852f9ab8ad91 -r bc5628c3ae1c tests/__init__.py
--- a/tests/__init__.py Sat Jan 25 20:18:49 2020 +0100
+++ b/tests/__init__.py Sun Mar 01 12:33:51 2020 +0100
@@ -2,7 +2,7 @@
# this repository contains the full copyright notices and license terms.
try:
- from trytond.modules.account_statement.tests.test_account_statement import
suite
+ from trytond.modules.account_statement.tests.test_account_statement import
suite # noqa: E501
except ImportError:
from .test_account_statement import suite
