Add Python 2 / 3 compatibility

CHANGES.rst

@@ -27,6 +27,9 @@ New features:
 
 Bug fixes:
 
+- Add Python 2 / 3 compatibility.
+  [pbauer]
+
 - iCalendar import: Fix usage of ``sync_uid``, which wasn't correctly implemented since plone.app.event 2.0.
   [thet]
 

plone/app/event/base.py

@@ -1,4 +1,3 @@
-import itertools
 
 from Acquisition import aq_inner
 from Acquisition import aq_parent
@@ -35,6 +34,7 @@
 
 
 import pytz
+import six
 
 
 DEFAULT_END_DELTA = 1  # hours
@@ -221,8 +221,8 @@ def filter_and_resort(context, brains, start, end, sort, sort_reverse):
         _allstarts = sorted(idx['start'])
         _allends = sorted(idx['end'])
         # assuming (start, end) pairs belong together
-        #assert(len(_allstarts) == len(_allends))
-        _occ = itertools.izip(_allstarts, _allends)
+        # assert(len(_allstarts) == len(_allends))
+        _occ = six.moves.zip(_allstarts, _allends)
         if start:
             _occ = [(s, e) for (s, e) in _occ if e >= _start]
         if end:

plone/app/event/dx/behaviors.py

@@ -461,7 +461,7 @@ def _recurrence_upcoming_event(self):
         adapter = IRecurrenceSupport(self.context)
         occs = adapter.occurrences(range_start=localized_now())
         try:
-            return occs.next()
+            return next(occs)
         except StopIteration:
             # No more future occurrences: passed event
             return IEventBasic(self.context)

plone/app/event/ical/importer.py

@@ -31,7 +31,8 @@
 import icalendar
 import random
 import transaction
-import urllib2
+
+from six.moves import urllib
 
 
 def ical_import(container, ics_resource, event_type,
@@ -323,7 +324,7 @@ def handleSaveImport(self, action):
                 ical_resource = ical_file.data
                 ical_import_from = ical_file.filename
             else:
-                ical_resource = urllib2.urlopen(ical_url).read()
+                ical_resource = urllib.request.urlopen(ical_url).read()
                 ical_import_from = ical_url
 
             import_metadata = ical_import(

plone/app/event/portlets/__init__.py

@@ -3,14 +3,17 @@
 from plone.app.event.base import find_navroot
 
 
+import six
+
+
 def get_calendar_url(context, search_base):
     # search_base is always from the portal_root object. We won't include
     # the path from the portal root object, so we traverse to the calendar
     # object and call it's url then.
     calendar_url = None
     if search_base:
         portal = find_ploneroot(context)
-        if isinstance(search_base, unicode):
+        if isinstance(search_base, six.text_type):
             search_base = search_base.encode('utf8')
         search_base = '/'.join(search_base.split('/')[2:])
         calendar_url = portal.unrestrictedTraverse(

plone/app/event/recurrence.py

@@ -114,7 +114,7 @@ def publishTraverse(self, request, name):
         if dateobj:
             occs = IRecurrenceSupport(context).occurrences(range_start=dateobj)
             try:
-                occurrence = occs.next()
+                occurrence = next(occs)
                 occ_acc = IEventAccessor(occurrence)
                 if is_same_day(dateobj, occ_acc.start):
                     return occurrence

plone/app/event/tests/test_base_module.py

@@ -40,6 +40,7 @@
 
 
 import pytz
+import six
 import unittest
 
 
@@ -320,10 +321,10 @@ def test_date_speller(self):
         # locale specific
         # TODO: test better.
         self.assertTrue(isinstance(date_spelled['wkday'], int))
-        self.assertTrue(isinstance(date_spelled['month_name'], basestring))
-        self.assertTrue(isinstance(date_spelled['month_abbr'], basestring))
-        self.assertTrue(isinstance(date_spelled['wkday_name'], basestring))
-        self.assertTrue(isinstance(date_spelled['wkday_abbr'], basestring))
+        self.assertTrue(isinstance(date_spelled['month_name'], six.string_types))
+        self.assertTrue(isinstance(date_spelled['month_abbr'], six.string_types))
+        self.assertTrue(isinstance(date_spelled['wkday_name'], six.string_types))
+        self.assertTrue(isinstance(date_spelled['wkday_abbr'], six.string_types))
 
 
 class TimezoneTest(unittest.TestCase):

plone/app/event/tests/test_portlet_calendar.py

@@ -74,7 +74,7 @@ def testInvokeAddview(self):
 
         self.assertEqual(len(mapping), 1)
         self.assertTrue(
-            isinstance(mapping.values()[0], portlet_calendar.Assignment)
+            isinstance(list(mapping.values())[0], portlet_calendar.Assignment)
         )
 
     def testRenderer(self):

plone/app/event/tests/test_portlet_events.py

@@ -75,7 +75,7 @@ def testInvokeAddview(self):
 
         self.assertEqual(len(mapping), 1)
         self.assertTrue(
-            isinstance(mapping.values()[0], portlet_events.Assignment)
+            isinstance(list(mapping.values())[0], portlet_events.Assignment)
         )
 
     def testInvokeEditView(self):

setup.py

@@ -70,6 +70,7 @@
         'plone.uuid',
         'plone.z3cform',
         'pytz',
+        'six',
         'transaction',
         'z3c.form >= 3.2.1.dev0',
         'zope.annotation',