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 d8269c6dfa..65af05d122 100644 --- a/__init__.py +++ b/__init__.py @@ -2,12 +2,8 @@ # this repository contains the full copyright notices and license terms. from trytond.pool import Pool -from . import configuration -from . import bom -from . import product -from . import production -from . import stock -from . import ir + +from . import bom, configuration, ir, product, production, stock def register(): diff --git a/bom.py b/bom.py index f2294d4574..f58b93c964 100644 --- a/bom.py +++ b/bom.py @@ -1,9 +1,9 @@ # 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, ModelSQL, DeactivableMixin, fields -from trytond.wizard import Wizard, StateView, Button -from trytond.pyson import Eval +from trytond.model import DeactivableMixin, ModelSQL, ModelView, fields from trytond.pool import Pool +from trytond.pyson import Eval +from trytond.wizard import Button, StateView, Wizard class BOM(DeactivableMixin, ModelSQL, ModelView): diff --git a/configuration.py b/configuration.py index 30445759c7..60a37312a1 100644 --- a/configuration.py +++ b/configuration.py @@ -1,12 +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. from trytond import backend -from trytond.model import ModelView, ModelSQL, ModelSingleton, fields +from trytond.model import ModelSingleton, ModelSQL, ModelView, fields +from trytond.modules.company.model import ( + CompanyMultiValueMixin, CompanyValueMixin) from trytond.pool import Pool from trytond.pyson import Eval, Id from trytond.tools.multivalue import migrate_property -from trytond.modules.company.model import ( - CompanyMultiValueMixin, CompanyValueMixin) class Configuration( diff --git a/product.py b/product.py index 38f716a987..ba6e0e6502 100644 --- a/product.py +++ b/product.py @@ -1,11 +1,11 @@ # 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.model import ModelView, ModelSQL, MatchMixin, fields, \ - sequence_ordered +from trytond.model import ( + MatchMixin, ModelSQL, ModelView, fields, sequence_ordered) from trytond.model.exceptions import RecursionError -from trytond.pyson import Eval, Get, If, Bool from trytond.pool import PoolMeta +from trytond.pyson import Bool, Eval, Get, If class Template(metaclass=PoolMeta): diff --git a/production.py b/production.py index 84fb233937..46e6ea9ec2 100644 --- a/production.py +++ b/production.py @@ -9,18 +9,16 @@ from sql import Null from sql.conditionals import Coalesce from trytond.i18n import gettext -from trytond.model import ModelView, ModelSQL, Workflow, fields, dualmethod -from trytond.pyson import Eval, Bool, If -from trytond.pool import Pool -from trytond.transaction import Transaction - +from trytond.model import ModelSQL, ModelView, Workflow, dualmethod, fields from trytond.modules.company.model import employee_field, set_employee from trytond.modules.product import price_digits, round_price from trytond.modules.stock.shipment import ShipmentAssignMixin +from trytond.pool import Pool +from trytond.pyson import Bool, Eval, If +from trytond.transaction import Transaction from .exceptions import CostWarning - BOM_CHANGES = ['bom', 'product', 'quantity', 'uom', 'warehouse', 'location', 'company', 'inputs', 'outputs'] diff --git a/setup.py b/setup.py index 160d1a6fd1..f330b57e5f 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 db418eaf91..a832214fe0 100644 --- a/stock.py +++ b/stock.py @@ -1,8 +1,8 @@ # 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 fields -from trytond.pyson import Eval from trytond.pool import PoolMeta +from trytond.pyson import Eval class Location(metaclass=PoolMeta): diff --git a/tests/test_production.py b/tests/test_production.py index 627c0c8041..dd1c738795 100644 --- a/tests/test_production.py +++ b/tests/test_production.py @@ -1,16 +1,14 @@ # 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 datetime +import doctest +import unittest import trytond.tests.test_tryton -from trytond.tests.test_tryton import ModuleTestCase, with_transaction -from trytond.tests.test_tryton import doctest_teardown -from trytond.tests.test_tryton import doctest_checker -from trytond.pool import Pool - from trytond.modules.company.tests import CompanyTestMixin +from trytond.pool import Pool +from trytond.tests.test_tryton import ( + ModuleTestCase, doctest_checker, doctest_teardown, with_transaction) class ProductionTestCase(CompanyTestMixin, ModuleTestCase):