kakshay unittest (#121)

remove unittest2 dependency

CHANGES.rst

@@ -14,7 +14,7 @@ New features:
 
 Bug fixes:
 
-- removed "change portal event" permission
+- Remove unittest2 dependency
   [kakshay21]
 
 

plone/app/discussion/tests/test_catalog.py

@@ -13,7 +13,7 @@ from zope.event import notify
 from zope.lifecycleevent import ObjectModifiedEvent
 
 import transaction
-import unittest2 as unittest
+import unittest
 
 
 class CatalogSetupTest(unittest.TestCase):

plone/app/discussion/tests/test_comment.py

@@ -12,7 +12,7 @@ from zope.component import getMultiAdapter
 
 import datetime
 import logging
-import unittest2 as unittest
+import unittest
 
 
 logger = logging.getLogger('plone.app.discussion.tests')

plone/app/discussion/tests/test_comments_viewlet.py

@@ -30,7 +30,7 @@ from zope.publisher.browser import TestRequest
 from zope.publisher.interfaces.browser import IBrowserRequest
 
 import time
-import unittest2 as unittest
+import unittest
 
 
 class TestCommentForm(unittest.TestCase):

plone/app/discussion/tests/test_contentrules.py

@@ -13,7 +13,7 @@ from plone.stringinterp.interfaces import IStringSubstitution
 from zope.component import createObject
 from zope.component import getAdapter
 
-import unittest2 as unittest
+import unittest
 
 
 class CommentContentRulesTest(unittest.TestCase):

plone/app/discussion/tests/test_controlpanel.py

@@ -9,7 +9,7 @@ from Products.CMFCore.utils import getToolByName
 from zope.component import getMultiAdapter
 from zope.component import queryUtility
 
-import unittest2 as unittest
+import unittest
 
 
 class RegistryTest(unittest.TestCase):

plone/app/discussion/tests/test_conversation.py

@@ -19,7 +19,7 @@ from zope.annotation.interfaces import IAnnotations
 from zope.component import createObject
 from zope.component import queryUtility
 
-import unittest2 as unittest
+import unittest
 
 
 try:

plone/app/discussion/tests/test_events.py

@@ -8,7 +8,7 @@ from zope.component import createObject
 from Zope2.App import zcml
 
 import Products.Five
-import unittest2 as unittest
+import unittest
 
 
 #

plone/app/discussion/tests/test_functional.py

@@ -8,7 +8,7 @@ from plone.testing import layered
 
 import doctest
 import pprint
-import unittest2 as unittest
+import unittest
 
 
 optionflags = (

plone/app/discussion/tests/test_indexers.py

@@ -11,7 +11,7 @@ from plone.app.testing import TEST_USER_ID
 from plone.indexer.delegate import DelegatingIndexerFactory
 from zope.component import createObject
 
-import unittest2 as unittest
+import unittest
 
 
 LONG_TEXT = """Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed

plone/app/discussion/tests/test_notifications.py

@@ -13,7 +13,7 @@ from zope.component import getSiteManager
 from zope.component import getUtility
 from zope.component import queryUtility
 
-import unittest2 as unittest
+import unittest
 
 
 class TestUserNotificationUnit(unittest.TestCase):

plone/app/discussion/tests/test_workflow.py

@@ -15,7 +15,7 @@ from Products.CMFCore.utils import _checkPermission as checkPerm
 from zope.component import createObject
 from zope.interface import alsoProvides
 
-import unittest2 as unittest
+import unittest
 
 
 class WorkflowSetupTest(unittest.TestCase):