Skip to content

Commit

Permalink
Add support for Zope 5.
Browse files Browse the repository at this point in the history
Python 3.5 is not supported by Zope 5.0 so we force it to Zope 4.x as the alpha versions of Zope 5 still supported Python 3.5.
  • Loading branch information
Michael Howitz committed Oct 26, 2020
1 parent 36fe931 commit 8e6baf7
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 5 deletions.
2 changes: 1 addition & 1 deletion CHANGES.rst
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ Changelog
2.2 (unreleased)
----------------

- Nothing changed yet.
- Add support for Zope 5.


2.1 (2019-03-05)
Expand Down
3 changes: 2 additions & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -51,7 +52,7 @@
'zope.publisher',
'zope.schema',
'ExtensionClass',
'Zope',
'Zope >= 4',
],
zip_safe=False,
)
3 changes: 0 additions & 3 deletions src/five/formlib/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@
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

_ = MessageFactory('zope')
Expand All @@ -60,8 +59,6 @@ class EditView(BrowserView):

def __init__(self, context, request):
BrowserView.__init__(self, context, request)
processInputs(self.request, self.charsets)
setPageEncoding(self.request)
self._setUpWidgets()

def _setUpWidgets(self):
Expand Down
1 change: 1 addition & 0 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ pip_pre = true
commands =
zope-testrunner --test-path=src []
deps = zope.testrunner
py35: Zope < 5.0.dev0

[testenv:coverage]
usedevelop = true
Expand Down

0 comments on commit 8e6baf7

Please sign in to comment.