pyTelegramBotAPI 4.37.0__tar.gz → 4.37.1__tar.gz

{pytelegrambotapi-4.37.0 → pytelegrambotapi-4.37.1}/.github/workflows/setup_python.yml

@@ -20,7 +20,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: [ '3.10', '3.11', '3.12', '3.13', '3.14', 'pypy-3.11']
+        python-version: [ '3.11', '3.12', '3.13', '3.14', '3.15', 'pypy-3.11', 'pypy-3.12']
     name: ${{ matrix.python-version }} and tests
     steps:
       - uses: actions/checkout@v2

{pytelegrambotapi-4.37.0 → pytelegrambotapi-4.37.1}/.travis.yml

@@ -1,10 +1,10 @@
 language: python
 python:
-    - "3.10"
     - "3.11"
     - "3.12"
     - "3.13"
     - "3.14"
+    - "3.15"
     - "pypy3"
 install: "pip install -r requirements.txt"
 script:

{pytelegrambotapi-4.37.0 → pytelegrambotapi-4.37.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: pyTelegramBotAPI
-Version: 4.37.0
+Version: 4.37.1
 Summary: Python Telegram bot API.
 Project-URL: Homepage, https://github.com/eternnoir/pyTelegramBotAPI
 Project-URL: Documentation, https://pytba.readthedocs.org
@@ -14,12 +14,12 @@ Classifier: Development Status :: 5 - Production/Stable
 Classifier: Environment :: Console
 Classifier: License :: OSI Approved :: GNU General Public License v2 (GPLv2)
 Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
 Classifier: Programming Language :: Python :: 3.14
-Requires-Python: >=3.10
+Classifier: Programming Language :: Python :: 3.15
+Requires-Python: >=3.11
 Requires-Dist: aiohttp
 Requires-Dist: requests
 Provides-Extra: coloredlogs
@@ -111,7 +111,7 @@ Description-Content-Type: text/markdown
 
 ## Getting started
 
-This API is tested with Python 3.10-3.14 and PyPy 3.
+This API is tested with Python 3.11-3.15 and PyPy 3.
 There are two ways to install the library:
 
 * Installation using pip (a Python package manager):

{pytelegrambotapi-4.37.0 → pytelegrambotapi-4.37.1}/README.md

@@ -69,7 +69,7 @@
 
 ## Getting started
 
-This API is tested with Python 3.10-3.14 and PyPy 3.
+This API is tested with Python 3.11-3.15 and PyPy 3.
 There are two ways to install the library:
 
 * Installation using pip (a Python package manager):

{pytelegrambotapi-4.37.0 → pytelegrambotapi-4.37.1}/docs/source/conf.py

@@ -22,7 +22,7 @@ author = 'coder2020official'
 copyright = f'2022-{datetime.now().year}, {author}'
 
 # The full version, including alpha/beta/rc tags
-release = '4.37.0'
+release = '4.37.1'
 
 
 # -- General configuration ---------------------------------------------------

{pytelegrambotapi-4.37.0 → pytelegrambotapi-4.37.1}/pyproject.toml

@@ -4,21 +4,21 @@ build-backend = "hatchling.build"
 
 [project]
 name = "pyTelegramBotAPI"
-version = "4.37.0"
+version = "4.37.1"
 description = "Python Telegram bot API."
 authors = [{name = "eternnoir", email = "eternnoir@gmail.com"}]
 license = {text = "GPL2"}
 readme = "README.md"
-requires-python = ">=3.10"
+requires-python = ">=3.11"
 keywords = ["telegram", "bot", "api", "tools"]
 classifiers = [
     "Development Status :: 5 - Production/Stable",
     "Programming Language :: Python :: 3",
-    "Programming Language :: Python :: 3.10",
     "Programming Language :: Python :: 3.11",
     "Programming Language :: Python :: 3.12",
     "Programming Language :: Python :: 3.13",
     "Programming Language :: Python :: 3.14",
+    "Programming Language :: Python :: 3.15",
     "Environment :: Console",
     "License :: OSI Approved :: GNU General Public License v2 (GPLv2)"
 ]

{pytelegrambotapi-4.37.0 → pytelegrambotapi-4.37.1}/telebot/__init__.py

@@ -7447,7 +7447,7 @@ class TeleBot:
 
 
     def answer_callback_query(
-            self, callback_query_id: int,
+            self, callback_query_id: str,
             text: Optional[str]=None, show_alert: Optional[bool]=None,
             url: Optional[str]=None, cache_time: Optional[int]=None) -> bool:
         """
@@ -7457,7 +7457,7 @@ class TeleBot:
         Telegram documentation: https://core.telegram.org/bots/api#answercallbackquery
 
         :param callback_query_id: Unique identifier for the query to be answered
-        :type callback_query_id: :obj:`int`
+        :type callback_query_id: :obj:`str`
 
         :param text: Text of the notification. If not specified, nothing will be shown to the user, 0-200 characters
         :type text: :obj:`str`

{pytelegrambotapi-4.37.0 → pytelegrambotapi-4.37.1}/telebot/async_telebot.py

@@ -9130,7 +9130,7 @@ class AsyncTeleBot:
         return await asyncio_helper.unpin_all_general_forum_topic_messages(self.token, chat_id)
 
     async def answer_callback_query(
-            self, callback_query_id: int,
+            self, callback_query_id: str,
             text: Optional[str]=None, show_alert: Optional[bool]=None,
             url: Optional[str]=None, cache_time: Optional[int]=None) -> bool:
         """
@@ -9140,7 +9140,7 @@ class AsyncTeleBot:
         Telegram documentation: https://core.telegram.org/bots/api#answercallbackquery
 
         :param callback_query_id: Unique identifier for the query to be answered
-        :type callback_query_id: :obj:`int`
+        :type callback_query_id: :obj:`str`
 
         :param text: Text of the notification. If not specified, nothing will be shown to the user, 0-200 characters
         :type text: :obj:`str`

{pytelegrambotapi-4.37.0 → pytelegrambotapi-4.37.1}/telebot/states/asyncio/middleware.py

@@ -1,21 +1,21 @@
-from telebot.asyncio_handler_backends import BaseMiddleware
-from telebot.async_telebot import AsyncTeleBot
-from telebot.states.sync.context import StateContext
-from telebot.util import update_types
-from telebot import types
-
-
-class StateMiddleware(BaseMiddleware):
-
-    def __init__(self, bot: AsyncTeleBot) -> None:
-        self.update_sensitive = False
-        self.update_types = update_types
-        self.bot: AsyncTeleBot = bot
-
-    async def pre_process(self, message, data):
-        state_context = StateContext(message, self.bot)
-        data["state_context"] = state_context
-        data["state"] = state_context  # 2 ways to access state context
-
-    async def post_process(self, message, data, exception):
-        pass
+from telebot.asyncio_handler_backends import BaseMiddleware
+from telebot.async_telebot import AsyncTeleBot
+from telebot.states.asyncio.context import StateContext
+from telebot.util import update_types
+from telebot import types
+
+
+class StateMiddleware(BaseMiddleware):
+
+    def __init__(self, bot: AsyncTeleBot) -> None:
+        self.update_sensitive = False
+        self.update_types = update_types
+        self.bot: AsyncTeleBot = bot
+
+    async def pre_process(self, message, data):
+        state_context = StateContext(message, self.bot)
+        data["state_context"] = state_context
+        data["state"] = state_context  # 2 ways to access state context
+
+    async def post_process(self, message, data, exception):
+        pass

{pytelegrambotapi-4.37.0 → pytelegrambotapi-4.37.1}/telebot/types.py

@@ -14688,16 +14688,17 @@ class RichText(JsonDeserializable, Dictionaryable, ABC):
         if json_string is None: return None
         if isinstance(json_string, str):
             # "...can be either a String for plain text..."
-            if (json_string.startswith('{') and json_string.endswith('}')) or (json_string.startswith('[') and json_string.endswith(']')):
-                try:
-                    # Check if string is valid json. If so, assume it's json, not plain string
-                    json.loads(json_string)
-                    # If it's valid json, continue to json processing below
-                except (ValueError, TypeError, json.JSONDecodeError):
-                    # If it's not valid json, return the string as is
-                    return json_string
-            else:
+            # Only a JSON object is a serialized RichText. Plain text can look
+            # like JSON too, e.g. a "[56]" footnote mark, and stays text.
+            if not (json_string.startswith('{') and json_string.endswith('}')):
+                return json_string
+            try:
+                parsed = json.loads(json_string)
+            except (ValueError, TypeError):
+                return json_string
+            if not isinstance(parsed, dict):
                 return json_string
+            json_string = parsed
         elif isinstance(json_string, list):
             # "...an Array of :class:`RichText`..."
             return [RichText.de_json(item) for item in json_string]

{pytelegrambotapi-4.37.0 → pytelegrambotapi-4.37.1}/telebot/version.py

@@ -1,3 +1,3 @@
 # Versions should comply with PEP440.
 # This line is parsed in setup.py:
-__version__ = '4.37.0'
+__version__ = '4.37.1'

{pytelegrambotapi-4.37.0 → pytelegrambotapi-4.37.1}/tests/test_types.py

@@ -547,6 +547,17 @@ def test_json_richtextbold():
     assert result.text == 'Test'
 
 
+def test_json_richtext_plain_text_that_looks_like_json():
+    # issue #2634: a "[56]" footnote mark is plain text, not a JSON array
+    json_str = r'{"type": "url", "text": {"type": "superscript", "text": "[56]"}, "url": "https://example.com/#cite_note-56"}'
+    result = types.RichText.de_json(json_str)
+    assert isinstance(result, types.RichTextUrl)
+    assert isinstance(result.text, types.RichTextSuperscript)
+    assert result.text.text == '[56]'
+    for text in ['[56]', '[]', '{}x', '123', 'null', '["a", "b"]']:
+        assert types.RichText.de_json(text) == text
+
+
 def test_json_richtextitalic():
     json_str = r'{"type": "italic", "text": "Test"}'
     result = types.RichText.de_json(json_str)