diff --git a/examples/paymentbot.py b/examples/paymentbot.py index 90daa44ce2a..dfa641cccc8 100644 --- a/examples/paymentbot.py +++ b/examples/paymentbot.py @@ -61,9 +61,9 @@ async def start_with_shipping_callback(update: Update, context: ContextTypes.DEF title, description, payload, - PAYMENT_PROVIDER_TOKEN, currency, prices, + provider_token=PAYMENT_PROVIDER_TOKEN, need_name=True, need_phone_number=True, need_email=True, @@ -90,7 +90,13 @@ async def start_without_shipping_callback( # optionally pass need_name=True, need_phone_number=True, # need_email=True, need_shipping_address=True, is_flexible=True await context.bot.send_invoice( - chat_id, title, description, payload, PAYMENT_PROVIDER_TOKEN, currency, prices + chat_id, + title, + description, + payload, + currency, + prices, + provider_token=PAYMENT_PROVIDER_TOKEN, ) diff --git a/telegram/_bot.py b/telegram/_bot.py index f8581bda17a..c437203e73e 100644 --- a/telegram/_bot.py +++ b/telegram/_bot.py @@ -5177,9 +5177,9 @@ async def send_invoice( title: str, description: str, payload: str, - provider_token: Optional[str], # This arg is now optional as of Bot API 7.4 currency: str, prices: Sequence["LabeledPrice"], + provider_token: Optional[str] = None, start_parameter: Optional[str] = None, photo_url: Optional[str] = None, photo_size: Optional[int] = None, @@ -5232,13 +5232,13 @@ async def send_invoice( :tg-const:`telegram.Invoice.MIN_PAYLOAD_LENGTH`- :tg-const:`telegram.Invoice.MAX_PAYLOAD_LENGTH` bytes. This will not be displayed to the user, use it for your internal processes. - provider_token (:obj:`str`): Payments provider token, obtained via + provider_token (:obj:`str`, optional): Payments provider token, obtained via `@BotFather `_. Pass an empty string for payments in |tg_stars|. - .. deprecated:: 21.3 - As of Bot API 7.4, this parameter is now optional and future versions of the - library will make it optional as well. + .. versionchanged:: NEXT.VERSION + Bot API 7.4 made this parameter is optional and this is now reflected in the + function signature. currency (:obj:`str`): Three-letter ISO 4217 currency code, see `more on currencies `_. Pass ``XTR`` for @@ -8252,9 +8252,9 @@ async def create_invoice_link( title: str, description: str, payload: str, - provider_token: Optional[str], # This arg is now optional as of Bot API 7.4 currency: str, prices: Sequence["LabeledPrice"], + provider_token: Optional[str] = None, max_tip_amount: Optional[int] = None, suggested_tip_amounts: Optional[Sequence[int]] = None, provider_data: Optional[Union[str, object]] = None, @@ -8296,13 +8296,13 @@ async def create_invoice_link( :tg-const:`telegram.Invoice.MIN_PAYLOAD_LENGTH`- :tg-const:`telegram.Invoice.MAX_PAYLOAD_LENGTH` bytes. This will not be displayed to the user, use it for your internal processes. - provider_token (:obj:`str`): Payments provider token, obtained via + provider_token (:obj:`str`, optional): Payments provider token, obtained via `@BotFather `_. Pass an empty string for payments in |tg_stars|. - .. deprecated:: 21.3 - As of Bot API 7.4, this parameter is now optional and future versions of the - library will make it optional as well. + .. versionchanged:: NEXT.VERSION + Bot API 7.4 made this parameter is optional and this is now reflected in the + function signature. currency (:obj:`str`): Three-letter ISO 4217 currency code, see `more on currencies `_. Pass ``XTR`` for diff --git a/telegram/_chat.py b/telegram/_chat.py index ee4c25f59b6..71cfdc034ff 100644 --- a/telegram/_chat.py +++ b/telegram/_chat.py @@ -1576,9 +1576,9 @@ async def send_invoice( title: str, description: str, payload: str, - provider_token: Optional[str], currency: str, prices: Sequence["LabeledPrice"], + provider_token: Optional[str] = None, start_parameter: Optional[str] = None, photo_url: Optional[str] = None, photo_size: Optional[int] = None, diff --git a/telegram/_inline/inputinvoicemessagecontent.py b/telegram/_inline/inputinvoicemessagecontent.py index 11f248513ee..5b2215eec4c 100644 --- a/telegram/_inline/inputinvoicemessagecontent.py +++ b/telegram/_inline/inputinvoicemessagecontent.py @@ -35,9 +35,11 @@ class InputInvoiceMessageContent(InputMessageContent): Objects of this class are comparable in terms of equality. Two objects of this class are considered equal, if their :attr:`title`, :attr:`description`, :attr:`payload`, - :attr:`provider_token`, :attr:`currency` and :attr:`prices` are equal. + :attr:`currency` and :attr:`prices` are equal. .. versionadded:: 13.5 + .. versionchanged:: NEXT.VERSION + :attr:`provider_token` is no longer considered for equality comparison. Args: title (:obj:`str`): Product name. :tg-const:`telegram.Invoice.MIN_TITLE_LENGTH`- @@ -49,13 +51,13 @@ class InputInvoiceMessageContent(InputMessageContent): :tg-const:`telegram.Invoice.MIN_PAYLOAD_LENGTH`- :tg-const:`telegram.Invoice.MAX_PAYLOAD_LENGTH` bytes. This will not be displayed to the user, use it for your internal processes. - provider_token (:obj:`str`): Payment provider token, obtained via + provider_token (:obj:`str`, optional): Payment provider token, obtained via `@Botfather `_. Pass an empty string for payments in |tg_stars|. - .. deprecated:: 21.3 - As of Bot API 7.4, this parameter is now optional and future versions of the - library will make it optional as well. + .. versionchanged:: NEXT.VERSION + Bot API 7.4 made this parameter is optional and this is now reflected in the + class signature. currency (:obj:`str`): Three-letter ISO 4217 currency code, see more on `currencies `_. Pass ``XTR`` for payments in |tg_stars|. @@ -199,9 +201,9 @@ def __init__( title: str, description: str, payload: str, - provider_token: Optional[str], # This arg is now optional since Bot API 7.4 currency: str, prices: Sequence[LabeledPrice], + provider_token: Optional[str] = None, max_tip_amount: Optional[int] = None, suggested_tip_amounts: Optional[Sequence[int]] = None, provider_data: Optional[str] = None, @@ -225,10 +227,10 @@ def __init__( self.title: str = title self.description: str = description self.payload: str = payload - self.provider_token: Optional[str] = provider_token self.currency: str = currency self.prices: tuple[LabeledPrice, ...] = parse_sequence_arg(prices) # Optionals + self.provider_token: Optional[str] = provider_token self.max_tip_amount: Optional[int] = max_tip_amount self.suggested_tip_amounts: tuple[int, ...] = parse_sequence_arg(suggested_tip_amounts) self.provider_data: Optional[str] = provider_data @@ -248,7 +250,6 @@ def __init__( self.title, self.description, self.payload, - self.provider_token, self.currency, self.prices, ) diff --git a/telegram/_message.py b/telegram/_message.py index e5e5ce7ed4f..e214192ff98 100644 --- a/telegram/_message.py +++ b/telegram/_message.py @@ -3382,9 +3382,9 @@ async def reply_invoice( title: str, description: str, payload: str, - provider_token: Optional[str], currency: str, prices: Sequence["LabeledPrice"], + provider_token: Optional[str] = None, start_parameter: Optional[str] = None, photo_url: Optional[str] = None, photo_size: Optional[int] = None, diff --git a/telegram/_user.py b/telegram/_user.py index 0ef1d8d66d4..36ca542ce46 100644 --- a/telegram/_user.py +++ b/telegram/_user.py @@ -1018,9 +1018,9 @@ async def send_invoice( title: str, description: str, payload: str, - provider_token: Optional[str], currency: str, prices: Sequence["LabeledPrice"], + provider_token: Optional[str] = None, start_parameter: Optional[str] = None, photo_url: Optional[str] = None, photo_size: Optional[int] = None, diff --git a/telegram/ext/_extbot.py b/telegram/ext/_extbot.py index e8f207e24ef..6bd8a10a680 100644 --- a/telegram/ext/_extbot.py +++ b/telegram/ext/_extbot.py @@ -1195,9 +1195,9 @@ async def create_invoice_link( title: str, description: str, payload: str, - provider_token: Optional[str], currency: str, prices: Sequence["LabeledPrice"], + provider_token: Optional[str] = None, max_tip_amount: Optional[int] = None, suggested_tip_amounts: Optional[Sequence[int]] = None, provider_data: Optional[Union[str, object]] = None, @@ -2768,9 +2768,9 @@ async def send_invoice( title: str, description: str, payload: str, - provider_token: Optional[str], currency: str, prices: Sequence["LabeledPrice"], + provider_token: Optional[str] = None, start_parameter: Optional[str] = None, photo_url: Optional[str] = None, photo_size: Optional[int] = None, diff --git a/tests/_inline/test_inputinvoicemessagecontent.py b/tests/_inline/test_inputinvoicemessagecontent.py index a3d6e1a0dc7..d3d431c6843 100644 --- a/tests/_inline/test_inputinvoicemessagecontent.py +++ b/tests/_inline/test_inputinvoicemessagecontent.py @@ -282,10 +282,10 @@ def test_equality(self): self.title, self.description, self.payload, - self.provider_token, self.currency, # the first prices amount & the second lebal changed [LabeledPrice("label1", 24), LabeledPrice("label22", 314)], + self.provider_token, ) d = InputInvoiceMessageContent( self.title, diff --git a/tests/_payment/test_invoice.py b/tests/_payment/test_invoice.py index e3506632fe5..a41b620aaf3 100644 --- a/tests/_payment/test_invoice.py +++ b/tests/_payment/test_invoice.py @@ -269,9 +269,9 @@ async def test_send_invoice_default_protect_content( self.title, self.description, self.payload, - provider_token, self.currency, self.prices, + provider_token, **kwargs, ) for kwargs in ({}, {"protect_content": False}) @@ -301,7 +301,6 @@ async def test_send_invoice_default_allow_sending_without_reply( self.title, self.description, self.payload, - "", # using tg stars "XTR", [self.prices[0]], allow_sending_without_reply=custom, @@ -315,9 +314,9 @@ async def test_send_invoice_default_allow_sending_without_reply( self.title, self.description, self.payload, - provider_token, self.currency, self.prices, + provider_token, reply_to_message_id=reply_to_message.message_id, ) assert message.reply_to_message is None @@ -328,9 +327,9 @@ async def test_send_invoice_default_allow_sending_without_reply( self.title, self.description, self.payload, - provider_token, self.currency, self.prices, + provider_token, reply_to_message_id=reply_to_message.message_id, ) @@ -340,9 +339,9 @@ async def test_send_all_args_send_invoice(self, bot, chat_id, provider_token): self.title, self.description, self.payload, - provider_token, self.currency, self.prices, + provider_token=provider_token, max_tip_amount=self.max_tip_amount, suggested_tip_amounts=self.suggested_tip_amounts, start_parameter=self.start_parameter, diff --git a/tests/test_chat.py b/tests/test_chat.py index 27c3f934008..eb679a2f227 100644 --- a/tests/test_chat.py +++ b/tests/test_chat.py @@ -610,9 +610,9 @@ async def make_assertion(*_, **kwargs): "title", "description", "payload", - "provider_token", "currency", "prices", + "provider_token", ) async def test_instance_method_send_location(self, monkeypatch, chat): diff --git a/tests/test_message.py b/tests/test_message.py index 525dbaad07a..1bed96737d4 100644 --- a/tests/test_message.py +++ b/tests/test_message.py @@ -2216,9 +2216,9 @@ async def make_assertion(*_, **kwargs): "title", "description", "payload", - "provider_token", "currency", "prices", + "provider_token", ) await self.check_quote_parsing( message, diff --git a/tests/test_official/exceptions.py b/tests/test_official/exceptions.py index fa12c040828..7d21a5e3cbe 100644 --- a/tests/test_official/exceptions.py +++ b/tests/test_official/exceptions.py @@ -206,9 +206,7 @@ def ignored_param_requirements(object_name: str) -> set[str]: # Arguments that are optional arguments for now for backwards compatibility -BACKWARDS_COMPAT_KWARGS: dict[str, set[str]] = { - "send_invoice|create_invoice_link|InputInvoiceMessageContent": {"provider_token"}, -} +BACKWARDS_COMPAT_KWARGS: dict[str, set[str]] = {} def backwards_compat_kwargs(object_name: str) -> set[str]: diff --git a/tests/test_user.py b/tests/test_user.py index 54657c59047..3953d7e9efb 100644 --- a/tests/test_user.py +++ b/tests/test_user.py @@ -343,9 +343,9 @@ async def make_assertion(*_, **kwargs): "title", "description", "payload", - "provider_token", "currency", "prices", + "provider_token", ) async def test_instance_method_send_location(self, monkeypatch, user):