diff --git a/plone/app/discussion/browser/validator.py b/plone/app/discussion/browser/validator.py index 87d4914..9c5b5dd 100644 --- a/plone/app/discussion/browser/validator.py +++ b/plone/app/discussion/browser/validator.py @@ -32,7 +32,7 @@ except ImportError: pass try: - from plone.formwidget.recaptcha.validator import WrongCaptchaCode + from plone.formwidget.recaptcha.validator import WrongCaptchaCode # noqa except ImportError: pass diff --git a/plone/app/discussion/testing.py b/plone/app/discussion/testing.py index 39e5221..400ab9c 100644 --- a/plone/app/discussion/testing.py +++ b/plone/app/discussion/testing.py @@ -9,7 +9,7 @@ from plone.app.testing import FunctionalTesting from zope.configuration import xmlconfig try: - import plone.app.collection + import plone.app.collection # noqa COLLECTION_TYPE = "Collection" except: COLLECTION_TYPE = "Topic" diff --git a/plone/app/discussion/upgrades.py b/plone/app/discussion/upgrades.py index 9b255e3..bf9df71 100644 --- a/plone/app/discussion/upgrades.py +++ b/plone/app/discussion/upgrades.py @@ -6,4 +6,3 @@ from plone.app.discussion.interfaces import IDiscussionSettings def update_registry(context): registry = getUtility(IRegistry) registry.registerInterface(IDiscussionSettings) - diff --git a/plone/app/discussion/vocabularies.py b/plone/app/discussion/vocabularies.py index 78f50ff..b811dce 100644 --- a/plone/app/discussion/vocabularies.py +++ b/plone/app/discussion/vocabularies.py @@ -6,28 +6,28 @@ from plone.app.discussion.interfaces import _ HAS_CAPTCHA = False try: - import plone.formwidget.captcha + import plone.formwidget.captcha # noqa HAS_CAPTCHA = True # pragma: no cover except ImportError: pass HAS_RECAPTCHA = False try: - import plone.formwidget.recaptcha + import plone.formwidget.recaptcha # noqa HAS_RECAPTCHA = True # pragma: no cover except ImportError: pass HAS_AKISMET = False try: - import collective.akismet + import collective.akismet # noqa HAS_AKISMET = True # pragma: no cover except ImportError: pass HAS_NOROBOTS = False try: - import collective.z3cform.norobots + import collective.z3cform.norobots # noqa HAS_NOROBOTS = True # pragma: no cover except ImportError: pass