diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index aa2a758a..e13b8669 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -16,7 +16,7 @@ repos: hooks: - id: isort - repo: https://github.com/psf/black - rev: 23.12.1 + rev: 24.1.1 hooks: - id: black - repo: https://github.com/collective/zpretty @@ -32,7 +32,7 @@ repos: # """ ## - repo: https://github.com/PyCQA/flake8 - rev: 6.1.0 + rev: 7.0.0 hooks: - id: flake8 diff --git a/plone/app/discussion/browser/controlpanel.py b/plone/app/discussion/browser/controlpanel.py index b9a3e23b..bb01a60b 100644 --- a/plone/app/discussion/browser/controlpanel.py +++ b/plone/app/discussion/browser/controlpanel.py @@ -41,17 +41,17 @@ def updateFields(self): self.fields["globally_enabled"].widgetFactory = SingleCheckBoxFieldWidget self.fields["moderation_enabled"].widgetFactory = SingleCheckBoxFieldWidget self.fields["edit_comment_enabled"].widgetFactory = SingleCheckBoxFieldWidget - self.fields[ - "delete_own_comment_enabled" - ].widgetFactory = SingleCheckBoxFieldWidget + self.fields["delete_own_comment_enabled"].widgetFactory = ( + SingleCheckBoxFieldWidget + ) self.fields["anonymous_comments"].widgetFactory = SingleCheckBoxFieldWidget self.fields["show_commenter_image"].widgetFactory = SingleCheckBoxFieldWidget - self.fields[ - "moderator_notification_enabled" - ].widgetFactory = SingleCheckBoxFieldWidget - self.fields[ - "user_notification_enabled" - ].widgetFactory = SingleCheckBoxFieldWidget + self.fields["moderator_notification_enabled"].widgetFactory = ( + SingleCheckBoxFieldWidget + ) + self.fields["user_notification_enabled"].widgetFactory = ( + SingleCheckBoxFieldWidget + ) def updateWidgets(self): try: diff --git a/plone/app/discussion/browser/traversal.py b/plone/app/discussion/browser/traversal.py index 863cde26..2216ec09 100644 --- a/plone/app/discussion/browser/traversal.py +++ b/plone/app/discussion/browser/traversal.py @@ -2,6 +2,7 @@ IDiscussion container for the context, from which traversal will continue into an actual comment object. """ + from plone.app.discussion.interfaces import IConversation from zope.component import adapter from zope.component import queryAdapter diff --git a/plone/app/discussion/browser/validator.py b/plone/app/discussion/browser/validator.py index 9d28bd95..755d6e5b 100644 --- a/plone/app/discussion/browser/validator.py +++ b/plone/app/discussion/browser/validator.py @@ -1,5 +1,6 @@ """Captcha validator, see captcha.txt for design notes. """ + from Acquisition import aq_inner from plone.app.discussion.interfaces import ICaptcha from plone.app.discussion.interfaces import IDiscussionLayer diff --git a/plone/app/discussion/catalog.py b/plone/app/discussion/catalog.py index 0387a54d..e9f14176 100644 --- a/plone/app/discussion/catalog.py +++ b/plone/app/discussion/catalog.py @@ -3,6 +3,7 @@ Also provide event handlers to actually catalog the comments. """ + from plone.app.discussion.interfaces import IComment from plone.app.discussion.interfaces import IConversation from plone.app.event.base import DT diff --git a/plone/app/discussion/comment.py b/plone/app/discussion/comment.py index 8f228654..be6c214b 100644 --- a/plone/app/discussion/comment.py +++ b/plone/app/discussion/comment.py @@ -1,5 +1,6 @@ """The default comment class and factory. """ + from AccessControl import ClassSecurityInfo from AccessControl.SecurityManagement import getSecurityManager from Acquisition import aq_base diff --git a/plone/app/discussion/contentrules.py b/plone/app/discussion/contentrules.py index bc752b24..7fb03e74 100644 --- a/plone/app/discussion/contentrules.py +++ b/plone/app/discussion/contentrules.py @@ -1,5 +1,6 @@ """ Content rules handlers """ + from plone.app.discussion import _ diff --git a/plone/app/discussion/conversation.py b/plone/app/discussion/conversation.py index abb35c51..7d605c28 100644 --- a/plone/app/discussion/conversation.py +++ b/plone/app/discussion/conversation.py @@ -9,6 +9,7 @@ manipulating the comments directly in reply to a particular comment or at the top level of the conversation. """ + from .comment import Comment from .interfaces import DISCUSSION_ANNOTATION_KEY as ANNOTATION_KEY from .interfaces import IConversation diff --git a/plone/app/discussion/events.py b/plone/app/discussion/events.py index 3444bbc4..9795a8f0 100644 --- a/plone/app/discussion/events.py +++ b/plone/app/discussion/events.py @@ -1,5 +1,6 @@ """ Custom discussion events """ + from plone.app.discussion.interfaces import ICommentAddedEvent from plone.app.discussion.interfaces import ICommentDeletedEvent from plone.app.discussion.interfaces import ICommentModifiedEvent diff --git a/plone/app/discussion/interfaces.py b/plone/app/discussion/interfaces.py index e53628d8..458c5e31 100644 --- a/plone/app/discussion/interfaces.py +++ b/plone/app/discussion/interfaces.py @@ -1,5 +1,6 @@ """Interfaces for plone.app.discussion """ + from plone.app.discussion import _ from Products.CMFCore.interfaces import ISiteRoot from Products.CMFCore.utils import getToolByName diff --git a/plone/app/discussion/tests/test_catalog.py b/plone/app/discussion/tests/test_catalog.py index 044d18bc..fa75a225 100644 --- a/plone/app/discussion/tests/test_catalog.py +++ b/plone/app/discussion/tests/test_catalog.py @@ -1,5 +1,6 @@ """Test the plone.app.discussion catalog indexes """ + from datetime import datetime from datetime import timezone from plone.app.discussion.interfaces import IConversation diff --git a/plone/app/discussion/tests/test_functional.py b/plone/app/discussion/tests/test_functional.py index 995016ed..b4ce3f0e 100644 --- a/plone/app/discussion/tests/test_functional.py +++ b/plone/app/discussion/tests/test_functional.py @@ -2,6 +2,7 @@ These test are only triggered when Plone 4 (and plone.testing) is installed. """ + from ..testing import PLONE_APP_DISCUSSION_FUNCTIONAL_TESTING # noqa from plone.testing import layered diff --git a/plone/app/discussion/tests/test_indexers.py b/plone/app/discussion/tests/test_indexers.py index 8a7bf192..d442d9a4 100644 --- a/plone/app/discussion/tests/test_indexers.py +++ b/plone/app/discussion/tests/test_indexers.py @@ -1,5 +1,6 @@ """Test for the plone.app.discussion indexers """ + from .. import catalog from ..interfaces import IConversation from ..testing import PLONE_APP_DISCUSSION_INTEGRATION_TESTING # noqa diff --git a/plone/app/discussion/tests/test_workflow.py b/plone/app/discussion/tests/test_workflow.py index 3ecb8eac..ebf6a729 100644 --- a/plone/app/discussion/tests/test_workflow.py +++ b/plone/app/discussion/tests/test_workflow.py @@ -1,5 +1,6 @@ """Test plone.app.discussion workflow and permissions. """ + from ..interfaces import IConversation from ..interfaces import IDiscussionLayer from ..testing import PLONE_APP_DISCUSSION_INTEGRATION_TESTING diff --git a/plone/app/discussion/tool.py b/plone/app/discussion/tool.py index b249ead6..8c447ad2 100644 --- a/plone/app/discussion/tool.py +++ b/plone/app/discussion/tool.py @@ -4,6 +4,7 @@ BBB support for the old portal_discussion is provided in the bbb package. """ + from .interfaces import IComment from .interfaces import ICommentingTool from OFS.SimpleItem import SimpleItem