Skip to content

Commit

Permalink
tox-config: isort < 5 (to prevent flake8 failure); reorder imports …
Browse files Browse the repository at this point in the history
…because `isort 4` and `isort 5` do not agree regarding import order
  • Loading branch information
d-maurer committed Jul 17, 2020
1 parent 895596b commit 042bcc1
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 7 deletions.
5 changes: 2 additions & 3 deletions src/Products/MailHost/MailHost.py
Original file line number Diff line number Diff line change
Expand Up @@ -41,16 +41,15 @@
from OFS.role import RoleManager
from OFS.SimpleItem import Item
from Persistence import Persistent
from Products.MailHost.decorator import synchronized
from Products.MailHost.interfaces import IMailHost
from zope.interface import implementer
from zope.sendmail.delivery import DirectMailDelivery
from zope.sendmail.delivery import QueuedMailDelivery
from zope.sendmail.delivery import QueueProcessorThread
from zope.sendmail.maildir import Maildir
from zope.sendmail.mailer import SMTPMailer

from Products.MailHost.decorator import synchronized
from Products.MailHost.interfaces import IMailHost


queue_threads = {} # maps MailHost path -> queue processor threads

Expand Down
1 change: 0 additions & 1 deletion src/Products/MailHost/SendMailTag.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
from DocumentTemplate._DocumentTemplate import render_blocks
from DocumentTemplate.DT_String import String
from DocumentTemplate.DT_Util import parse_params

from Products.MailHost.MailHost import MailBase
from Products.MailHost.MailHost import MailHostError

Expand Down
3 changes: 1 addition & 2 deletions src/Products/MailHost/exportimport.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,10 @@

import six

from zope.component import adapts

from Products.GenericSetup.interfaces import ISetupEnviron
from Products.GenericSetup.utils import XMLAdapterBase
from Products.MailHost.interfaces import IMailHost
from zope.component import adapts


class MailHostXMLAdapter(XMLAdapterBase):
Expand Down
2 changes: 1 addition & 1 deletion tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ commands =
- flake8 --format=html --doctests src setup.py
flake8 --doctests src setup.py
deps =
isort
isort < 5
flake8
# helper to generate HTML reports:
flake8-html
Expand Down

0 comments on commit 042bcc1

Please sign in to comment.