Deprecate Inclusion of successful_payment in Message.effective_attachment (#4365)

This commit is contained in:
Poolitzer 2024-07-09 23:33:57 +02:00 committed by GitHub
parent 71e4015e22
commit 1714bfd8f6
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 26 additions and 2 deletions

View file

@ -1385,8 +1385,8 @@ class Message(MaybeInaccessibleMessage):
Voice, Voice,
None, None,
]: ]:
"""If this message is neither a plain text message nor a status update, this gives the """If the message is a user generated content which is not a plain text message, this
attachment that this message was sent with. This may be one of property is set to this content. It may be one of
* :class:`telegram.Audio` * :class:`telegram.Audio`
* :class:`telegram.Dice` * :class:`telegram.Dice`
@ -1419,6 +1419,9 @@ class Message(MaybeInaccessibleMessage):
.. versionchanged:: NEXT.VERSION .. versionchanged:: NEXT.VERSION
:attr:`paid_media` is now also considered to be an attachment. :attr:`paid_media` is now also considered to be an attachment.
.. deprecated:: NEXT.VERSION
:attr:`successful_payment` will be removed in future major versions.
""" """
if not isinstance(self._effective_attachment, DefaultValue): if not isinstance(self._effective_attachment, DefaultValue):
return self._effective_attachment return self._effective_attachment
@ -1426,6 +1429,15 @@ class Message(MaybeInaccessibleMessage):
for attachment_type in MessageAttachmentType: for attachment_type in MessageAttachmentType:
if self[attachment_type]: if self[attachment_type]:
self._effective_attachment = self[attachment_type] # type: ignore[assignment] self._effective_attachment = self[attachment_type] # type: ignore[assignment]
if attachment_type == MessageAttachmentType.SUCCESSFUL_PAYMENT:
warn(
PTBDeprecationWarning(
"NEXT.VERSION",
"successful_payment will no longer be considered an attachment in"
" future major versions",
),
stacklevel=2,
)
break break
else: else:
self._effective_attachment = None self._effective_attachment = None

View file

@ -2774,3 +2774,15 @@ class TestMessageWithoutRequest(TestMessageBase):
monkeypatch.setattr(message.get_bot(), "unpin_all_forum_topic_messages", make_assertion) monkeypatch.setattr(message.get_bot(), "unpin_all_forum_topic_messages", make_assertion)
assert await message.unpin_all_forum_topic_messages() assert await message.unpin_all_forum_topic_messages()
def test_attachement_successful_payment_deprecated(self, message, recwarn):
message.successful_payment = "something"
# kinda unnecessary to assert but one needs to call the function ofc so. Here we are.
assert message.effective_attachment == "something"
assert len(recwarn) == 1
assert (
"successful_payment will no longer be considered an attachment in future major "
"versions" in str(recwarn[0].message)
)
assert recwarn[0].category is PTBDeprecationWarning
assert recwarn[0].filename == __file__