Merge pull request #10 from zopefoundation/support-Zope-5

Support Zope 5
zopefoundation · Oct 26, 2020 · 63ec380 · 63ec380
2 parents 36fe931 + 465eeeb
commit 63ec380
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 4 deletions.
diff --git a/.gitignore b/.gitignore
@@ -11,6 +11,7 @@ bin
 build
 develop-eggs
 dist
+htmlcov/
 include
 lib
 man

diff --git a/CHANGES.rst b/CHANGES.rst
@@ -4,7 +4,7 @@ Changelog
 2.2 (unreleased)
 ----------------
 
-- Nothing changed yet.
+- Add support for Zope 5.
 
 
 2.1 (2019-03-05)

diff --git a/setup.py b/setup.py
@@ -16,6 +16,7 @@
         'Development Status :: 6 - Mature',
         "Environment :: Web Environment",
         "Framework :: Zope :: 4",
+        "Framework :: Zope :: 5",
         "Intended Audience :: Developers",
         "License :: OSI Approved :: Zope Public License",
         "Operating System :: OS Independent",
@@ -51,7 +52,7 @@
         'zope.publisher',
         'zope.schema',
         'ExtensionClass',
-        'Zope',
+        'Zope >= 4',
     ],
     zip_safe=False,
 )
diff --git a/src/five/formlib/__init__.py b/src/five/formlib/__init__.py
@@ -35,9 +35,20 @@
 from zope.app.form.utility import getWidgetsData
 
 from Products.Five.browser import BrowserView
-from Products.Five.browser.decode import processInputs, setPageEncoding
 from Products.Five.browser.pagetemplatefile import ZopeTwoPageTemplateFile
 
+try:
+    # Zope 4.x
+    from Products.Five.browser.decode import processInputs, setPageEncoding
+except ImportError:
+    # Zope 5.x
+    def processInputs(*args):
+        pass
+
+    def setPageEncoding(*args):
+        pass
+
+
 _ = MessageFactory('zope')
 
 

diff --git a/tox.ini b/tox.ini
@@ -7,13 +7,15 @@ pip_pre = true
 commands =
     zope-testrunner --test-path=src []
 deps = zope.testrunner
+       py35: Zope < 5.0.dev0
 
 [testenv:coverage]
 usedevelop = true
 basepython = python3.6
 commands =
     coverage run -m zope.testrunner --test-path=src []
-    coverage report --show-missing --fail-under=96
+    coverage html
+    coverage report --show-missing --fail-under=89
 deps =
     zope.testrunner
     coverage