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 e8f61953ec..eb71449c26 100644 --- a/__init__.py +++ b/__init__.py @@ -2,16 +2,12 @@ # this repository contains the full copyright notices and license terms. from trytond.pool import Pool + from . import routes __all__ = ['register', 'routes'] -from . import carrier -from . import ir -from . import party -from . import product -from . import sale -from . import web +from . import carrier, ir, party, product, sale, web def register(): diff --git a/party.py b/party.py index eae6594428..f7c0b9a1fc 100644 --- a/party.py +++ b/party.py @@ -1,20 +1,21 @@ # 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 stdnum import get_cc_module + try: import phonenumbers - from phonenumbers import PhoneNumberFormat, NumberParseException + from phonenumbers import NumberParseException, PhoneNumberFormat except ImportError: phonenumbers = None 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.tools import remove_forbidden_chars from .exceptions import BadRequest -from .web import split_name, join_name +from .web import join_name, split_name def remove_forbidden_chars(value): diff --git a/product.py b/product.py index ea7ee7da47..3d6784db49 100644 --- a/product.py +++ b/product.py @@ -4,7 +4,7 @@ import json from operator import attrgetter from trytond.model import fields -from trytond.pool import PoolMeta, Pool +from trytond.pool import Pool, PoolMeta from trytond.tools import slugify from .web import ShopVSFIdentifierMixin diff --git a/sale.py b/sale.py index 087fe9becb..c95170bf33 100644 --- a/sale.py +++ b/sale.py @@ -4,9 +4,8 @@ from decimal import Decimal from trytond.i18n import gettext -from trytond.pool import PoolMeta, Pool - from trytond.modules.account.tax import TaxableMixin +from trytond.pool import Pool, PoolMeta from .exceptions import BadRequest from .web import split_name diff --git a/setup.py b/setup.py index 89c0a7e429..7539190a00 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, slice=None): diff --git a/tests/__init__.py b/tests/__init__.py index ddb598e785..338497f514 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_vue_storefront.tests.test_web_shop_vue_storefront import suite # noqa: E501 + from trytond.modules.web_shop_vue_storefront.tests.test_web_shop_vue_storefront import \ + suite # noqa: E501 except ImportError: from .test_web_shop_vue_storefront import suite diff --git a/tests/test_web_shop_vue_storefront.py b/tests/test_web_shop_vue_storefront.py index 08c79080e3..08fced3e3a 100644 --- a/tests/test_web_shop_vue_storefront.py +++ b/tests/test_web_shop_vue_storefront.py @@ -1,22 +1,23 @@ # 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 unittest from contextlib import contextmanager from decimal import Decimal - -from unittest.mock import patch, ANY +from unittest.mock import ANY, patch from werkzeug.exceptions import Unauthorized -from trytond.pool import Pool -from trytond.tests.test_tryton import doctest_teardown, doctest_checker -from trytond.tests.test_tryton import ModuleTestCase, with_transaction -from trytond.tests.test_tryton import suite as test_suite -from trytond.transaction import Transaction from trytond.modules.company.tests import ( - create_company, set_company, CompanyTestMixin) + CompanyTestMixin, create_company, set_company) +from trytond.pool import Pool +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 with_transaction +from trytond.transaction import Transaction + from ..exceptions import LoginException CUSTOMER = { diff --git a/web.py b/web.py index 77b0e8f2c4..4d3b73a219 100644 --- a/web.py +++ b/web.py @@ -3,15 +3,16 @@ from functools import wraps import elasticsearch -from elasticsearch import Elasticsearch, VERSION as ES_VERSION +from elasticsearch import VERSION as ES_VERSION +from elasticsearch import Elasticsearch from trytond.exceptions import RateLimitException -from trytond.i18n import lazy_gettext, gettext +from trytond.i18n import gettext, lazy_gettext from trytond.model import ModelSQL, Unique, fields -from trytond.pool import PoolMeta, Pool +from trytond.pool import Pool, PoolMeta from trytond.pyson import Eval -from .exceptions import LoginException, NotFound, BadRequest +from .exceptions import BadRequest, LoginException, NotFound def migrate_doc_type(func):