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 3967171fea..bbfd02a2bf 100644 --- a/__init__.py +++ b/__init__.py @@ -2,10 +2,8 @@ # this repository contains the full copyright notices and license terms. from trytond.pool import Pool -from . import journal -from . import statement -from . import account -from . import party + +from . import account, journal, party, statement def register(): diff --git a/account.py b/account.py index 450de10e93..ef4ebcaa79 100644 --- a/account.py +++ b/account.py @@ -7,11 +7,10 @@ from sql.operators import Concat from trytond.i18n import gettext from trytond.model import ModelView -from trytond.pool import PoolMeta, Pool -from trytond.transaction import Transaction -from trytond.tools import grouped_slice, reduce_ids - from trytond.modules.account.exceptions import PostError +from trytond.pool import Pool, PoolMeta +from trytond.tools import grouped_slice, reduce_ids +from trytond.transaction import Transaction class Journal(metaclass=PoolMeta): diff --git a/journal.py b/journal.py index 2945063c5e..49e4b92fa4 100644 --- a/journal.py +++ b/journal.py @@ -3,10 +3,10 @@ from sql import Table from trytond import backend -from trytond.model import ModelView, ModelSQL, DeactivableMixin, fields, Unique -from trytond.transaction import Transaction +from trytond.model import DeactivableMixin, ModelSQL, ModelView, Unique, fields from trytond.pool import Pool from trytond.pyson import Eval +from trytond.transaction import Transaction class Journal(DeactivableMixin, ModelSQL, ModelView): diff --git a/setup.py b/setup.py index 6626e76759..d57e84b852 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/statement.py b/statement.py index 3fffb1c97a..30cb672564 100644 --- a/statement.py +++ b/statement.py @@ -1,28 +1,29 @@ # 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 collections import defaultdict, namedtuple from decimal import Decimal -from collections import namedtuple, defaultdict from itertools import groupby from sql import Null -from sql.conditionals import Coalesce from sql.aggregate import Max, Sum +from sql.conditionals import Coalesce from trytond.config import config from trytond.i18n import gettext -from trytond.model import Workflow, ModelView, ModelSQL, fields, Check, \ - sequence_ordered, DictSchemaMixin +from trytond.model import ( + Check, DictSchemaMixin, ModelSQL, ModelView, Workflow, fields, + sequence_ordered) from trytond.model.exceptions import AccessError -from trytond.pyson import Eval, If, Bool -from trytond.transaction import Transaction -from trytond.pool import Pool -from trytond.rpc import RPC -from trytond.wizard import Wizard, StateView, StateAction, Button from trytond.modules.company import CompanyReport from trytond.modules.currency.fields import Monetary +from trytond.pool import Pool +from trytond.pyson import Bool, Eval, If +from trytond.rpc import RPC +from trytond.transaction import Transaction +from trytond.wizard import Button, StateAction, StateView, Wizard from .exceptions import ( - StatementValidateError, StatementValidateWarning, StatementPostError) + StatementPostError, StatementValidateError, StatementValidateWarning) if config.getboolean('account_statement', 'filestore', default=False): file_id = 'origin_file_id' diff --git a/tests/__init__.py b/tests/__init__.py index a0c6aba0ff..1ae9b49603 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.account_statement.tests.test_account_statement import suite # noqa: E501 + from trytond.modules.account_statement.tests.test_account_statement import \ + suite # noqa: E501 except ImportError: from .test_account_statement import suite diff --git a/tests/test_account_statement.py b/tests/test_account_statement.py index 390c1ae116..1df9832fed 100644 --- a/tests/test_account_statement.py +++ b/tests/test_account_statement.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 AccountStatementTestCase(CompanyTestMixin, ModuleTestCase):