Merge pull request #81 from collective/python3

Added support for Python 3 during PloneConf2018's Sprint at Microsoft, Tokyo!!
collective · Nov 10, 2018 · 2153458 · 2153458
2 parents ae564a9 + 12e0389
commit 2153458
Show file tree

Hide file tree

Showing 11 changed files with 36 additions and 28 deletions.
diff --git a/CHANGES.rst b/CHANGES.rst
@@ -5,7 +5,8 @@ Changelog
 1.0.3 (unreleased)
 ------------------
 
-- Nothing changed yet.
+- Add Support for Python 3.
+  [pbauer, staeff, Shriyanshagro]
 
 
 1.0.2 (2018-08-14)

diff --git a/setup.py b/setup.py
@@ -14,17 +14,19 @@
 setup(
     name='collective.ifttt',
     version='1.0.3.dev0',
-    description=
-    "This addon is developed to make use of IFTTT webhook with Plone",
+    description="Plone addon to make use of IFTTT webhook with Plone",
     long_description=long_description,
     # Get more from https://pypi.python.org/pypi?%3Aaction=list_classifiers
     classifiers=[
         "Environment :: Web Environment",
         "Framework :: Plone",
         "Framework :: Plone :: 5.0",
         "Framework :: Plone :: 5.1",
+        "Framework :: Plone :: 5.2",
         "Programming Language :: Python",
         "Programming Language :: Python :: 2.7",
+        "Programming Language :: Python :: 3.6",
+        "Programming Language :: Python :: 3.7",
         "Operating System :: OS Independent",
         "License :: OSI Approved :: GNU General Public License v2 (GPLv2)",
     ],
@@ -45,6 +47,7 @@
         'setuptools',
         'z3c.jbot',
         'requests',
+        'six',
     ],
     extras_require={
         'test': [

diff --git a/src/collective/ifttt/actions/ifttt.py b/src/collective/ifttt/actions/ifttt.py
@@ -10,6 +10,7 @@
 from plone.contentrules.rule.interfaces import IExecutable
 from plone.contentrules.rule.interfaces import IRuleElementData
 from plone.event.interfaces import IEventAccessor
+from Products.CMFPlone.utils import safe_unicode
 from zope import schema
 from zope.component import adapter
 from zope.component import queryMultiAdapter
@@ -107,7 +108,7 @@ def __init__(self, context, element, event):
     def __call__(self, *args, **kwargs):
         ifttt_event_name = self.element.ifttt_event_name
         payload_option = self.element.payload_option
-        title = self.context.Title().decode('utf-8', 'ignore')
+        title = safe_unicode(self.context.Title())
         url = self.context.absolute_url()
         secret_key = api.portal.get_registry_record('ifttt.ifttt_secret_key')
         ifttt_trigger_url = 'https://maker.ifttt.com/trigger/' + \

diff --git a/src/collective/ifttt/browser/content_trigger.py b/src/collective/ifttt/browser/content_trigger.py
@@ -9,6 +9,7 @@
 from plone.autoform import directives as forms
 from plone.autoform.form import AutoExtensibleForm
 from Products.CMFCore.interfaces._events import IActionSucceededEvent
+from Products.CMFPlone.utils import safe_unicode
 from z3c.form import button
 from z3c.form import form
 from zope import schema
@@ -129,17 +130,16 @@ def handleApply(self, action):
                     u'${ifttt_event_name} to ${title}',
                     mapping=dict(
                         ifttt_event_name=data.get('ifttt_event_name'),
-                        title=self.context.Title().decode('utf-8', 'ignore'),
+                        title=safe_unicode(self.context.Title()),
                     ),
                 ),
                 request=getRequest(),
                 type='info'
             )
 
         except Exception as er:
-
             logger.exception(
-                u'Unexpected exception: {0:s}'.format(er),
+                u'Unexpected exception: {0:s}'.format(str(er)),
             )  # noqa
 
             # Redirect back to the front page with a status message

