From 19571f45ed62a5df96d0fad826ba59c80b4e1418 Mon Sep 17 00:00:00 2001 From: "Jens W. Klein" Date: Sun, 1 May 2022 23:27:37 +0200 Subject: [PATCH] remove six plus some bbb cleanup --- plone/app/discussion/browser/comments.py | 2 +- plone/app/discussion/catalog.py | 4 -- plone/app/discussion/comment.py | 3 - plone/app/discussion/conversation.py | 1 - plone/app/discussion/tests/test_comment.py | 5 +- .../app/discussion/tests/test_conversation.py | 66 +++++++------------ setup.py | 11 +--- 7 files changed, 28 insertions(+), 64 deletions(-) diff --git a/plone/app/discussion/browser/comments.py b/plone/app/discussion/browser/comments.py index 817ad22..0ab018f 100644 --- a/plone/app/discussion/browser/comments.py +++ b/plone/app/discussion/browser/comments.py @@ -19,7 +19,7 @@ from Products.CMFCore.utils import getToolByName from Products.CMFPlone.utils import safe_unicode from Products.Five.browser.pagetemplatefile import ViewPageTemplateFile from Products.statusmessages.interfaces import IStatusMessage -from six.moves.urllib.parse import quote +from urllib.parse import quote from z3c.form import button from z3c.form import field from z3c.form import form diff --git a/plone/app/discussion/catalog.py b/plone/app/discussion/catalog.py index 0da596e..91b683d 100644 --- a/plone/app/discussion/catalog.py +++ b/plone/app/discussion/catalog.py @@ -12,8 +12,6 @@ from Products.CMFCore.interfaces import IContentish from Products.CMFPlone.utils import safe_unicode from Products.ZCatalog.interfaces import IZCatalog -import six - MAX_DESCRIPTION = 25 @@ -75,8 +73,6 @@ def creator(object): if not object.creator: return value = safe_unicode(object.creator) - if six.PY2: - return value.encode("utf8") return value diff --git a/plone/app/discussion/comment.py b/plone/app/discussion/comment.py index 4e515b8..a2bef65 100644 --- a/plone/app/discussion/comment.py +++ b/plone/app/discussion/comment.py @@ -39,7 +39,6 @@ from zope.i18nmessageid import Message from zope.interface import implementer import logging -import six COMMENT_TITLE = _( @@ -161,8 +160,6 @@ class Comment( text = self.text if text is None: return "" - if six.PY2 and isinstance(text, str): - text = text.encode("utf8") transform = transforms.convertTo( targetMimetype, text, context=self, mimetype=sourceMimetype ) diff --git a/plone/app/discussion/conversation.py b/plone/app/discussion/conversation.py index e42cc41..8af1b71 100644 --- a/plone/app/discussion/conversation.py +++ b/plone/app/discussion/conversation.py @@ -36,7 +36,6 @@ from zope.lifecycleevent import ObjectAddedEvent from zope.lifecycleevent import ObjectCreatedEvent from zope.lifecycleevent import ObjectRemovedEvent -import six import time diff --git a/plone/app/discussion/tests/test_comment.py b/plone/app/discussion/tests/test_comment.py index 3d16fea..17bcb64 100644 --- a/plone/app/discussion/tests/test_comment.py +++ b/plone/app/discussion/tests/test_comment.py @@ -2,9 +2,7 @@ from plone.app.discussion.browser.comment import View from plone.app.discussion.interfaces import IComment from plone.app.discussion.interfaces import IConversation from plone.app.discussion.interfaces import IReplies -from plone.app.discussion.testing import ( # noqa - PLONE_APP_DISCUSSION_INTEGRATION_TESTING, -) +from plone.app.discussion.testing import PLONE_APP_DISCUSSION_INTEGRATION_TESTING from plone.app.testing import setRoles from plone.app.testing import TEST_USER_ID from Products.CMFCore.utils import getToolByName @@ -13,7 +11,6 @@ from zope.component import getMultiAdapter import datetime import logging -import six import unittest diff --git a/plone/app/discussion/tests/test_conversation.py b/plone/app/discussion/tests/test_conversation.py index c749f53..9cbfbc8 100644 --- a/plone/app/discussion/tests/test_conversation.py +++ b/plone/app/discussion/tests/test_conversation.py @@ -7,12 +7,11 @@ from plone.app.discussion.interfaces import IComment from plone.app.discussion.interfaces import IConversation from plone.app.discussion.interfaces import IDiscussionSettings from plone.app.discussion.interfaces import IReplies -from plone.app.discussion.testing import ( # noqa - PLONE_APP_DISCUSSION_INTEGRATION_TESTING, -) +from plone.app.discussion.testing import PLONE_APP_DISCUSSION_INTEGRATION_TESTING from plone.app.testing import setRoles from plone.app.testing import TEST_USER_ID from plone.app.vocabularies.types import BAD_TYPES +from plone.dexterity.interfaces import IDexterityContent from plone.registry.interfaces import IRegistry from Products.CMFCore.utils import getToolByName from zope import interface @@ -20,18 +19,9 @@ from zope.annotation.interfaces import IAnnotations from zope.component import createObject from zope.component import queryUtility -import six import unittest -try: - from plone.dexterity.interfaces import IDexterityContent - - DEXTERITY = True -except ImportError: - DEXTERITY = False - - class ConversationTest(unittest.TestCase): layer = PLONE_APP_DISCUSSION_INTEGRATION_TESTING @@ -688,11 +678,10 @@ class ConversationEnabledForDexterityTypesTest(unittest.TestCase): interfaces.IDiscussionLayer, ) - if DEXTERITY: - interface.alsoProvides( - self.portal.doc1, - IDexterityContent, - ) + interface.alsoProvides( + self.portal.doc1, + IDexterityContent, + ) def _makeOne(self, *args, **kw): return self.portal.doc1.restrictedTraverse("@@conversation_view") @@ -708,38 +697,33 @@ class ConversationEnabledForDexterityTypesTest(unittest.TestCase): document_fti.manage_changeProperties(allow_discussion=allow_discussion) def test_conversation_is_not_enabled_by_default(self): - if DEXTERITY: - conversation = self._makeOne(self.portal.doc1) - self.assertFalse(conversation.enabled()) + conversation = self._makeOne(self.portal.doc1) + self.assertFalse(conversation.enabled()) def test_conversation_is_not_enabled_by_default_on_portal_type(self): - if DEXTERITY: - self._globally_enable_discussion(True) - conversation = self._makeOne(self.portal.doc1) - self.assertFalse(conversation.enabled()) + self._globally_enable_discussion(True) + conversation = self._makeOne(self.portal.doc1) + self.assertFalse(conversation.enabled()) def test_conversation_needs_to_be_enabled_globally_and_for_type(self): - if DEXTERITY: - self._globally_enable_discussion(True) - self._enable_discussion_on_portal_type("Document", True) - conversation = self._makeOne(self.portal.doc1) - self.assertTrue(conversation.enabled()) + self._globally_enable_discussion(True) + self._enable_discussion_on_portal_type("Document", True) + conversation = self._makeOne(self.portal.doc1) + self.assertTrue(conversation.enabled()) def test_disable_discussion(self): - if DEXTERITY: - self._globally_enable_discussion(True) - self._enable_discussion_on_portal_type("Document", True) - self.portal.doc1.allow_discussion = False - conversation = self._makeOne(self.portal.doc1) - self.assertFalse(conversation.enabled()) + self._globally_enable_discussion(True) + self._enable_discussion_on_portal_type("Document", True) + self.portal.doc1.allow_discussion = False + conversation = self._makeOne(self.portal.doc1) + self.assertFalse(conversation.enabled()) def test_enable_discussion(self): - if DEXTERITY: - self._globally_enable_discussion(True) - self._enable_discussion_on_portal_type("Document", True) - self.portal.doc1.allow_discussion = True - conversation = self._makeOne(self.portal.doc1) - self.assertTrue(conversation.enabled()) + self._globally_enable_discussion(True) + self._enable_discussion_on_portal_type("Document", True) + self.portal.doc1.allow_discussion = True + conversation = self._makeOne(self.portal.doc1) + self.assertTrue(conversation.enabled()) class RepliesTest(unittest.TestCase): diff --git a/setup.py b/setup.py index fbc4639..3b2c629 100644 --- a/setup.py +++ b/setup.py @@ -10,18 +10,9 @@ install_requires = [ "plone.app.registry", "plone.app.uuid", "plone.app.z3cform", + "plone.base", "plone.indexer", - "plone.registry", "plone.z3cform", - "six", - "ZODB3", - "zope.interface", - "zope.component", - "zope.annotation", - "zope.event", - "zope.container", - "zope.lifecycleevent", - "zope.site", "z3c.form>=2.3.3", ]