Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fixed WrongContainedType for hostnameBlackList on Zope 5. #192

Merged
merged 3 commits into from
Sep 24, 2020
Merged

Fixed WrongContainedType for hostnameBlackList on Zope 5. #192

merged 3 commits into from
Sep 24, 2020

Conversation

mauritsvanrees
Copy link
Member

See also #183.

This reverts commit 9c64d46
which was itself a revert of "fix hostnameBlacklist (Theming ControlPanel) in Py3"

In Plone 6 (with Zope 5) this is needed again, because processInputs no longer exists.

@mauritsvanrees
Fixed WrongContainedType for hostnameBlackList on Zope 5.
88d90a4 
See also #183.

This reverts commit 9c64d46
which was itself a revert of "fix hostnameBlacklist (Theming ControlPanel) in Py3"

In Plone 6 (with Zope 5) this is needed again, because `processInputs` no longer exists.
@mauritsvanrees
Call safe_nativestring on hostnameBlacklist.
bbed30e 
That should work on Py 2 and 3 and Plone 5.2 and 6.0.
@mauritsvanrees
hostnameBlacklist: PY2 needs no changes.
8a67c21
@mister-roboto

This comment has been minimized.

Sign in to view
@mauritsvanrees
Copy link
Member Author

@jenkins-plone-org please run jobs

Locally the plone.app.testing tests pass on Plone 5.2 with Py 2.7 and 3.7, and on Plone 6.0 (zope5-master branch) with Py 3.8.

@mauritsvanrees mauritsvanrees mentioned this pull request Sep 23, 2020
Merged
@jensens jensens merged commit a784c2f into master Sep 24, 2020
@jensens jensens deleted the zope5 branch September 24, 2020 07:45
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jensens jensens Awaiting requested review from jensens

Assignees
No one assigned
Labels
02 type: regression 13 prio: normal 23 status: testing 32 needs: review
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@mauritsvanrees @mister-roboto @jensens