diff --git a/src/collective/ifttt/browser/event_trigger.py b/src/collective/ifttt/browser/event_trigger.py
@@ -9,6 +9,7 @@
 from plone.autoform import directives as forms
 from plone.autoform.form import AutoExtensibleForm
 from Products.CMFCore.interfaces._events import IActionSucceededEvent
+from Products.CMFPlone.utils import safe_unicode
 from z3c.form import button
 from z3c.form import form
 from zope import schema
@@ -119,7 +120,7 @@ def handleApply(self, action):
                     u'${ifttt_event_name} to ${title}',
                     mapping=dict(
                         ifttt_event_name=data.get('ifttt_event_name'),
-                        title=self.context.Title().decode('utf-8', 'ignore'),
+                        title=safe_unicode(self.context.Title()),
                     ),
                 ),
                 request=getRequest(),

diff --git a/src/collective/ifttt/browser/manage_trigger.py b/src/collective/ifttt/browser/manage_trigger.py
@@ -1,11 +1,11 @@
 # -*- coding: utf-8 -*-
 
 from collective.ifttt import _
+from collective.ifttt.browser.views import availableTriggers
 from plone import api
 from plone.autoform import directives as forms
 from plone.autoform.form import AutoExtensibleForm
 from plone.contentrules.engine.interfaces import IRuleStorage
-from views import availableTriggers
 from z3c.form import button
 from z3c.form import form
 from z3c.form.browser.checkbox import CheckBoxFieldWidget

diff --git a/src/collective/ifttt/browser/user_trigger.py b/src/collective/ifttt/browser/user_trigger.py
@@ -8,6 +8,7 @@
 from plone.app.z3cform.widget import SelectFieldWidget
 from plone.autoform import directives as forms
 from plone.autoform.form import AutoExtensibleForm
+from Products.CMFPlone.utils import safe_unicode
 from z3c.form import button
 from z3c.form import form
 from zope import schema
@@ -111,7 +112,7 @@ def handleApply(self, action):
                     u'${ifttt_event_name} to ${title}',
                     mapping=dict(
                         ifttt_event_name=data.get('ifttt_event_name'),
-                        title=self.context.Title().decode('utf-8', 'ignore'),
+                        title=safe_unicode(self.context.Title()),
                     ),
                 ),
                 request=getRequest(),

diff --git a/src/collective/ifttt/tests/test_easyforms.py b/src/collective/ifttt/tests/test_easyforms.py
@@ -5,7 +5,7 @@
 from plone.app import testing
 from plone.app.testing import setRoles
 from plone.app.testing import TEST_USER_ID
-from StringIO import StringIO
+from six import StringIO
 from zope.testing.loggingsupport import InstalledHandler
 from ZPublisher.HTTPRequest import HTTPRequest
 from ZPublisher.HTTPResponse import HTTPResponse

diff --git a/src/collective/ifttt/tests/test_iftttaction.py b/src/collective/ifttt/tests/test_iftttaction.py
@@ -56,22 +56,20 @@ def test_AddFormView(self):
 
         addview.form_instance.update()
 
-        payload_option = payload_options.by_value.keys()
-
-        for i in range(len(payload_option)):
+        for index, option in enumerate(payload_options):
 
             content = addview.form_instance.create(
                 data={
                     'ifttt_event_name': 'ifttt_applet',
-                    'payload_option': payload_option[i],
+                    'payload_option': option,
                 }
             )
             addview.form_instance.add(content)
 
-            e = rule.actions[i]
+            e = rule.actions[index]
             self.assertTrue(isinstance(e, IftttTriggerAction))
             self.assertEqual('ifttt_applet', e.ifttt_event_name)
-            self.assertEqual(payload_option[i], e.payload_option)
+            self.assertEqual(option, e.payload_option)
 
     def test_EditFormView(self):
         element = getUtility(IRuleAction, name='plone.actions.Ifttt')
@@ -90,13 +88,12 @@ def test_ActionExecutor(self):
             value=u'secret',
         )
         element.ifttt_event_name = 'ifttt_applet'
-        payload_option = payload_options.by_value.keys()
 
-        for i in range(len(payload_option)):
+        for option in payload_options:
             # inspect logs
             handler = InstalledHandler('collective.ifttt.requests')
 
