Cleanups. #11566
Merged
Cleanups. #11566
Conversation
This file contains hidden or 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
jklymak
reviewed
Jul 3, 2018
| @@ -1417,19 +1417,15 @@ def tk_window_focus(): | |||
|
|
|||
|
|
|||
| def _init_tests(): | |||
| try: | |||
| # CPython's faulthandler since v3.6 handles exceptions on Windows | |||
There was a problem hiding this comment.
I'm not fully grokking this, but I thought we were supporting 3.5 for the next release...
There was a problem hiding this comment.
faulthandler exists since 3.3: https://docs.python.org/3.3/library/faulthandler.html
There was a problem hiding this comment.
Yes, but why does the comment make reference to "since v3.6"?
There was a problem hiding this comment.
It exists on all version (so we don't need the import check), but still need the version check to know if we want to use it on windows or not.
tacaswell
approved these changes
Jul 4, 2018
- faulthandler is present in all versions of Python we support; no need for `try... except ImportError` anymore. - LooseVersions can directly be compared to strings (it casts the other argument to a LooseVersion). - Move the gi+cairocffi incompatibility check (duplicated between backend_gtk3agg and backend_gtk3cairo) to the common _gtk3_compat. - Replace HAS_CAIRO_CFFI with checking `cairo.__name__`, which is consistent with e.g. the check on `gi.__name__`. - Inline the (single-used, internal) pilread (I think the new version is also more readable as we don't need to handle None as special value). - Replace HAS_NATGRID by pytest.importorskip.
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.
for
try... except ImportErroranymore.argument to a LooseVersion).
backend_gtk3agg and backend_gtk3cairo) to the common _gtk3_compat.
cairo.__name__, which isconsistent with e.g. the check on
gi.__name__.also more readable as we don't need to handle None as special value).
PR Summary
PR Checklist