From d61ad6d0016ce0589e34bb1fcf40a3d3b609552f Mon Sep 17 00:00:00 2001
From: Hinrich Mahler <22366557+Bibo-Joshi@users.noreply.github.com>
Date: Thu, 23 Sep 2021 11:48:58 +0200
Subject: [PATCH] Make ILQ.answer raise ValueError
---
telegram/inline/inlinequery.py | 19 +++++++++++--------
tests/test_inlinequery.py | 2 +-
2 files changed, 12 insertions(+), 9 deletions(-)
diff --git a/telegram/inline/inlinequery.py b/telegram/inline/inlinequery.py
index 47cec255bf4..de4d845d1be 100644
--- a/telegram/inline/inlinequery.py
+++ b/telegram/inline/inlinequery.py
@@ -127,26 +127,29 @@ def answer(
) -> bool:
"""Shortcut for::
- bot.answer_inline_query(update.inline_query.id,
- *args,
- current_offset=self.offset if auto_pagination else None,
- **kwargs)
+ bot.answer_inline_query(
+ update.inline_query.id,
+ *args,
+ current_offset=self.offset if auto_pagination else None,
+ **kwargs
+ )
For the documentation of the arguments, please see
:meth:`telegram.Bot.answer_inline_query`.
+ .. versionchanged:: 14.0
+ Raises :class:`ValueError` instead of :class:`TypeError`.
+
Args:
auto_pagination (:obj:`bool`, optional): If set to :obj:`True`, :attr:`offset` will be
passed as :attr:`current_offset` to :meth:`telegram.Bot.answer_inline_query`.
Defaults to :obj:`False`.
Raises:
- TypeError: If both :attr:`current_offset` and :attr:`auto_pagination` are supplied.
+ ValueError: If both :attr:`current_offset` and :attr:`auto_pagination` are supplied.
"""
if current_offset and auto_pagination:
- # We raise TypeError instead of ValueError for backwards compatibility with versions
- # which didn't check this here but let Python do the checking
- raise TypeError('current_offset and auto_pagination are mutually exclusive!')
+ raise ValueError('current_offset and auto_pagination are mutually exclusive!')
return self.bot.answer_inline_query(
inline_query_id=self.id,
current_offset=self.offset if auto_pagination else current_offset,
diff --git a/tests/test_inlinequery.py b/tests/test_inlinequery.py
index d9ce3217b6c..14e18264a93 100644
--- a/tests/test_inlinequery.py
+++ b/tests/test_inlinequery.py
@@ -92,7 +92,7 @@ def make_assertion(*_, **kwargs):
assert inline_query.answer(results=[])
def test_answer_error(self, inline_query):
- with pytest.raises(TypeError, match='mutually exclusive'):
+ with pytest.raises(ValueError, match='mutually exclusive'):
inline_query.answer(results=[], auto_pagination=True, current_offset='foobar')
def test_answer_auto_pagination(self, monkeypatch, inline_query):
pFad - Phonifier reborn
Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.
Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.
Alternative Proxies:
Alternative Proxy
pFad Proxy
pFad v3 Proxy
pFad v4 Proxy