-            element.payload_option = payload_option[i]
+            element.payload_option = option.value
             ex = getMultiAdapter((context, element, DummyEvent(self.folder)),
                                  IExecutable)
             self.assertTrue(ex())

diff --git a/src/collective/ifttt/tests/test_setup.py b/src/collective/ifttt/tests/test_setup.py
@@ -5,6 +5,7 @@
 from plone.app.testing import setRoles
 from plone.app.testing import TEST_USER_ID
 from Products.CMFPlone.interfaces import INonInstallable
+from Products.CMFPlone.utils import get_installer
 from zope.component import getAllUtilitiesRegisteredFor
 
 import unittest
@@ -18,12 +19,13 @@ class TestSetup(unittest.TestCase):
     def setUp(self):
         """Custom shared utility setup for tests."""
         self.portal = self.layer['portal']
-        self.installer = api.portal.get_tool('portal_quickinstaller')
+        self.installer = get_installer(self.portal, self.layer['request'])
         self.setup = api.portal.get_tool('portal_setup')
 
     def test_product_installed(self):
         """Test if collective.ifttt is installed."""
-        self.assertTrue(self.installer.isProductInstalled('collective.ifttt'))
+        self.assertTrue(
+            self.installer.is_product_installed('collective.ifttt'))
 
     def test_product_upgrade(self):
         """Test if collective.ifttt can be upgraded."""
@@ -54,10 +56,10 @@ class TestUninstall(unittest.TestCase):
 
     def setUp(self):
         self.portal = self.layer['portal']
-        self.installer = api.portal.get_tool('portal_quickinstaller')
+        self.installer = get_installer(self.portal, self.layer['request'])
         roles_before = api.user.get_roles(TEST_USER_ID)
         setRoles(self.portal, TEST_USER_ID, ['Manager'])
-        self.installer.uninstallProducts(['collective.ifttt'])
+        self.installer.uninstall_product('collective.ifttt')
         setRoles(self.portal, TEST_USER_ID, roles_before)
 
     def test_hidden_uninstall_profile(self):
@@ -70,7 +72,8 @@ def test_hidden_uninstall_profile(self):
 
     def test_product_uninstalled(self):
         """Test if collective.ifttt is cleanly uninstalled."""
-        self.assertFalse(self.installer.isProductInstalled('collective.ifttt'))
+        self.assertFalse(
+            self.installer.is_product_installed('collective.ifttt'))
 
     def test_browserlayer_removed(self):
         """Test that ICollectiveIftttLayer is removed."""

diff --git a/src/collective/ifttt/utils.py b/src/collective/ifttt/utils.py
@@ -1,12 +1,13 @@
 # -*- coding: utf-8 -*-
 
 from collective.ifttt import _
-from interfaces import IFTTTMarker
+from collective.ifttt.interfaces import IFTTTMarker
 from plone import api
 from plone.app.contentrules import api as rules_api
 from plone.contentrules.engine.interfaces import IRuleStorage
 from plone.contentrules.rule.interfaces import IRuleAction
 from plone.contentrules.rule.interfaces import IRuleCondition
+from Products.CMFPlone.utils import safe_unicode
 from Products.statusmessages import STATUSMESSAGEKEY
 from zope.annotation.interfaces import IAnnotations
 from zope.component import getMultiAdapter
@@ -41,7 +42,7 @@ def add_rule(self, data, trigger_type):
                 trigger_type=trigger_type,
                 ifttt_event_name=data.get('ifttt_event_name'),
                 content_types=(', ').join(data.get('content_types')),
-                title=self.context.Title().decode('utf-8', 'ignore'),
+                title=self.context.Title(),
                 path=self.context.absolute_url_path(),
             )
         )
@@ -51,7 +52,7 @@ def add_rule(self, data, trigger_type):
             u'"${ifttt_event_name}" on the ${title} folder',
             mapping=dict(
                 ifttt_event_name=data.get('ifttt_event_name'),
-                title=self.context.Title().decode('utf-8', 'ignore'),
+                title=safe_unicode(self.context.Title()),
             )
         )