Remove "Plone 3 only" code; Do not monkey patch the BAD_TYPES vocabulary or plone.app.vocabularies anymore.

svn path=/plone.app.discussion/trunk/; revision=47311

plone/app/discussion/browser/captcha.zcml

@@ -4,21 +4,6 @@
     xmlns:zcml="http://namespaces.zope.org/zcml"
     i18n_domain="plone.app.discussion">
 
-    <!--
-      Plone 3 fixes
-
-      Plone 3 / Zope 2.10 does not recognize the meta:provides feature.
-      Therefore we claim to provide this feature when a suitable package is
-      installed.
-    -->
-    <configure zcml:condition="installed plone.formwidget.captcha">
-        <meta:provides feature="plone.app.discussion-captcha" />
-    </configure>
-
-    <configure zcml:condition="installed plone.formwidget.recaptcha">
-        <meta:provides feature="plone.app.discussion-captcha" />
-    </configure>
-
     <!-- Captcha comment form extender -->
     <configure zcml:condition="have plone.app.discussion-captcha">
         <!--

plone/app/discussion/browser/moderation.py

@@ -11,26 +11,6 @@ from Products.statusmessages.interfaces import IStatusMessage
 from plone.app.discussion.interfaces import _
 from plone.app.discussion.interfaces import IComment
 
-# Begin ugly hack. It works around a ContentProviderLookupError:
-# plone.htmlhead error caused by Zope 2 permissions.
-# This error occured on Plone 3.3.x only!
-#
-# Source:
-# http://athenageek.wordpress.com/2008/01/08/
-# contentproviderlookuperror-plonehtmlhead/
-#
-# Bug report: https://bugs.launchpad.net/zope2/+bug/176566
-#
-
-def _getContext(self): # pragma: no cover
-    self = self.aq_parent
-    while getattr(self, '_is_wrapperish', None):
-        self = self.aq_parent
-    return self
-
-ZopeTwoPageTemplateFile._getContext = _getContext # pragma: no cover
-# End ugly hack.
-
 
 class View(BrowserView):
     """Main moderation View.