diff --git a/.isort.cfg b/.isort.cfg new file mode 100644 index 0000000000..e1c6495da9 --- /dev/null +++ b/.isort.cfg @@ -0,0 +1,3 @@ +[settings] +multi_line_output=4 +known_first_party=trytond diff --git a/__init__.py b/__init__.py index 6f72541846..cc5c37f5e3 100644 --- a/__init__.py +++ b/__init__.py @@ -2,11 +2,7 @@ # this repository contains the full copyright notices and license terms. from trytond.pool import Pool -from . import product -from . import sale -from . import purchase -from . import stock -from . import account +from . import account, product, purchase, sale, stock __all__ = ['register'] diff --git a/account.py b/account.py index fa14c91cb8..c0bae5f644 100644 --- a/account.py +++ b/account.py @@ -1,7 +1,7 @@ # This file is part of Tryton. The COPYRIGHT file at the top level of # this repository contains the full copyright notices and license terms. from trytond.model import ModelView, Workflow -from trytond.pool import PoolMeta, Pool +from trytond.pool import Pool, PoolMeta class Invoice(metaclass=PoolMeta): diff --git a/product.py b/product.py index 1aa900f5d9..2767fe7469 100644 --- a/product.py +++ b/product.py @@ -3,11 +3,10 @@ from decimal import Decimal from trytond.model import ( - ModelView, ModelSQL, ModelStorage, sequence_ordered, fields) -from trytond.pyson import Eval, If, Bool -from trytond.pool import PoolMeta, Pool - + ModelSQL, ModelStorage, ModelView, fields, sequence_ordered) from trytond.modules.product import round_price +from trytond.pool import Pool, PoolMeta +from trytond.pyson import Bool, Eval, If class Template(metaclass=PoolMeta): diff --git a/purchase.py b/purchase.py index 0df17a48bf..db5f614e8d 100644 --- a/purchase.py +++ b/purchase.py @@ -1,16 +1,15 @@ # This file is part of Tryton. The COPYRIGHT file at the top level of # this repository contains the full copyright notices and license terms. from trytond.i18n import gettext -from trytond.pool import PoolMeta, Pool from trytond.model import ModelSQL, ModelView, fields - from trytond.modules.product import round_price +from trytond.pool import Pool, PoolMeta +from .common import ( + AmendmentLineMixin, get_shipments_returns, handle_shipment_exception_mixin, + order_line_component_mixin, order_line_mixin, order_mixin, + search_shipments_returns) from .product import ComponentMixin -from .common import order_mixin, order_line_mixin, order_line_component_mixin -from .common import get_shipments_returns, search_shipments_returns -from .common import handle_shipment_exception_mixin -from .common import AmendmentLineMixin class Purchase(order_mixin('purchase'), metaclass=PoolMeta): diff --git a/sale.py b/sale.py index a10834ee4c..4f6490abc0 100644 --- a/sale.py +++ b/sale.py @@ -1,16 +1,15 @@ # This file is part of Tryton. The COPYRIGHT file at the top level of # this repository contains the full copyright notices and license terms. from trytond.i18n import gettext -from trytond.pool import PoolMeta, Pool from trytond.model import ModelSQL, ModelView, fields - from trytond.modules.product import round_price +from trytond.pool import Pool, PoolMeta +from .common import ( + AmendmentLineMixin, get_shipments_returns, handle_shipment_exception_mixin, + order_line_component_mixin, order_line_mixin, order_mixin, + search_shipments_returns) from .product import ComponentMixin -from .common import order_mixin, order_line_mixin, order_line_component_mixin -from .common import get_shipments_returns, search_shipments_returns -from .common import handle_shipment_exception_mixin -from .common import AmendmentLineMixin class Sale(order_mixin('sale'), metaclass=PoolMeta): diff --git a/setup.py b/setup.py index c22ac1d7c9..2ca87be031 100755 --- a/setup.py +++ b/setup.py @@ -6,7 +6,8 @@ import io import os import re from configparser import ConfigParser -from setuptools import setup, find_packages + +from setuptools import find_packages, setup def read(fname): diff --git a/stock.py b/stock.py index db7948e235..789374502f 100644 --- a/stock.py +++ b/stock.py @@ -3,10 +3,9 @@ from decimal import Decimal from trytond.model import fields -from trytond.pool import PoolMeta, Pool -from trytond.transaction import Transaction - from trytond.modules.product import round_price +from trytond.pool import Pool, PoolMeta +from trytond.transaction import Transaction class Move(metaclass=PoolMeta): diff --git a/tests/__init__.py b/tests/__init__.py index 6e5d96c083..a6d5fc6983 100644 --- a/tests/__init__.py +++ b/tests/__init__.py @@ -2,7 +2,8 @@ # this repository contains the full copyright notices and license terms. try: - from trytond.modules.product_kit.tests.test_product_kit import suite # noqa: E501 + from trytond.modules.product_kit.tests.test_product_kit import \ + suite # noqa: E501 except ImportError: from .test_product_kit import suite diff --git a/tests/test_product_kit.py b/tests/test_product_kit.py index ebf74f4f1d..43582db6f1 100644 --- a/tests/test_product_kit.py +++ b/tests/test_product_kit.py @@ -1,13 +1,12 @@ # This file is part of Tryton. The COPYRIGHT file at the top level of # this repository contains the full copyright notices and license terms. -import unittest import doctest +import unittest -from trytond.tests.test_tryton import ModuleTestCase -from trytond.tests.test_tryton import suite as test_suite -from trytond.tests.test_tryton import doctest_teardown -from trytond.tests.test_tryton import doctest_checker from trytond.modules.company.tests import CompanyTestMixin +from trytond.tests.test_tryton import ( + ModuleTestCase, doctest_checker, doctest_teardown) +from trytond.tests.test_tryton import suite as test_suite class ProductKitTestCase(CompanyTestMixin, ModuleTestCase):