-
-
Notifications
You must be signed in to change notification settings - Fork 26k
[MRG] MNT Uses pep562 to import private methods #15431
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.
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
Merged
rth
merged 9 commits into
scikit-learn:master
from
thomasjpfan:backport_pep562_private_methods
Nov 4, 2019
Merged
Changes from all commits
Commits
Show all changes
9 commits
Select commit
Hold shift + click to select a range
9b96706
MNT Uses pep562 to import private methods
thomasjpfan fbc84fb
BUG Enable when not >=3.7
thomasjpfan a8e5281
CLN Make _pep562 private
thomasjpfan 55037f2
CLN Skips pep562 in tabs check
thomasjpfan c06c2f7
CLN Skips pep562 for deprecated paths
thomasjpfan 4eebd29
CLN Uses Pep562 explicitly in test with comment
thomasjpfan 710f6ac
Merge remote-tracking branch 'upstream/master' into backport_pep562_p…
thomasjpfan 8bd9b11
CLN Less diffs
thomasjpfan 438344c
DOC Adds comment about python37
thomasjpfan File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,58 @@ | ||
""" | ||
Backport of PEP 562. | ||
|
||
https://pypi.org/search/?q=pep562 | ||
|
||
Licensed under MIT | ||
Copyright (c) 2018 Isaac Muse <isaacmuse@gmail.com> | ||
|
||
Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated | ||
documentation files (the "Software"), to deal in the Software without restriction, including without limitation | ||
the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, | ||
and to permit persons to whom the Software is furnished to do so, subject to the following conditions: | ||
|
||
The above copyright notice and this permission notice shall be included in all copies or substantial portions | ||
of the Software. | ||
|
||
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED | ||
TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL | ||
THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF | ||
CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS | ||
IN THE SOFTWARE. | ||
""" | ||
from __future__ import unicode_literals | ||
import sys | ||
|
||
__all__ = ('Pep562',) | ||
|
||
|
||
class Pep562(object): | ||
""" | ||
Backport of PEP 562 <https://pypi.org/search/?q=pep562>. | ||
|
||
Wraps the module in a class that exposes the mechanics to override `__dir__` and `__getattr__`. | ||
The given module will be searched for overrides of `__dir__` and `__getattr__` and use them when needed. | ||
""" | ||
|
||
def __init__(self, name): | ||
"""Acquire `__getattr__` and `__dir__`, but only replace module for versions less than Python 3.7.""" | ||
|
||
self._module = sys.modules[name] | ||
self._get_attr = getattr(self._module, '__getattr__', None) | ||
self._get_dir = getattr(self._module, '__dir__', None) | ||
sys.modules[name] = self | ||
|
||
def __dir__(self): | ||
"""Return the overridden `dir` if one was provided, else apply `dir` to the module.""" | ||
|
||
return self._get_dir() if self._get_dir else dir(self._module) | ||
|
||
def __getattr__(self, name): | ||
"""Attempt to retrieve the attribute from the module, and if missing, use the overridden function if present.""" | ||
|
||
try: | ||
return getattr(self._module, name) | ||
except AttributeError: | ||
if self._get_attr: | ||
return self._get_attr(name) | ||
raise |
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
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Mark as to be removed in 0.24 or when Pep562 isn't used anymore
?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We can also used this for experimental features for a better error message?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
still worth a tag?