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 7493f3b7d5..1a4d7fee42 100644 --- a/__init__.py +++ b/__init__.py @@ -2,10 +2,8 @@ # this repository contains the full copyright notices and license terms. from trytond.pool import Pool -from . import marketing -from . import ir -from . import web -from . import routes + +from . import ir, marketing, routes, web __all__ = ['register', 'routes'] diff --git a/marketing.py b/marketing.py index bf0181954a..eb09f1eff8 100644 --- a/marketing.py +++ b/marketing.py @@ -8,10 +8,11 @@ from email.mime.text import MIMEText from email.utils import formataddr, getaddresses from functools import lru_cache from urllib.parse import ( - parse_qs, parse_qsl, urlencode, urlsplit, urlunsplit, urljoin) + parse_qs, parse_qsl, urlencode, urljoin, urlsplit, urlunsplit) +from genshi.core import END, START, Attrs, QName from genshi.template import MarkupTemplate -from genshi.core import START, END, QName, Attrs + try: import html2text except ImportError: @@ -21,17 +22,16 @@ from trytond.config import config from trytond.i18n import gettext from trytond.ir.session import token_hex from trytond.model import ( - DeactivableMixin, Workflow, ModelSQL, ModelView, Unique, fields) + DeactivableMixin, ModelSQL, ModelView, Unique, Workflow, fields) from trytond.pool import Pool from trytond.pyson import Eval -from trytond.report import Report -from trytond.report import get_email -from trytond.sendmail import sendmail_transactional, SMTPDataManager +from trytond.report import Report, get_email +from trytond.sendmail import SMTPDataManager, sendmail_transactional from trytond.tools import grouped_slice from trytond.tools.email_ import set_from_header from trytond.transaction import Transaction from trytond.url import http_host -from trytond.wizard import Wizard, StateView, StateTransition, Button +from trytond.wizard import Button, StateTransition, StateView, Wizard from .exceptions import TemplateError diff --git a/setup.py b/setup.py index 878bd23924..8754d5bbe3 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 31d9d2bc9c..23f430bfc2 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_email.tests.test_marketing_email import suite # noqa: E501 + from trytond.modules.marketing_email.tests.test_marketing_email import \ + suite # noqa: E501 except ImportError: from .test_marketing_email import suite diff --git a/tests/test_marketing_email.py b/tests/test_marketing_email.py index c89f2f40de..d72121791d 100644 --- a/tests/test_marketing_email.py +++ b/tests/test_marketing_email.py @@ -2,15 +2,15 @@ # this repository contains the full copyright notices and license terms. import unittest -from unittest.mock import patch, ANY, Mock +from unittest.mock import ANY, Mock, patch from trytond.config import config -from trytond.pool import Pool -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.marketing_email import marketing as marketing_module +from trytond.pool import Pool +from trytond.tests.test_tryton import ModuleTestCase +from trytond.tests.test_tryton import suite as test_suite +from trytond.tests.test_tryton import with_transaction +from trytond.transaction import Transaction SUBSCRIBE_URL = 'http://www.example.com/subscribe' UNSUBSCRIBE_URL = 'http://www.example.com/unsubscribe'