changeset 9a7034944424 in modules/sale_supply:default
details:
https://hg.tryton.org/modules/sale_supply?cmd=changeset;node=9a7034944424
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 | 24 ++++++++++++------------
product.py | 2 --
purchase.py | 9 +++------
sale.py | 11 +++++------
setup.py | 7 ++++---
stock.py | 3 ---
7 files changed, 26 insertions(+), 32 deletions(-)
diffs (173 lines):
diff -r 69e792d6686a -r 9a7034944424 .flake8
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/.flake8 Sun Mar 01 12:33:54 2020 +0100
@@ -0,0 +1,2 @@
+[flake8]
+ignore=E123,E124,E126,E128,W503
diff -r 69e792d6686a -r 9a7034944424 __init__.py
--- a/__init__.py Wed Dec 04 11:09:36 2019 +0100
+++ b/__init__.py Sun Mar 01 12:33:54 2020 +0100
@@ -2,22 +2,22 @@
# this repository contains the full copyright notices and license terms.
from trytond.pool import Pool
-from .sale import *
-from .purchase import *
-from .stock import *
-from .product import *
+from . import sale
+from . import purchase
+from . import stock
+from . import product
def register():
Pool.register(
- Sale,
- SaleLine,
- PurchaseRequest,
- Purchase,
- ShipmentIn,
- Template,
- Product,
+ sale.Sale,
+ sale.Line,
+ purchase.Request,
+ purchase.Purchase,
+ stock.ShipmentIn,
+ product.Template,
+ product.Product,
module='sale_supply', type_='model')
Pool.register(
- HandlePurchaseCancellationException,
+ purchase.HandlePurchaseCancellationException,
module='sale_supply', type_='wizard')
diff -r 69e792d6686a -r 9a7034944424 product.py
--- a/product.py Wed Dec 04 11:09:36 2019 +0100
+++ b/product.py Sun Mar 01 12:33:54 2020 +0100
@@ -4,8 +4,6 @@
from trytond.pool import PoolMeta
from trytond.pyson import Eval
-__all__ = ['Template', 'Product']
-
class Template(metaclass=PoolMeta):
__name__ = 'product.template'
diff -r 69e792d6686a -r 9a7034944424 purchase.py
--- a/purchase.py Wed Dec 04 11:09:36 2019 +0100
+++ b/purchase.py Sun Mar 01 12:33:54 2020 +0100
@@ -7,11 +7,8 @@
from trytond.transaction import Transaction
from trytond.tools import grouped_slice
-__all__ = ['PurchaseRequest', 'Purchase',
- 'HandlePurchaseCancellationException']
-
-class PurchaseRequest(metaclass=PoolMeta):
+class Request(metaclass=PoolMeta):
__name__ = 'purchase.request'
sale_lines = fields.One2Many(
@@ -19,7 +16,7 @@
@classmethod
def _get_origin(cls):
- return super(PurchaseRequest, cls)._get_origin() | {'sale.sale'}
+ return super()._get_origin() | {'sale.sale'}
@classmethod
def delete(cls, requests):
@@ -36,7 +33,7 @@
'purchase_request': None,
})
- super(PurchaseRequest, cls).delete(requests)
+ super().delete(requests)
if sales:
Sale.__queue__.process(sales)
diff -r 69e792d6686a -r 9a7034944424 sale.py
--- a/sale.py Wed Dec 04 11:09:36 2019 +0100
+++ b/sale.py Sun Mar 01 12:33:54 2020 +0100
@@ -4,8 +4,6 @@
from trytond.pool import Pool, PoolMeta
from trytond.pyson import Eval
-__all__ = ['Sale', 'SaleLine']
-
class Sale(metaclass=PoolMeta):
__name__ = 'sale.sale'
@@ -57,7 +55,7 @@
ShipmentOut.wait(shipments)
-class SaleLine(metaclass=PoolMeta):
+class Line(metaclass=PoolMeta):
__name__ = 'sale.line'
purchase_request = fields.Many2One('purchase.request', 'Purchase Request',
@@ -91,7 +89,7 @@
else:
default = default.copy()
default.setdefault('purchase_request', None)
- return super(SaleLine, cls).copy(lines, default=default)
+ return super().copy(lines, default=default)
@property
def supply_on_sale(self):
@@ -100,12 +98,13 @@
or not self.product
or self.quantity <= 0
or not self.product.purchasable
- or any(m.state not in ['staging', 'cancel'] for m in
self.moves)):
+ or any(m.state not in ['staging', 'cancel']
+ for m in self.moves)):
return False
return self.product.supply_on_sale
def get_move(self, shipment_type):
- move = super(SaleLine, self).get_move(shipment_type)
+ move = super().get_move(shipment_type)
if (move
and shipment_type == 'out'
and (self.supply_on_sale
diff -r 69e792d6686a -r 9a7034944424 setup.py
--- a/setup.py Wed Dec 04 11:09:36 2019 +0100
+++ b/setup.py Sun Mar 01 12:33:54 2020 +0100
@@ -79,8 +79,8 @@
keywords='tryton sale supply',
package_dir={'trytond.modules.sale_supply': '.'},
packages=(
- ['trytond.modules.sale_supply'] +
- ['trytond.modules.sale_supply.%s' % p for p in find_packages()]
+ ['trytond.modules.sale_supply']
+ + ['trytond.modules.sale_supply.%s' % p for p in find_packages()]
),
package_data={
'trytond.modules.sale_supply': (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)',
diff -r 69e792d6686a -r 9a7034944424 stock.py
--- a/stock.py Wed Dec 04 11:09:36 2019 +0100
+++ b/stock.py Sun Mar 01 12:33:54 2020 +0100
@@ -6,9 +6,6 @@
from trytond.pool import Pool, PoolMeta
-__all__ = ['ShipmentIn']
-
-
class ShipmentIn(metaclass=PoolMeta):
__name__ = 'stock.shipment.in'
