From 55da4b49bd615025d12b47c2467adfa307e9360f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Sat, 11 Dec 2021 17:58:44 +0100 Subject: [PATCH] Follow isort formatting issue10928 --- .isort.cfg | 3 +++ __init__.py | 3 +-- carrier.py | 2 +- setup.py | 3 ++- stock.py | 13 +++++++------ tests/__init__.py | 3 ++- tests/test_shipping_ups.py | 4 ++-- 7 files changed, 18 insertions(+), 13 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 e9a2bd9ab3..9e8d4a2292 100644 --- a/__init__.py +++ b/__init__.py @@ -3,8 +3,7 @@ from trytond.pool import Pool -from . import carrier -from . import stock +from . import carrier, stock def register(): diff --git a/carrier.py b/carrier.py index a7e5b040ed..ab14bec156 100644 --- a/carrier.py +++ b/carrier.py @@ -1,7 +1,7 @@ # 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, ModelView, MatchMixin, sequence_ordered, fields) + MatchMixin, ModelSQL, ModelView, fields, sequence_ordered) from trytond.pool import PoolMeta from trytond.pyson import Eval diff --git a/setup.py b/setup.py index 2c5295abbe..1ada1d0b50 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 089abd73bb..21b86e48ae 100644 --- a/stock.py +++ b/stock.py @@ -1,23 +1,24 @@ # 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 re import base64 -import requests +import re import ssl import urllib.parse from itertools import zip_longest +import requests + from trytond.config import config from trytond.i18n import gettext from trytond.model import fields from trytond.model.exceptions import AccessError -from trytond.pool import Pool, PoolMeta -from trytond.transaction import Transaction -from trytond.wizard import Wizard, StateTransition, StateAction - from trytond.modules.stock_package_shipping.exceptions import ( PackingValidationError) +from trytond.pool import Pool, PoolMeta +from trytond.transaction import Transaction +from trytond.wizard import StateAction, StateTransition, Wizard + from .exceptions import UPSError SERVER_URLS = { diff --git a/tests/__init__.py b/tests/__init__.py index bbe56175cf..dde0767997 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.stock_package_shipping_ups.tests.test_shipping_ups import suite # noqa: E501 + from trytond.modules.stock_package_shipping_ups.tests.test_shipping_ups import \ + suite # noqa: E501 except ImportError: from .test_shipping_ups import suite diff --git a/tests/test_shipping_ups.py b/tests/test_shipping_ups.py index 71da8a73d3..5ec6d84cbb 100644 --- a/tests/test_shipping_ups.py +++ b/tests/test_shipping_ups.py @@ -5,9 +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, doctest_checker class ShippingUpsTestCase(ModuleTestCase):