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 6b0b8307dd..1b82d64baa 100644 --- a/__init__.py +++ b/__init__.py @@ -1,8 +1,8 @@ # 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.pool import Pool -from . import notification -from . import ir + +from . import ir, notification def register(): diff --git a/notification.py b/notification.py index 0f60863be4..6fc70eef2a 100644 --- a/notification.py +++ b/notification.py @@ -8,22 +8,22 @@ from email.mime.multipart import MIMEMultipart from email.mime.nonmultipart import MIMENonMultipart from email.utils import getaddresses +from genshi.template import TextTemplate from sql import Null from sql.operators import Concat -from genshi.template import TextTemplate from trytond.config import config from trytond.i18n import gettext -from trytond.model import ModelView, ModelSQL, fields +from trytond.ir.resource import ResourceAccessMixin +from trytond.model import ModelSQL, ModelView, fields from trytond.pool import Pool from trytond.pyson import Eval from trytond.report import get_email -from trytond.sendmail import sendmail_transactional, SMTPDataManager +from trytond.sendmail import SMTPDataManager, sendmail_transactional from trytond.tools.email_ import set_from_header from trytond.transaction import Transaction -from .exceptions import TemplateError -from trytond.ir.resource import ResourceAccessMixin +from .exceptions import TemplateError class Email(ModelSQL, ModelView): diff --git a/setup.py b/setup.py index 5da74e107a..5575be7f87 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 02b460a82a..48ab535d38 100644 --- a/tests/__init__.py +++ b/tests/__init__.py @@ -2,8 +2,8 @@ # this repository contains the full copyright notices and license terms. try: - from trytond.modules.notification_email.tests.test_notification_email \ - import suite + from trytond.modules.notification_email.tests.test_notification_email import ( + suite) except ImportError: from .test_notification_email import suite diff --git a/tests/test_notification_email.py b/tests/test_notification_email.py index 0d836d82e3..21c2f92762 100644 --- a/tests/test_notification_email.py +++ b/tests/test_notification_email.py @@ -3,17 +3,17 @@ import datetime as dt import sys import unittest -from unittest.mock import patch, ANY +from unittest.mock import ANY, patch -from trytond.tests.test_tryton import ModuleTestCase, with_transaction -from trytond.tests.test_tryton import suite as test_suite -from trytond.pool import Pool from trytond.config import config -from trytond.transaction import Transaction - from trytond.modules.company.tests import CompanyTestMixin -from trytond.modules.notification_email import notification \ - as notification_module +from trytond.modules.notification_email import \ + notification as notification_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 FROM = 'tryton@example.com'