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 4314810344..7c35129030 100644 --- a/__init__.py +++ b/__init__.py @@ -2,11 +2,8 @@ # this repository contains the full copyright notices and license terms. from trytond.pool import Pool -from . import ir -from . import uom -from . import category -from . import product -from . import configuration + +from . import category, configuration, ir, product, uom from .product import price_digits, round_price from .uom import uom_conversion_digits diff --git a/category.py b/category.py index e62f351b76..f03b278e27 100644 --- a/category.py +++ b/category.py @@ -1,6 +1,6 @@ # 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, fields, tree +from trytond.model import ModelSQL, ModelView, fields, tree from trytond.pyson import PYSONEncoder diff --git a/configuration.py b/configuration.py index 7b20f5153d..a35634e42a 100644 --- a/configuration.py +++ b/configuration.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 import backend -from trytond.model import (ModelView, ModelSQL, ModelSingleton, - MultiValueMixin, ValueMixin, fields) +from trytond.model import ( + ModelSingleton, ModelSQL, ModelView, MultiValueMixin, ValueMixin, fields) from trytond.pool import Pool -from trytond.tools.multivalue import migrate_property from trytond.pyson import Id +from trytond.tools.multivalue import migrate_property default_cost_price_method = fields.Selection( 'get_cost_price_methods', "Default Cost Method", diff --git a/product.py b/product.py index 8df2fe74b9..c55470bb31 100644 --- a/product.py +++ b/product.py @@ -7,25 +7,25 @@ from importlib import import_module import stdnum import stdnum.exceptions -from sql import Null, Column, Literal +from sql import Column, Literal, Null from sql.operators import Equal +from trytond import backend from trytond.i18n import gettext from trytond.model import ( - ModelView, ModelSQL, Model, UnionMixin, DeactivableMixin, sequence_ordered, - Exclude, fields) -from trytond.pyson import Eval, If, Get -from trytond.transaction import Transaction -from trytond.pool import Pool -from trytond import backend -from trytond.tools import lstrip_wildcard -from trytond.tools.multivalue import migrate_property + DeactivableMixin, Exclude, Model, ModelSQL, ModelView, UnionMixin, fields, + sequence_ordered) from trytond.modules.company.model import ( CompanyMultiValueMixin, CompanyValueMixin) +from trytond.pool import Pool +from trytond.pyson import Eval, Get, If +from trytond.tools import lstrip_wildcard +from trytond.tools.multivalue import migrate_property +from trytond.transaction import Transaction + from .exceptions import InvalidIdentifierCode from .ir import price_decimal - __all__ = ['price_digits', 'round_price', 'TemplateFunction'] logger = logging.getLogger(__name__) diff --git a/setup.py b/setup.py index ce5b623f12..92481d26e9 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/tests/test_product.py b/tests/test_product.py index 9b033663a8..27d4bc8021 100644 --- a/tests/test_product.py +++ b/tests/test_product.py @@ -3,14 +3,13 @@ import doctest import unittest from decimal import Decimal -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.transaction import Transaction -from trytond.pool import Pool +import trytond.tests.test_tryton 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) +from trytond.transaction import Transaction from ..product import round_price diff --git a/uom.py b/uom.py index f5ea20f6ad..74ee707a79 100644 --- a/uom.py +++ b/uom.py @@ -7,8 +7,8 @@ from math import ceil, floor, log10 from trytond.config import config from trytond.i18n import gettext from trytond.model import ( - ModelView, ModelSQL, DeactivableMixin, fields, Check, SymbolMixin, - DigitsMixin) + Check, DeactivableMixin, DigitsMixin, ModelSQL, ModelView, SymbolMixin, + fields) from trytond.model.exceptions import AccessError from trytond.pyson import Eval from trytond.transaction import Transaction