From 9f4a167a1666a6da521858826f3bcdb391387bf8 Mon Sep 17 00:00:00 2001 From: jensens Date: Fri, 14 Feb 2020 14:27:59 +0100 Subject: [PATCH] [fc] Repository: plone.resourceeditor Branch: refs/heads/master Date: 2020-02-12T12:22:50+01:00 Author: Maurits van Rees (mauritsvanrees) Commit: https://github.com/plone/plone.resourceeditor/commit/0e676458af1b034e549604cf25d25eb43d045d99 Do not call processInputs. It is not needed since Zope 4, and not existing in Zope 5. Fixes https://github.com/plone/plone.resourceeditor/issues/26 Files changed: A news/26.bugfix M plone/resourceeditor/browser.py Repository: plone.resourceeditor Branch: refs/heads/master Date: 2020-02-14T14:27:59+01:00 Author: Jens W. Klein (jensens) Commit: https://github.com/plone/plone.resourceeditor/commit/77d128f02a5259102f9e3a9817bf24229785af4b Merge pull request #27 from plone/maurits-zope5-compat Do not call processInputs. Files changed: A news/26.bugfix M plone/resourceeditor/browser.py --- last_commit.txt | 33 +++++++++++++++++---------------- 1 file changed, 17 insertions(+), 16 deletions(-) diff --git a/last_commit.txt b/last_commit.txt index 740de2a45e..a34a5657cc 100644 --- a/last_commit.txt +++ b/last_commit.txt @@ -1,36 +1,37 @@ -Repository: five.intid +Repository: plone.resourceeditor Branch: refs/heads/master -Date: 2020-02-12T11:54:39+01:00 +Date: 2020-02-12T12:22:50+01:00 Author: Maurits van Rees (mauritsvanrees) -Commit: https://github.com/plone/five.intid/commit/8793ca7a0eb8e7db123cc23cc7dc752045848d98 +Commit: https://github.com/plone/plone.resourceeditor/commit/0e676458af1b034e549604cf25d25eb43d045d99 -Fixed ModuleNotFoundError: No module named 'App.class_init' on Zope 5. +Do not call processInputs. -Fixes https://github.com/plone/five.intid/issues/15 +It is not needed since Zope 4, and not existing in Zope 5. +Fixes https://github.com/plone/plone.resourceeditor/issues/26 Files changed: -A news/15.bugfix -M five/intid/intid.py +A news/26.bugfix +M plone/resourceeditor/browser.py -b"diff --git a/five/intid/intid.py b/five/intid/intid.py\nindex 1ada637..8310b50 100644\n--- a/five/intid/intid.py\n+++ b/five/intid/intid.py\n@@ -1,6 +1,6 @@\n # -*- coding: utf-8 -*-\n from Acquisition import Explicit\n-from App.class_init import InitializeClass\n+from AccessControl.class_init import InitializeClass\n from zope.component import getAllUtilitiesRegisteredFor\n from zope.event import notify\n from zope.interface import implementer\ndiff --git a/news/15.bugfix b/news/15.bugfix\nnew file mode 100644\nindex 0000000..b86c94b\n--- /dev/null\n+++ b/news/15.bugfix\n@@ -0,0 +1,2 @@\n+Fixed ModuleNotFoundError: No module named 'App.class_init' on Zope 5.\n+[maurits]\n" +b"diff --git a/news/26.bugfix b/news/26.bugfix\nnew file mode 100644\nindex 0000000..5a76d55\n--- /dev/null\n+++ b/news/26.bugfix\n@@ -0,0 +1,3 @@\n+Do not call ``processInputs``.\n+It is not needed since Zope 4, and not existing in Zope 5.\n+[maurits]\ndiff --git a/plone/resourceeditor/browser.py b/plone/resourceeditor/browser.py\nindex 815f10f..16bf964 100644\n--- a/plone/resourceeditor/browser.py\n+++ b/plone/resourceeditor/browser.py\n@@ -9,7 +9,6 @@\n from Products.CMFCore.utils import getToolByName\n from Products.CMFPlone.utils import safe_unicode\n from Products.CMFPlone.utils import safe_encode\n-from Products.Five.browser.decode import processInputs\n from Products.Five.browser.pagetemplatefile import ViewPageTemplateFile\n from six.moves import urllib\n from six.moves.urllib.parse import urlparse\n@@ -698,7 +697,7 @@ def __call__(self):\n return self.index()\n \n def setup(self):\n- processInputs(self.request)\n+ pass\n \n @zproperty.Lazy\n def portalUrl(self):\n@@ -1230,8 +1229,6 @@ def getFile(self, path):\n return json.dumps(result)\n \n def saveFile(self, path, value):\n- processInputs(self.request)\n-\n path = self.request.form.get('path', path)\n value = self.request.form.get('value', value)\n if six.PY2:\n" -Repository: five.intid +Repository: plone.resourceeditor Branch: refs/heads/master -Date: 2020-02-14T14:27:12+01:00 +Date: 2020-02-14T14:27:59+01:00 Author: Jens W. Klein (jensens) -Commit: https://github.com/plone/five.intid/commit/b947e69adebf3e0f859e86064db7df6c6ce1b831 +Commit: https://github.com/plone/plone.resourceeditor/commit/77d128f02a5259102f9e3a9817bf24229785af4b -Merge pull request #16 from plone/maurits-zope5-compat +Merge pull request #27 from plone/maurits-zope5-compat -Fixed ModuleNotFoundError: No module named 'App.class_init' on Zope 5. +Do not call processInputs. Files changed: -A news/15.bugfix -M five/intid/intid.py +A news/26.bugfix +M plone/resourceeditor/browser.py -b"diff --git a/five/intid/intid.py b/five/intid/intid.py\nindex 1ada637..8310b50 100644\n--- a/five/intid/intid.py\n+++ b/five/intid/intid.py\n@@ -1,6 +1,6 @@\n # -*- coding: utf-8 -*-\n from Acquisition import Explicit\n-from App.class_init import InitializeClass\n+from AccessControl.class_init import InitializeClass\n from zope.component import getAllUtilitiesRegisteredFor\n from zope.event import notify\n from zope.interface import implementer\ndiff --git a/news/15.bugfix b/news/15.bugfix\nnew file mode 100644\nindex 0000000..b86c94b\n--- /dev/null\n+++ b/news/15.bugfix\n@@ -0,0 +1,2 @@\n+Fixed ModuleNotFoundError: No module named 'App.class_init' on Zope 5.\n+[maurits]\n" +b"diff --git a/news/26.bugfix b/news/26.bugfix\nnew file mode 100644\nindex 0000000..5a76d55\n--- /dev/null\n+++ b/news/26.bugfix\n@@ -0,0 +1,3 @@\n+Do not call ``processInputs``.\n+It is not needed since Zope 4, and not existing in Zope 5.\n+[maurits]\ndiff --git a/plone/resourceeditor/browser.py b/plone/resourceeditor/browser.py\nindex 815f10f..16bf964 100644\n--- a/plone/resourceeditor/browser.py\n+++ b/plone/resourceeditor/browser.py\n@@ -9,7 +9,6 @@\n from Products.CMFCore.utils import getToolByName\n from Products.CMFPlone.utils import safe_unicode\n from Products.CMFPlone.utils import safe_encode\n-from Products.Five.browser.decode import processInputs\n from Products.Five.browser.pagetemplatefile import ViewPageTemplateFile\n from six.moves import urllib\n from six.moves.urllib.parse import urlparse\n@@ -698,7 +697,7 @@ def __call__(self):\n return self.index()\n \n def setup(self):\n- processInputs(self.request)\n+ pass\n \n @zproperty.Lazy\n def portalUrl(self):\n@@ -1230,8 +1229,6 @@ def getFile(self, path):\n return json.dumps(result)\n \n def saveFile(self, path, value):\n- processInputs(self.request)\n-\n path = self.request.form.get('path', path)\n value = self.request.form.get('value', value)\n if six.PY2:\n"