diff options
author | Ran Benita <ran@unusedvar.com> | 2021-02-05 00:37:38 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-02-05 00:37:38 +0200 |
commit | b3115c1b06bace9c9604376b5c644e5747d10ee8 (patch) | |
tree | b5cfd0be50bfe15d3731af55b0c375db1ae0384c /src/_pytest/config/argparsing.py | |
parent | 80c223474c98fd59a07776994e672e934866c7d5 (diff) | |
parent | d358a060add416e11b0e231cbfe9d97b02335ad0 (diff) | |
download | pytest-b3115c1b06bace9c9604376b5c644e5747d10ee8.tar.gz |
Merge pull request #8315 from bluetech/parser-proper-deprecation
config/argparsing: use proper deprecations instead of ad-hoc DeprecationWarning
Diffstat (limited to 'src/_pytest/config/argparsing.py')
-rw-r--r-- | src/_pytest/config/argparsing.py | 22 |
1 files changed, 6 insertions, 16 deletions
diff --git a/src/_pytest/config/argparsing.py b/src/_pytest/config/argparsing.py index 5a09ea781..cf738cc2b 100644 --- a/src/_pytest/config/argparsing.py +++ b/src/_pytest/config/argparsing.py @@ -18,6 +18,9 @@ from typing import Union import _pytest._io from _pytest.compat import final from _pytest.config.exceptions import UsageError +from _pytest.deprecated import ARGUMENT_PERCENT_DEFAULT +from _pytest.deprecated import ARGUMENT_TYPE_STR +from _pytest.deprecated import ARGUMENT_TYPE_STR_CHOICE if TYPE_CHECKING: from typing import NoReturn @@ -212,12 +215,7 @@ class Argument: self._short_opts: List[str] = [] self._long_opts: List[str] = [] if "%default" in (attrs.get("help") or ""): - warnings.warn( - 'pytest now uses argparse. "%default" should be' - ' changed to "%(default)s" ', - DeprecationWarning, - stacklevel=3, - ) + warnings.warn(ARGUMENT_PERCENT_DEFAULT, stacklevel=3) try: typ = attrs["type"] except KeyError: @@ -227,11 +225,7 @@ class Argument: if isinstance(typ, str): if typ == "choice": warnings.warn( - "`type` argument to addoption() is the string %r." - " For choices this is optional and can be omitted, " - " but when supplied should be a type (for example `str` or `int`)." - " (options: %s)" % (typ, names), - DeprecationWarning, + ARGUMENT_TYPE_STR_CHOICE.format(typ=typ, names=names), stacklevel=4, ) # argparse expects a type here take it from @@ -239,11 +233,7 @@ class Argument: attrs["type"] = type(attrs["choices"][0]) else: warnings.warn( - "`type` argument to addoption() is the string %r, " - " but when supplied should be a type (for example `str` or `int`)." - " (options: %s)" % (typ, names), - DeprecationWarning, - stacklevel=4, + ARGUMENT_TYPE_STR.format(typ=typ, names=names), stacklevel=4 ) attrs["type"] = Argument._typ_map[typ] # Used in test_parseopt -> test_parse_defaultgetter. |