From 6c9c625f70aa7cdca860515693c0e65a49df8554 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Sat, 11 Dec 2021 17:58:41 +0100 Subject: [PATCH] Follow isort formatting issue10928 --- .isort.cfg | 3 +++ __init__.py | 5 ++--- account.py | 12 ++++++------ party.py | 4 ++-- payment.py | 18 +++++++++--------- setup.py | 3 ++- tests/__init__.py | 3 ++- tests/test_account_payment.py | 11 +++++------ 8 files changed, 31 insertions(+), 28 deletions(-) create mode 100644 .isort.cfg 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 f890c84a18..a6aea7a07f 100644 --- a/__init__.py +++ b/__init__.py @@ -1,9 +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.pool import Pool -from . import payment -from . import account -from . import party + +from . import account, party, payment def register(): diff --git a/account.py b/account.py index ad69ec5d30..51428836a1 100644 --- a/account.py +++ b/account.py @@ -9,15 +9,15 @@ from sql.functions import Abs from trytond import backend from trytond.i18n import gettext -from trytond.pool import Pool, PoolMeta from trytond.model import ModelSQL, ModelView, fields -from trytond.pyson import Eval, Id -from trytond.wizard import (Wizard, StateView, StateAction, StateTransition, - Button) -from trytond.transaction import Transaction -from trytond.tools.multivalue import migrate_property from trytond.modules.company.model import CompanyValueMixin from trytond.modules.currency.fields import Monetary +from trytond.pool import Pool, PoolMeta +from trytond.pyson import Eval, Id +from trytond.tools.multivalue import migrate_property +from trytond.transaction import Transaction +from trytond.wizard import ( + Button, StateAction, StateTransition, StateView, Wizard) from .exceptions import BlockedWarning, GroupWarning from .payment import KINDS diff --git a/party.py b/party.py index 3683b62b00..f4ce65a298 100644 --- a/party.py +++ b/party.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.pool import PoolMeta, Pool from trytond.model import ( - ModelSQL, ModelView, sequence_ordered, MatchMixin, fields) + MatchMixin, ModelSQL, ModelView, fields, sequence_ordered) from trytond.modules.company.model import CompanyValueMixin from trytond.modules.party.exceptions import EraseError +from trytond.pool import Pool, PoolMeta from trytond.pyson import Eval payment_direct_debit = fields.Boolean( diff --git a/payment.py b/payment.py index 33a2fc8f91..09bc0317f2 100644 --- a/payment.py +++ b/payment.py @@ -4,22 +4,22 @@ from collections import defaultdict from decimal import Decimal from itertools import groupby -from sql.aggregate import Sum, Count +from sql.aggregate import Count, Sum from trytond.i18n import gettext from trytond.model import ( - Workflow, ModelView, ModelSQL, DeactivableMixin, fields) + DeactivableMixin, ModelSQL, ModelView, Workflow, fields) from trytond.model.exceptions import AccessError +from trytond.modules.company.model import ( + employee_field, reset_employee, set_employee) +from trytond.modules.currency.fields import Monetary +from trytond.pool import Pool from trytond.pyson import Eval, If from trytond.rpc import RPC -from trytond.tools import reduce_ids, grouped_slice, cursor_dict +from trytond.tools import ( + cursor_dict, grouped_slice, reduce_ids, sortable_values) from trytond.transaction import Transaction -from trytond.tools import sortable_values -from trytond.wizard import Wizard, StateView, StateAction, Button -from trytond.pool import Pool -from trytond.modules.company.model import ( - employee_field, set_employee, reset_employee) -from trytond.modules.currency.fields import Monetary +from trytond.wizard import Button, StateAction, StateView, Wizard from .exceptions import OverpayWarning diff --git a/setup.py b/setup.py index 59e198a2f5..8095649ac4 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 c76d4a133a..6482b9ad19 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_payment.tests.test_account_payment import suite # noqa: E501 + from trytond.modules.account_payment.tests.test_account_payment import \ + suite # noqa: E501 except ImportError: from .test_account_payment import suite diff --git a/tests/test_account_payment.py b/tests/test_account_payment.py index feb954b4b8..02e3c7d841 100644 --- a/tests/test_account_payment.py +++ b/tests/test_account_payment.py @@ -1,14 +1,13 @@ # 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 ( - PartyCompanyCheckEraseMixin, CompanyTestMixin) + CompanyTestMixin, PartyCompanyCheckEraseMixin) +from trytond.tests.test_tryton import ( + ModuleTestCase, doctest_checker, doctest_teardown) class AccountPaymentTestCase(