Skip to content

Commit 2ec4186

Browse files
committed
Remove init deprecations from transformer classes
These deprecations are no longer relevant as the entire module was deprecated
1 parent 61b1dd8 commit 2ec4186

File tree

2 files changed

+4
-40
lines changed

2 files changed

+4
-40
lines changed

mcstatus/motd/_transformers.py

Lines changed: 4 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
import typing as t
55
from collections.abc import Callable, Sequence
66

7-
from mcstatus._utils import deprecation_warn
87
from mcstatus.motd.components import Formatting, MinecraftColor, ParsedMotdComponent, TranslationTag, WebColor
98

109
__all__ = [
@@ -143,14 +142,6 @@ def _handle_str(self, element: str, /) -> str:
143142

144143

145144
class MinecraftTransformer(PlainTransformer):
146-
def __init__(self, *, _is_called_directly: bool = True) -> None:
147-
if _is_called_directly:
148-
deprecation_warn(
149-
obj_name="MinecraftTransformer (called directly)",
150-
removal_version="13.0.0",
151-
extra_msg="Transformers are no longer a part of public API",
152-
)
153-
154145
def _handle_component(self, component: ParsedMotdComponent) -> tuple[str, str] | tuple[str]:
155146
result = super()._handle_component(component)
156147
if len(result) == 2:
@@ -172,15 +163,8 @@ class HtmlTransformer(PlainTransformer):
172163
Formatting.UNDERLINED: "u",
173164
}
174165

175-
def __init__(self, *, bedrock: bool = False, _is_called_directly: bool = True) -> None:
176-
if _is_called_directly:
177-
# NOTE: don't forget to remove the default value for `bedrock` argument
178-
deprecation_warn(
179-
obj_name="HtmlTransformer (called directly)",
180-
removal_version="13.0.0",
181-
extra_msg="Transformers are no longer a part of public API",
182-
)
183-
166+
# TODO: When dropping v13 support, make sure to drop the default value for the bedrock arg
167+
def __init__(self, *, bedrock: bool = False) -> None:
184168
self.bedrock = bedrock
185169
self.on_reset: list[str] = []
186170

@@ -235,15 +219,8 @@ class AnsiTransformer(PlainTransformer):
235219
key: foreground for key, (foreground, _background) in _MINECRAFT_COLOR_TO_RGB_BEDROCK.items()
236220
}
237221

238-
def __init__(self, *, bedrock: bool = True, _is_called_directly: bool = True) -> None:
239-
if _is_called_directly:
240-
# NOTE: don't forget to remove the default value for `bedrock` argument
241-
deprecation_warn(
242-
obj_name="AnsiTransformer (called directly)",
243-
removal_version="13.0.0",
244-
extra_msg="Transformers are no longer a part of public API",
245-
)
246-
222+
# TODO: When dropping v13 support, make sure to drop the default value for the bedrock arg
223+
def __init__(self, *, bedrock: bool = True) -> None:
247224
self.bedrock = bedrock
248225

249226
def ansi_color(self, color: tuple[int, int, int] | MinecraftColor) -> str:

tests/motd/test_transformers.py

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
import pytest
77

88
from mcstatus.motd import Motd
9-
from mcstatus.motd._transformers import AnsiTransformer, HtmlTransformer, MinecraftTransformer, PlainTransformer
109

1110
if typing.TYPE_CHECKING:
1211
from collections.abc import Callable
@@ -185,15 +184,3 @@ def test_correct_output_bedrock(self, result: Callable[[str | dict, bool], str],
185184
"32\033[0m"
186185
"\033[0m\033[0m"
187186
)
188-
189-
190-
@pytest.mark.parametrize("transformer", [PlainTransformer, MinecraftTransformer, HtmlTransformer, AnsiTransformer])
191-
def test_is_calling_directly(transformer: type):
192-
with pytest.deprecated_call(
193-
match=(
194-
f"^{transformer.__name__} \\(called directly\\) is deprecated and "
195-
r"scheduled for removal in 13.0.0. \(Transformers are no longer "
196-
r"a part of public API\)$"
197-
)
198-
):
199-
transformer()

0 commit comments

Comments
 (0)