Add Python 2 / 3 compatibility

plone/app/discussion/tests/test_comments_viewlet.py

@@ -565,8 +565,8 @@ class TestCommentsViewlet(unittest.TestCase):
         replies = self.viewlet.get_replies()
         self.assertEqual(len(tuple(replies)), 2)
         replies = self.viewlet.get_replies()
-        replies.next()
-        replies.next()
+        next(replies)
+        next(replies)
         self.assertRaises(StopIteration, replies.next)
 
     def test_get_replies_on_non_annotatable_object(self):
@@ -593,7 +593,7 @@ class TestCommentsViewlet(unittest.TestCase):
             ('comment_review_workflow,')
         )
         # Check if workflow actions are available
-        reply = self.viewlet.get_replies(workflow_actions=True).next()
+        reply = next(self.viewlet.get_replies(workflow_actions=True))
         self.assertTrue('actions' in reply)
         self.assertEqual(
             reply['actions'][0]['id'],

plone/app/discussion/tests/test_conversation.py

@@ -22,6 +22,9 @@ from zope.component import queryUtility
 import unittest
 
 
+import six
+
+
 try:
     from plone.dexterity.interfaces import IDexterityContent
     DEXTERITY = True
@@ -383,17 +386,17 @@ class ConversationTest(unittest.TestCase):
         self.assertTrue(comment2 in conversation.values())
 
         # check if comment ids are in iterkeys
-        self.assertTrue(new_id1 in conversation.iterkeys())
-        self.assertTrue(new_id2 in conversation.iterkeys())
-        self.assertFalse(123 in conversation.iterkeys())
+        self.assertTrue(new_id1 in six.iterkeys(conversation))
+        self.assertTrue(new_id2 in six.iterkeys(conversation))
+        self.assertFalse(123 in six.iterkeys(conversation))
 
         # check if comment objects are in itervalues
-        self.assertTrue(comment1 in conversation.itervalues())
-        self.assertTrue(comment2 in conversation.itervalues())
+        self.assertTrue(comment1 in six.itervalues(conversation))
+        self.assertTrue(comment2 in six.itervalues(conversation))
 
         # check if iteritems returns (key, comment object) pairs
-        self.assertTrue((new_id1, comment1) in conversation.iteritems())
-        self.assertTrue((new_id2, comment2) in conversation.iteritems())
+        self.assertTrue((new_id1, comment1) in six.iteritems(conversation))
+        self.assertTrue((new_id2, comment2) in six.iteritems(conversation))
 
         # TODO test acquisition wrapping
         # self.assertTrue(aq_base(aq_parent(comment1)) is conversation)

plone/app/discussion/tests/test_moderation_view.py

@@ -156,7 +156,7 @@ class ModerationBulkActionsViewTest(unittest.TestCase):
 
         # Make sure that the two comments have been deleted
         self.assertEqual(len(self.conversation.objectIds()), 1)
-        comment = self.conversation.getComments().next()
+        comment = next(self.conversation.getComments())
         self.assertTrue(comment)
         self.assertEqual(comment, self.comment2)