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/tests/test_comment.py

@@ -71,15 +71,7 @@ class CommentTest(PloneTestCase):
         conversation.addComment(comment1)
         comment_brain = self.catalog.searchResults(
                             portal_type = 'Discussion Item')[0]
-
-        # comment should only have a UID if plone.uuid is present
-        try:
-            from plone.uuid.interfaces import IUUID
-            IUUID # pyflakes
-        except ImportError:
-            self.failIf(comment_brain.UID)
-        else:
-            self.failUnless(comment_brain.UID)
+        self.failUnless(comment_brain.UID)
 
     def test_uid_is_unique(self):
         conversation = IConversation(self.portal.doc1)
@@ -89,11 +81,7 @@ class CommentTest(PloneTestCase):
         conversation.addComment(comment2)
         brains = self.catalog.searchResults(
                      portal_type = 'Discussion Item')
-
-        # make sure uids are either both None (i.e. without plone.uuid),
-        # or not equal
-        if brains[0].UID != None or brains[1].UID != None:
-            self.assertNotEquals(brains[0].UID, brains[1].UID)
+        self.assertNotEquals(brains[0].UID, brains[1].UID)
 
     def test_comment_uid_differs_from_content_uid(self):
         conversation = IConversation(self.portal.doc1)