From b47b203eefda7df43c2b7945cb861e628eb867bf Mon Sep 17 00:00:00 2001
From: Patrick Lannigan
Date: Sun, 12 Nov 2023 20:07:51 -0500
Subject: [PATCH] More explict names
---
src/_pytest/assertion/__init__.py | 2 +-
src/_pytest/config/__init__.py | 8 ++++----
testing/test_assertion.py | 2 +-
testing/test_config.py | 2 +-
4 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/src/_pytest/assertion/__init__.py b/src/_pytest/assertion/__init__.py
index 6f729179a..e1e7a5e66 100644
--- a/src/_pytest/assertion/__init__.py
+++ b/src/_pytest/assertion/__init__.py
@@ -42,7 +42,7 @@ def pytest_addoption(parser: Parser) -> None:
help="Enables the pytest_assertion_pass hook. "
"Make sure to delete any previously generated pyc cache files.",
)
- Config._add_ini(
+ Config._add_verbosity_ini(
parser,
Config.VERBOSITY_ASSERTIONS,
help=(
diff --git a/src/_pytest/config/__init__.py b/src/_pytest/config/__init__.py
index fcc275cb4..414f78cf7 100644
--- a/src/_pytest/config/__init__.py
+++ b/src/_pytest/config/__init__.py
@@ -1682,7 +1682,7 @@ class Config:
):
return global_level
- level = self.getini(Config._ini_name(verbosity_type))
+ level = self.getini(Config._verbosity_ini_name(verbosity_type))
if level == Config._VERBOSITY_INI_DEFAULT:
return global_level
@@ -1690,11 +1690,11 @@ class Config:
return int(level)
@staticmethod
- def _ini_name(verbosity_type: str) -> str:
+ def _verbosity_ini_name(verbosity_type: str) -> str:
return f"verbosity_{verbosity_type}"
@staticmethod
- def _add_ini(parser: "Parser", verbosity_type: str, help: str) -> None:
+ def _add_verbosity_ini(parser: "Parser", verbosity_type: str, help: str) -> None:
"""Add a output verbosity configuration option for the given output type.
:param parser: Parser for command line arguments and ini-file values.
@@ -1705,7 +1705,7 @@ class Config:
:py:func:`config.get_verbosity(type) `.
"""
parser.addini(
- Config._ini_name(verbosity_type),
+ Config._verbosity_ini_name(verbosity_type),
help=help,
type="string",
default=Config._VERBOSITY_INI_DEFAULT,
diff --git a/testing/test_assertion.py b/testing/test_assertion.py
index 3c675bb32..22ac5b866 100644
--- a/testing/test_assertion.py
+++ b/testing/test_assertion.py
@@ -1907,7 +1907,7 @@ def test_fine_grained_assertion_verbosity(pytester: Pytester):
pytester.makeini(
f"""
[pytest]
- {_Config._ini_name(_Config.VERBOSITY_ASSERTIONS)} = 2
+ {_Config._verbosity_ini_name(_Config.VERBOSITY_ASSERTIONS)} = 2
"""
)
result = pytester.runpytest(str(p))
diff --git a/testing/test_config.py b/testing/test_config.py
index a9d882a79..b85e7e4a3 100644
--- a/testing/test_config.py
+++ b/testing/test_config.py
@@ -2254,7 +2254,7 @@ class TestVerbosity:
class VerbosityIni:
def pytest_addoption(self, parser: Parser) -> None:
- Config._add_ini(
+ Config._add_verbosity_ini(
parser, TestVerbosity.SOME_OUTPUT_TYPE, help="some help text"
)