-
-
Notifications
You must be signed in to change notification settings - Fork 1.1k
decorator to deprecate positional arguments #6910
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
Changes from all commits
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,29 @@ | ||
BSD 3-Clause License | ||
|
||
Copyright (c) 2007-2021 The scikit-learn developers. | ||
All rights reserved. | ||
|
||
Redistribution and use in source and binary forms, with or without | ||
modification, are permitted provided that the following conditions are met: | ||
|
||
* Redistributions of source code must retain the above copyright notice, this | ||
list of conditions and the following disclaimer. | ||
|
||
* Redistributions in binary form must reproduce the above copyright notice, | ||
this list of conditions and the following disclaimer in the documentation | ||
and/or other materials provided with the distribution. | ||
|
||
* Neither the name of the copyright holder nor the names of its | ||
contributors may be used to endorse or promote products derived from | ||
this software without specific prior written permission. | ||
|
||
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" | ||
AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | ||
IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE | ||
DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE | ||
FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL | ||
DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR | ||
SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER | ||
CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, | ||
OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | ||
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,93 @@ | ||
import pytest | ||
|
||
from xarray.util.deprecation_helpers import _deprecate_positional_args | ||
|
||
|
||
def test_deprecate_positional_args_warns_for_function(): | ||
@_deprecate_positional_args("v0.1") | ||
def f1(a, b, *, c=1, d=1): | ||
pass | ||
|
||
with pytest.warns(FutureWarning, match=r".*v0.1"): | ||
f1(1, 2, 3) | ||
|
||
with pytest.warns(FutureWarning, match=r"Passing 'c' as positional"): | ||
f1(1, 2, 3) | ||
|
||
with pytest.warns(FutureWarning, match=r"Passing 'c, d' as positional"): | ||
f1(1, 2, 3, 4) | ||
|
||
@_deprecate_positional_args("v0.1") | ||
def f2(a=1, *, b=1, c=1, d=1): | ||
pass | ||
|
||
with pytest.warns(FutureWarning, match=r"Passing 'b' as positional"): | ||
f2(1, 2) | ||
|
||
@_deprecate_positional_args("v0.1") | ||
def f3(a, *, b=1, **kwargs): | ||
pass | ||
|
||
with pytest.warns(FutureWarning, match=r"Passing 'b' as positional"): | ||
f3(1, 2) | ||
|
||
with pytest.raises(TypeError, match=r"Cannot handle positional-only params"): | ||
|
||
@_deprecate_positional_args("v0.1") | ||
def f4(a, /, *, b=2, **kwargs): | ||
pass | ||
|
||
with pytest.raises(TypeError, match=r"Keyword-only param without default"): | ||
|
||
@_deprecate_positional_args("v0.1") | ||
def f5(a, *, b, c=3, **kwargs): | ||
pass | ||
|
||
|
||
def test_deprecate_positional_args_warns_for_class(): | ||
class A1: | ||
@_deprecate_positional_args("v0.1") | ||
def __init__(self, a, b, *, c=1, d=1): | ||
pass | ||
|
||
with pytest.warns(FutureWarning, match=r".*v0.1"): | ||
A1(1, 2, 3) | ||
|
||
with pytest.warns(FutureWarning, match=r"Passing 'c' as positional"): | ||
A1(1, 2, 3) | ||
|
||
with pytest.warns(FutureWarning, match=r"Passing 'c, d' as positional"): | ||
A1(1, 2, 3, 4) | ||
|
||
class A2: | ||
@_deprecate_positional_args("v0.1") | ||
def __init__(self, a=1, b=1, *, c=1, d=1): | ||
pass | ||
|
||
with pytest.warns(FutureWarning, match=r"Passing 'c' as positional"): | ||
A2(1, 2, 3) | ||
|
||
with pytest.warns(FutureWarning, match=r"Passing 'c, d' as positional"): | ||
A2(1, 2, 3, 4) | ||
|
||
class A3: | ||
@_deprecate_positional_args("v0.1") | ||
def __init__(self, a, *, b=1, **kwargs): | ||
pass | ||
|
||
with pytest.warns(FutureWarning, match=r"Passing 'b' as positional"): | ||
A3(1, 2) | ||
|
||
with pytest.raises(TypeError, match=r"Cannot handle positional-only params"): | ||
|
||
class A3: | ||
@_deprecate_positional_args("v0.1") | ||
def __init__(self, a, /, *, b=1, **kwargs): | ||
pass | ||
|
||
with pytest.raises(TypeError, match=r"Keyword-only param without default"): | ||
|
||
class A4: | ||
@_deprecate_positional_args("v0.1") | ||
def __init__(self, a, *, b, c=3, **kwargs): | ||
pass |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,119 @@ | ||
# For reference, here is a copy of the scikit-learn copyright notice: | ||
|
||
# BSD 3-Clause License | ||
|
||
# Copyright (c) 2007-2021 The scikit-learn developers. | ||
# All rights reserved. | ||
|
||
# Redistribution and use in source and binary forms, with or without | ||
# modification, are permitted provided that the following conditions are met: | ||
|
||
# * Redistributions of source code must retain the above copyright notice, this | ||
# list of conditions and the following disclaimer. | ||
|
||
# * Redistributions in binary form must reproduce the above copyright notice, | ||
# this list of conditions and the following disclaimer in the documentation | ||
# and/or other materials provided with the distribution. | ||
|
||
# * Neither the name of the copyright holder nor the names of its | ||
# contributors may be used to endorse or promote products derived from | ||
# this software without specific prior written permission. | ||
|
||
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" | ||
# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | ||
# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE | ||
# DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE | ||
# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL | ||
# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR | ||
# SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER | ||
# CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, | ||
# OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | ||
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE | ||
|
||
|
||
import inspect | ||
import warnings | ||
from functools import wraps | ||
|
||
POSITIONAL_OR_KEYWORD = inspect.Parameter.POSITIONAL_OR_KEYWORD | ||
KEYWORD_ONLY = inspect.Parameter.KEYWORD_ONLY | ||
POSITIONAL_ONLY = inspect.Parameter.POSITIONAL_ONLY | ||
EMPTY = inspect.Parameter.empty | ||
|
||
|
||
def _deprecate_positional_args(version): | ||
"""Decorator for methods that issues warnings for positional arguments | ||
|
||
Using the keyword-only argument syntax in pep 3102, arguments after the | ||
``*`` will issue a warning when passed as a positional argument. | ||
|
||
Parameters | ||
---------- | ||
version : str | ||
version of the library when the positional arguments were deprecated | ||
|
||
Examples | ||
-------- | ||
Deprecate passing `b` as positional argument: | ||
|
||
def func(a, b=1): | ||
pass | ||
|
||
@_deprecate_positional_args("v0.1.0") | ||
def func(a, *, b=2): | ||
pass | ||
|
||
func(1, 2) | ||
|
||
Notes | ||
----- | ||
This function is adapted from scikit-learn under the terms of its license. See | ||
licences/SCIKIT_LEARN_LICENSE | ||
""" | ||
|
||
def _decorator(f): | ||
|
||
signature = inspect.signature(f) | ||
|
||
pos_or_kw_args = [] | ||
kwonly_args = [] | ||
for name, param in signature.parameters.items(): | ||
if param.kind == POSITIONAL_OR_KEYWORD: | ||
pos_or_kw_args.append(name) | ||
elif param.kind == KEYWORD_ONLY: | ||
kwonly_args.append(name) | ||
if param.default is EMPTY: | ||
# IMHO `def f(a, *, b):` does not make sense -> disallow it | ||
# if removing this constraint -> need to add these to kwargs as well | ||
raise TypeError("Keyword-only param without default disallowed.") | ||
elif param.kind == POSITIONAL_ONLY: | ||
raise TypeError("Cannot handle positional-only params") | ||
# because all args are coverted to kwargs below | ||
|
||
@wraps(f) | ||
def inner(*args, **kwargs): | ||
print(f"{args=}") | ||
print(f"{pos_or_kw_args=}") | ||
Comment on lines
+95
to
+96
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. are these print statements intentional? There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. @mathause I think you missed these print statements? There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Thanks! Will fix them in a follow up! |
||
n_extra_args = len(args) - len(pos_or_kw_args) | ||
print(f"{n_extra_args=}") | ||
if n_extra_args > 0: | ||
|
||
extra_args = ", ".join(kwonly_args[:n_extra_args]) | ||
|
||
warnings.warn( | ||
f"Passing '{extra_args}' as positional argument(s) " | ||
f"was deprecated in version {version} and will raise an error two " | ||
"releases later. Please pass them as keyword arguments." | ||
"", | ||
FutureWarning, | ||
) | ||
print(f"{kwargs=}") | ||
|
||
kwargs.update({name: arg for name, arg in zip(pos_or_kw_args, args)}) | ||
print(f"{kwargs=}") | ||
|
||
return f(**kwargs) | ||
|
||
return inner | ||
|
||
return _decorator |
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.
I would suggest keeping the original copyright notice at the top of the this file.