From 50f809f0b4b1cec6f7bd8e899da488929c8b0f3e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Sat, 11 Dec 2021 17:58:42 +0100 Subject: [PATCH] Follow isort formatting issue10928 --- .isort.cfg | 3 +++ __init__.py | 7 +------ marketing_automation.py | 18 +++++++++--------- party.py | 1 + routes.py | 6 +++--- sale.py | 1 + setup.py | 3 ++- tests/__init__.py | 3 ++- tests/test_marketing_automation.py | 7 +++---- 9 files changed, 25 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 6aa43f28e3..2dc7405f77 100644 --- a/__init__.py +++ b/__init__.py @@ -3,12 +3,7 @@ from trytond.pool import Pool -from . import ir -from . import marketing_automation -from . import web -from . import party -from . import sale -from . import routes +from . import ir, marketing_automation, party, routes, sale, web __all__ = ['register', 'routes'] diff --git a/marketing_automation.py b/marketing_automation.py index a6d77c16a0..34191691ab 100644 --- a/marketing_automation.py +++ b/marketing_automation.py @@ -9,34 +9,34 @@ from email.mime.multipart import MIMEMultipart from email.mime.text import MIMEText from email.utils import formataddr, getaddresses from urllib.parse import ( - urlsplit, parse_qsl, urlencode, urlunsplit, quote, urljoin) + parse_qsl, quote, urlencode, urljoin, urlsplit, urlunsplit) try: import html2text except ImportError: html2text = None +from genshi.core import END, START, Attrs, QName +from genshi.template import MarkupTemplate, TextTemplate from sql import Literal from sql.aggregate import Count -from sql.functions import Substring, Position -from genshi.template import MarkupTemplate, TextTemplate -from genshi.core import START, END, QName, Attrs +from sql.functions import Position, Substring from trytond.config import config from trytond.i18n import gettext -from trytond.model import (fields, ModelSQL, ModelView, Workflow, Unique, - EvalEnvironment, dualmethod) +from trytond.model import ( + EvalEnvironment, ModelSQL, ModelView, Unique, Workflow, dualmethod, fields) from trytond.pool import Pool -from trytond.pyson import PYSONDecoder, Eval, If +from trytond.pyson import Eval, If, PYSONDecoder from trytond.report import Report -from trytond.sendmail import sendmail_transactional, SMTPDataManager +from trytond.sendmail import SMTPDataManager, sendmail_transactional from trytond.tools import grouped_slice, reduce_ids from trytond.tools.email_ import set_from_header from trytond.transaction import Transaction from trytond.url import http_host from trytond.wsgi import Base64Converter -from .exceptions import DomainError, ConditionError, TemplateError +from .exceptions import ConditionError, DomainError, TemplateError from .mixin import MarketingAutomationMixin if not config.get( diff --git a/party.py b/party.py index 45bedd0566..bf16fc5b20 100644 --- a/party.py +++ b/party.py @@ -2,6 +2,7 @@ # this repository contains the full copyright notices and license terms. from trytond.pool import PoolMeta + from .mixin import MarketingAutomationMixin diff --git a/routes.py b/routes.py index b350d09f03..f822b9873e 100644 --- a/routes.py +++ b/routes.py @@ -1,11 +1,11 @@ # 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 werkzeug.wrappers import Response from werkzeug.utils import redirect +from werkzeug.wrappers import Response -from trytond.transaction import Transaction -from trytond.tools import file_open from trytond.protocols.wrappers import with_pool, with_transaction +from trytond.tools import file_open +from trytond.transaction import Transaction from trytond.wsgi import app diff --git a/sale.py b/sale.py index c72d4e3b81..b18ccdd751 100644 --- a/sale.py +++ b/sale.py @@ -2,6 +2,7 @@ # this repository contains the full copyright notices and license terms. from trytond.pool import PoolMeta + from .mixin import MarketingAutomationMixin diff --git a/setup.py b/setup.py index fb5f4eac80..84bacfefcc 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 c416941c70..34565c760d 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.marketing_automation.tests.test_marketing_automation import suite # noqa: E501 + from trytond.modules.marketing_automation.tests.test_marketing_automation import \ + suite # noqa: E501 except ImportError: from .test_marketing_automation import suite diff --git a/tests/test_marketing_automation.py b/tests/test_marketing_automation.py index dbc1efa8ad..47d9f23606 100644 --- a/tests/test_marketing_automation.py +++ b/tests/test_marketing_automation.py @@ -1,13 +1,12 @@ # 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 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 MarketingAutomationTestCase(ModuleTestCase):