changeset ebf4ec50c3de in modules/sale_extra:default
details:
https://hg.tryton.org/modules/sale_extra?cmd=changeset;node=ebf4ec50c3de
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 | 10 +++++-----
sale.py | 17 +++++++----------
setup.py | 7 ++++---
4 files changed, 18 insertions(+), 18 deletions(-)
diffs (126 lines):
diff -r 8b5254657b9a -r ebf4ec50c3de .flake8
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/.flake8 Sun Mar 01 12:33:53 2020 +0100
@@ -0,0 +1,2 @@
+[flake8]
+ignore=E123,E124,E126,E128,W503
diff -r 8b5254657b9a -r ebf4ec50c3de __init__.py
--- a/__init__.py Wed Dec 04 11:09:36 2019 +0100
+++ b/__init__.py Sun Mar 01 12:33:53 2020 +0100
@@ -2,13 +2,13 @@
# this repository contains the full copyright notices and license terms.
from trytond.pool import Pool
-from .sale import *
+from . import sale
def register():
Pool.register(
- SaleExtra,
- SaleExtraLine,
- Sale,
- SaleLine,
+ sale.Extra,
+ sale.ExtraLine,
+ sale.Sale,
+ sale.Line,
module='sale_extra', type_='model')
diff -r 8b5254657b9a -r ebf4ec50c3de sale.py
--- a/sale.py Wed Dec 04 11:09:36 2019 +0100
+++ b/sale.py Sun Mar 01 12:33:53 2020 +0100
@@ -12,9 +12,6 @@
from trytond.pyson import Eval, If
from trytond.transaction import Transaction
-__all__ = ['Sale', 'SaleLine',
- 'SaleExtra', 'SaleExtraLine']
-
class Sale(metaclass=PoolMeta):
__name__ = 'sale.sale'
@@ -57,13 +54,13 @@
self.lines = lines
-class SaleLine(metaclass=PoolMeta):
+class Line(metaclass=PoolMeta):
__name__ = 'sale.line'
extra = fields.Many2One('sale.extra.line', 'Extra', ondelete='RESTRICT')
-class SaleExtra(DeactivableMixin, ModelSQL, ModelView, MatchMixin):
+class Extra(DeactivableMixin, ModelSQL, ModelView, MatchMixin):
'Sale Extra'
__name__ = 'sale.extra'
@@ -114,7 +111,7 @@
sql_table = cls.__table__()
price_list = PriceList.__table__()
- super(SaleExtra, cls).__register__(module_name)
+ super().__register__(module_name)
table = cls.__table_handler__(module_name)
# Migration from 3.6: price_list not required and new company
@@ -189,7 +186,7 @@
pattern = pattern.copy()
sale_amount = pattern.pop('sale_amount')
- match = super(SaleExtra, self).match(pattern)
+ match = super().match(pattern)
if self.sale_amount is not None:
if sale_amount < self.sale_amount:
@@ -197,7 +194,7 @@
return match
-class SaleExtraLine(sequence_ordered(), ModelSQL, ModelView, MatchMixin):
+class ExtraLine(sequence_ordered(), ModelSQL, ModelView, MatchMixin):
'Sale Extra Line'
__name__ = 'sale.extra.line'
@@ -224,7 +221,7 @@
@classmethod
def __setup__(cls):
- super(SaleExtraLine, cls).__setup__()
+ super().__setup__()
cls._order.insert(1, ('extra', 'ASC'))
@fields.depends('product')
@@ -254,7 +251,7 @@
pattern = pattern.copy()
sale_amount = pattern.pop('sale_amount')
- match = super(SaleExtraLine, self).match(pattern)
+ match = super().match(pattern)
if self.sale_amount is not None:
if sale_amount < self.sale_amount:
diff -r 8b5254657b9a -r ebf4ec50c3de setup.py
--- a/setup.py Wed Dec 04 11:09:36 2019 +0100
+++ b/setup.py Sun Mar 01 12:33:53 2020 +0100
@@ -79,8 +79,8 @@
keywords='tryton sale extra premium cost',
package_dir={'trytond.modules.sale_extra': '.'},
packages=(
- ['trytond.modules.sale_extra'] +
- ['trytond.modules.sale_extra.%s' % p for p in find_packages()]
+ ['trytond.modules.sale_extra']
+ + ['trytond.modules.sale_extra.%s' % p for p in find_packages()]
),
package_data={
'trytond.modules.sale_extra': (info.get('xml', [])
@@ -93,7 +93,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)',
