Merge pull request #34 from plone/maurits/fix-startup-warnings

Fix deprecation warning at startup for setDefaultRoles.
plone · Aug 24, 2020 · ed89ee5 · ed89ee5
2 parents c237400 + eda6670
commit ed89ee5
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 4 deletions.
diff --git a/Products/CMFPlacefulWorkflow/permissions.py b/Products/CMFPlacefulWorkflow/permissions.py
@@ -2,7 +2,8 @@
 """ Zope 2 permissions
 """
 
-from Products.CMFCore.permissions import setDefaultRoles
+from AccessControl.Permission import addPermission
+
 
 ManageWorkflowPolicies = 'CMFPlacefulWorkflow: Manage workflow policies'
-setDefaultRoles(ManageWorkflowPolicies, ('Manager', 'Site Administrator'))
+addPermission(ManageWorkflowPolicies, ('Manager', 'Site Administrator'))
diff --git a/news/34.bugfix b/news/34.bugfix
@@ -0,0 +1,2 @@
+Fix deprecation warning at startup for setDefaultRoles.
+[maurits]
diff --git a/setup.cfg b/setup.cfg
@@ -1,3 +1,6 @@
+[metadata]
+long_description = file: README.rst, CHANGES.rst
+
 [zest.releaser]
 create-wheel = yes
 

diff --git a/setup.py b/setup.py
@@ -2,12 +2,13 @@
 
 version = '2.0.3.dev0'
 
+
 setup(
     name='Products.CMFPlacefulWorkflow',
     version=version,
     description="Workflow policies for Plone",
-    long_description=(open("README.rst").read() + "\n" +
-                      open("CHANGES.rst").read()),
+    # Note: long_description is in setup.cfg
+    # to avoid needing workarounds for UnicodeDecodeErrors.
     classifiers=[
         "Development Status :: 5 - Production/Stable",
         "Framework :: Plone",
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		Fix deprecation warning at startup for setDefaultRoles.
		[maurits]