From bb8ecbdf1f5cae7d615982a0b36e161995f691d3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Sat, 11 Dec 2021 17:58:45 +0100 Subject: [PATCH] Follow isort formatting issue10928 --- .isort.cfg | 3 +++ __init__.py | 8 +------- account.py | 2 +- party.py | 2 +- product.py | 6 +++--- sale.py | 5 ++--- setup.py | 3 ++- stock.py | 4 ++-- tests/__init__.py | 3 ++- tests/test_web_shop_shopify.py | 5 ++--- web.py | 6 +++--- 11 files changed, 22 insertions(+), 25 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 e761bba82c..fbb2496716 100644 --- a/__init__.py +++ b/__init__.py @@ -3,13 +3,7 @@ from trytond.pool import Pool -from . import ir -from . import web -from . import product -from . import party -from . import sale -from . import account -from . import stock +from . import account, ir, party, product, sale, stock, web __all__ = ['register'] diff --git a/account.py b/account.py index 760bb0cd88..9567c0672a 100644 --- a/account.py +++ b/account.py @@ -4,7 +4,7 @@ from collections import defaultdict from decimal import Decimal from trytond.model import Unique -from trytond.pool import PoolMeta, Pool +from trytond.pool import Pool, PoolMeta from .common import IdentifierMixin diff --git a/party.py b/party.py index 8ee7de9c80..88064080d0 100644 --- a/party.py +++ b/party.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.pool import PoolMeta, Pool +from trytond.pool import Pool, PoolMeta from trytond.tools import remove_forbidden_chars from .common import IdentifiersMixin, setattr_changed diff --git a/product.py b/product.py index a26b6b681a..7d3385b8f7 100644 --- a/product.py +++ b/product.py @@ -2,14 +2,14 @@ # this repository contains the full copyright notices and license terms. from decimal import Decimal -import shopify import pyactiveresource +import shopify from trytond.i18n import gettext from trytond.model import ModelSQL, ModelView, fields from trytond.model.exceptions import AccessError -from trytond.pool import PoolMeta, Pool -from trytond.pyson import Eval, If, Bool +from trytond.pool import Pool, PoolMeta +from trytond.pyson import Bool, Eval, If from trytond.tools import grouped_slice, slugify from .common import IdentifiersMixin, IdentifiersUpdateMixin diff --git a/sale.py b/sale.py index cfd5af89dc..9e3c8152ec 100644 --- a/sale.py +++ b/sale.py @@ -8,14 +8,13 @@ import shopify from trytond.i18n import gettext from trytond.model import Unique, fields -from trytond.pool import PoolMeta, Pool - from trytond.modules.currency.fields import Monetary from trytond.modules.product import round_price from trytond.modules.sale.exceptions import SaleConfirmError +from trytond.pool import Pool, PoolMeta -from .exceptions import ShopifyError from .common import IdentifierMixin +from .exceptions import ShopifyError from .web import BACKOFF_TIME, BACKOFF_TIME_FACTOR diff --git a/setup.py b/setup.py index e410ff37a4..4fbb19aa1f 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/stock.py b/stock.py index 9fb138ad75..1b3742c79d 100644 --- a/stock.py +++ b/stock.py @@ -3,8 +3,8 @@ import shopify from trytond.i18n import lazy_gettext -from trytond.model import ModelSQL, ModelView, fields, Unique -from trytond.pool import PoolMeta, Pool +from trytond.model import ModelSQL, ModelView, Unique, fields +from trytond.pool import Pool, PoolMeta from .common import IdentifierMixin diff --git a/tests/__init__.py b/tests/__init__.py index aced41b1cc..4f6b57cc5c 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.web_shop_shopify.tests.test_web_shop_shopify import suite # noqa: E501 + from trytond.modules.web_shop_shopify.tests.test_web_shop_shopify import \ + suite # noqa: E501 except ImportError: from .test_web_shop_shopify import suite diff --git a/tests/test_web_shop_shopify.py b/tests/test_web_shop_shopify.py index 752d418075..231f9d1fb6 100644 --- a/tests/test_web_shop_shopify.py +++ b/tests/test_web_shop_shopify.py @@ -5,10 +5,9 @@ import doctest import os import unittest -from trytond.tests.test_tryton import ModuleTestCase +from trytond.tests.test_tryton import ( + ModuleTestCase, doctest_checker, doctest_teardown) 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 class WebShopShopifyTestCase(ModuleTestCase): diff --git a/web.py b/web.py index 70eb5d4906..527e7a0f04 100644 --- a/web.py +++ b/web.py @@ -10,9 +10,9 @@ from shopify.api_version import ApiVersion from trytond.cache import Cache from trytond.config import config from trytond.i18n import gettext -from trytond.model import ModelSQL, ModelView, fields, Unique -from trytond.model import sequence_ordered, MatchMixin -from trytond.pool import PoolMeta, Pool +from trytond.model import ( + MatchMixin, ModelSQL, ModelView, Unique, fields, sequence_ordered) +from trytond.pool import Pool, PoolMeta from trytond.pyson import Eval from trytond.transaction import Transaction