From 872e2279bd80a3e09ed478eb252cbde344bdaedf 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 | 7 +++---- tests/__init__.py | 3 ++- tests/test_stock_package_shipping_mygls.py | 5 ++--- 7 files changed, 14 insertions(+), 12 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 6003bc8d72..b0b9a91c04 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 __all__ = ['register'] diff --git a/carrier.py b/carrier.py index 95bd83f420..27d1065006 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, If diff --git a/setup.py b/setup.py index 64574c4104..b51bddc0c8 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 0138586954..c923d8abe0 100644 --- a/stock.py +++ b/stock.py @@ -8,12 +8,11 @@ from PyPDF2 import PdfFileReader, PdfFileWriter from trytond.i18n import gettext from trytond.model import fields from trytond.model.exceptions import AccessError -from trytond.pool import PoolMeta, Pool -from trytond.transaction import Transaction -from trytond.wizard import Wizard, StateAction, StateTransition - 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 .api import get_client, get_request from .exceptions import MyGLSError diff --git a/tests/__init__.py b/tests/__init__.py index ba545e2ec5..8b717fe8cf 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_mygls.tests.test_stock_package_shipping_mygls import suite # noqa: E501 + from trytond.modules.stock_package_shipping_mygls.tests.test_stock_package_shipping_mygls import \ + suite # noqa: E501 except ImportError: from .test_stock_package_shipping_mygls import suite diff --git a/tests/test_stock_package_shipping_mygls.py b/tests/test_stock_package_shipping_mygls.py index 47e472b102..e07097e01a 100644 --- a/tests/test_stock_package_shipping_mygls.py +++ b/tests/test_stock_package_shipping_mygls.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 StockPackageShippingMyglsTestCase(ModuleTestCase):