From 94ab2b61e5233784dea0ffe64bfe0c2947dbd12d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Sat, 11 Dec 2021 17:58:43 +0100 Subject: [PATCH] Follow isort formatting issue10928 --- .isort.cfg | 3 +++ __init__.py | 6 ++---- account.py | 5 ++--- product.py | 2 +- sale.py | 13 ++++++------- setup.py | 3 ++- tests/__init__.py | 3 ++- tests/test_sale_gift_card.py | 11 ++++------- 8 files changed, 22 insertions(+), 24 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 7c42ce1bb1..6a12ebf437 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 account -from . import product -from . import sale -from . import stock + +from . import account, product, sale, stock __all__ = ['register'] diff --git a/account.py b/account.py index 403e5cb70f..e760362ed6 100644 --- a/account.py +++ b/account.py @@ -1,10 +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 ModelSQL, fields -from trytond.pool import PoolMeta, Pool -from trytond.pyson import Eval, Bool, If - from trytond.modules.company.model import CompanyValueMixin +from trytond.pool import Pool, PoolMeta +from trytond.pyson import Bool, Eval, If class Configuration(metaclass=PoolMeta): diff --git a/product.py b/product.py index 0b87493127..daf50b5e27 100644 --- a/product.py +++ b/product.py @@ -2,7 +2,7 @@ # this repository contains the full copyright notices and license terms. from trytond.i18n import gettext from trytond.model import fields -from trytond.pool import PoolMeta, Pool +from trytond.pool import Pool, PoolMeta from trytond.pyson import Eval from trytond.transaction import Transaction diff --git a/sale.py b/sale.py index aba86cb6c5..c7c7d572d4 100644 --- a/sale.py +++ b/sale.py @@ -6,17 +6,16 @@ from sql import Null from sql.operators import Equal from trytond.config import config -from trytond.model import ModelSQL, ModelView, Workflow, Exclude, fields -from trytond.pool import PoolMeta, Pool -from trytond.pyson import Eval, Bool, Id +from trytond.model import Exclude, ModelSQL, ModelView, Workflow, fields +from trytond.modules.company.model import CompanyValueMixin +from trytond.modules.currency.fields import Monetary +from trytond.pool import Pool, PoolMeta +from trytond.pyson import Bool, Eval, Id from trytond.report import Report, get_email from trytond.sendmail import sendmail_transactional from trytond.tools.email_ import set_from_header from trytond.transaction import Transaction -from trytond.wizard import StateView, StateTransition, Button - -from trytond.modules.company.model import CompanyValueMixin -from trytond.modules.currency.fields import Monetary +from trytond.wizard import Button, StateTransition, StateView class Configuration(metaclass=PoolMeta): diff --git a/setup.py b/setup.py index 1f9dbc24a0..be5c849df4 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 243eb5f080..8e1f3e9265 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_gift_card.tests.test_sale_gift_card import suite # noqa: E501 + from trytond.modules.sale_gift_card.tests.test_sale_gift_card import \ + suite # noqa: E501 except ImportError: from .test_sale_gift_card import suite diff --git a/tests/test_sale_gift_card.py b/tests/test_sale_gift_card.py index febfbb3fad..94678cf534 100644 --- a/tests/test_sale_gift_card.py +++ b/tests/test_sale_gift_card.py @@ -1,16 +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 doctest import unittest -import doctest - -from trytond.tests.test_tryton import ModuleTestCase -from trytond.tests.test_tryton import suite as test_suite -from trytond.tests.test_tryton import doctest_teardown -from trytond.tests.test_tryton import doctest_checker - from trytond.modules.company.tests import CompanyTestMixin +from trytond.tests.test_tryton import ( + ModuleTestCase, doctest_checker, doctest_teardown) +from trytond.tests.test_tryton import suite as test_suite class SaleGiftCardTestCase(CompanyTestMixin, ModuleTestCase):