Fix VirtualHostMonster not being able to set mappings under Python 3. #709
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
thet
commented
Oct 3, 2019
|
Johannes Raggam wrote at 2019-10-3 02:35 -0700:
thet commented on this pull request.
> @@ -104,7 +104,7 @@ def set_map(self, map_text, RESPONSE=None):
if hostname not in host_map:
host_map[hostname] = {}
host_map[hostname][port] = pp
- except 'LineError' as msg:
@icemac You've added Products.SiteAccess with this commit.
I don't find the original repo anymore and can't do a git blame there.
What's meant with a ``'LineError'``?
`'LineError'` must be very old -- from a time when Python exceptions have
been strings. I think, modern Python versions no longer support string
exceptions. Should this be true, then there is no longer any way to
raise a `'LineError'` and the `except 'LineError'` could go away.
You may search the `SiteAccess` source for `Error` and try to
find out whether the raising part as meanwhile been modernized
(i.e. the exception transformed from a string to a subclass
of `BaseException`).
|
|
@d-maurer tnx for the explanation! I couldn't find any references to LineError. IMO Exception is sufficient here, even it's normally bad practice to use such an generic Exception type. |
icemac
approved these changes
Oct 8, 2019
CHANGES.rst
Outdated
| @@ -9,6 +9,7 @@ https://github.com/zopefoundation/Zope/blob/4.x/CHANGES.rst | |||
| 5.0a1 (unreleased) | |||
| ------------------ | |||
|
|
|||
| - Fix VirtualHostMonster not being able to set mappings under Python 3. Fixes #708 | |||
There was a problem hiding this comment.
Suggested change
| - Fix VirtualHostMonster not being able to set mappings under Python 3. Fixes #708 | |
| - Fix VirtualHostMonster not being able to set mappings under Python 3. | |
| (`#708 <https://github.com/zopefoundation/Zope/issues/708>`_) | |
| @@ -104,7 +104,7 @@ def set_map(self, map_text, RESPONSE=None): | |||
| if hostname not in host_map: | |||
| host_map[hostname] = {} | |||
| host_map[hostname][port] = pp | |||
| except 'LineError' as msg: | |||
| except Exception as msg: | |||
There was a problem hiding this comment.
Suggested change
| except Exception as msg: | |
| except ValueError as msg: |
This would restore the original behavior. (See my other comment.)
|
Additionally the pylint errors should be fixed. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes #708