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 f39eafaf7a..4f28e75d7b 100644 --- a/__init__.py +++ b/__init__.py @@ -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 --git a/product.py b/product.py index 580ec29527..b55c829008 100644 --- a/product.py +++ b/product.py @@ -4,8 +4,6 @@ from trytond.model import fields from trytond.pool import PoolMeta from trytond.pyson import Eval -__all__ = ['Template', 'Product'] - class Template(metaclass=PoolMeta): __name__ = 'product.template' diff --git a/purchase.py b/purchase.py index 750f1b71cf..45ef12d691 100644 --- a/purchase.py +++ b/purchase.py @@ -7,11 +7,8 @@ from trytond.pool import Pool, PoolMeta 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 @@ class PurchaseRequest(metaclass=PoolMeta): @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 @@ class PurchaseRequest(metaclass=PoolMeta): 'purchase_request': None, }) - super(PurchaseRequest, cls).delete(requests) + super().delete(requests) if sales: Sale.__queue__.process(sales) diff --git a/sale.py b/sale.py index 8e3196b4aa..ed1ac80622 100644 --- a/sale.py +++ b/sale.py @@ -4,8 +4,6 @@ from trytond.model import fields 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 @@ class Sale(metaclass=PoolMeta): 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 @@ class SaleLine(metaclass=PoolMeta): 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 @@ class SaleLine(metaclass=PoolMeta): 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 --git a/setup.py b/setup.py index 7c292e9176..3494a855c3 100755 --- a/setup.py +++ b/setup.py @@ -79,8 +79,8 @@ setup(name=name, 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 @@ setup(name=name, '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 --git a/stock.py b/stock.py index a59899a2b0..c7644e91a1 100644 --- a/stock.py +++ b/stock.py @@ -6,9 +6,6 @@ from trytond.model import ModelView, Workflow from trytond.pool import Pool, PoolMeta -__all__ = ['ShipmentIn'] - - class ShipmentIn(metaclass=PoolMeta): __name__ = 'stock.shipment.in'