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 7b2948584e..61e92b35d5 100644 --- a/__init__.py +++ b/__init__.py @@ -2,13 +2,9 @@ # this repository contains the full copyright notices and license terms. from trytond.pool import Pool -from . import opportunity -from . import configuration -from . import sale -from . import party -from . import account -from . import product -from . import company + +from . import ( + account, company, configuration, opportunity, party, product, sale) def register(): diff --git a/configuration.py b/configuration.py index ae90fed2c3..d41bd03e92 100644 --- a/configuration.py +++ b/configuration.py @@ -2,8 +2,8 @@ # this repository contains the full copyright notices and license terms. from trytond import backend from trytond.model import fields +from trytond.pool import Pool, PoolMeta from trytond.pyson import Eval, Id -from trytond.pool import PoolMeta, Pool class Configuration(metaclass=PoolMeta): diff --git a/opportunity.py b/opportunity.py index d4c8ac9b86..e9a4e273eb 100644 --- a/opportunity.py +++ b/opportunity.py @@ -4,22 +4,21 @@ import datetime from sql import Literal, Null -from sql.aggregate import Max, Count, Sum +from sql.aggregate import Count, Max, Sum from sql.conditionals import Case, Coalesce from sql.functions import Extract from trytond.i18n import gettext -from trytond.model import ModelView, ModelSQL, Workflow, fields, \ - sequence_ordered -from trytond.model.exceptions import AccessError -from trytond.pyson import Eval, In, If, Get, Bool -from trytond.transaction import Transaction -from trytond.pool import Pool - from trytond.ir.attachment import AttachmentCopyMixin from trytond.ir.note import NoteCopyMixin +from trytond.model import ( + ModelSQL, ModelView, Workflow, fields, sequence_ordered) +from trytond.model.exceptions import AccessError from trytond.modules.company.model import employee_field, set_employee from trytond.modules.currency.fields import Monetary +from trytond.pool import Pool +from trytond.pyson import Bool, Eval, Get, If, In +from trytond.transaction import Transaction class SaleOpportunity( diff --git a/sale.py b/sale.py index 3dd377e68a..d39cd4c80d 100644 --- a/sale.py +++ b/sale.py @@ -4,7 +4,7 @@ from functools import wraps from trytond.i18n import gettext from trytond.model.exceptions import AccessError -from trytond.pool import PoolMeta, Pool +from trytond.pool import Pool, PoolMeta from trytond.transaction import Transaction diff --git a/setup.py b/setup.py index 296c57bcd4..9dbe5a0366 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/__init__.py b/tests/__init__.py index 10c1f40590..2c1b1855e3 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.sale_opportunity.tests.test_sale_opportunity import suite # noqa: E501 + from trytond.modules.sale_opportunity.tests.test_sale_opportunity import \ + suite # noqa: E501 except ImportError: from .test_sale_opportunity import suite diff --git a/tests/test_sale_opportunity.py b/tests/test_sale_opportunity.py index e3048729a9..e07af3709d 100644 --- a/tests/test_sale_opportunity.py +++ b/tests/test_sale_opportunity.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 trytond.tests.test_tryton -from trytond.tests.test_tryton import ModuleTestCase -from trytond.tests.test_tryton import doctest_teardown -from trytond.tests.test_tryton import doctest_checker +import unittest +import trytond.tests.test_tryton from trytond.modules.company.tests import CompanyTestMixin +from trytond.tests.test_tryton import ( + ModuleTestCase, doctest_checker, doctest_teardown) class SaleOpportunityTestCase(CompanyTestMixin, ModuleTestCase):