python-telegram-bot · eldbud · Jul 14, 2021 · Jul 21, 2021 · Aug 1, 2021 · Aug 1, 2021
diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
@@ -25,6 +25,8 @@ Hey! You're PRing? Cool! Please have a look at the below checklist. It's here to
 * If relevant:
 
     - [ ] Added new constants at `telegram.constants` and shortcuts to them as class variables
+    - [ ] Link new and existing constants in docstrings instead of hard coded number and strings
+    - [ ] Add new message types to `Message.effective_attachment`
     - [ ] Added new handlers for new update types
     - [ ] Added new filters for new message (sub)types
     - [ ] Added or updated documentation for the changed class(es) and/or method(s)

diff --git a/docs/source/conf.py b/docs/source/conf.py
@@ -13,11 +13,18 @@
 # serve to show the default.
 import sys
 import os
-# import telegram
+from enum import Enum
+from typing import Tuple
 
 # If extensions (or modules to document with autodoc) are in another directory,
 # add these directories to sys.path here. If the directory is relative to the
 # documentation root, use os.path.abspath to make it absolute, like shown here.
+from docutils.nodes import Element
+from sphinx.application import Sphinx
+from sphinx.domains.python import PyXRefRole
+from sphinx.environment import BuildEnvironment
+from sphinx.util import logging
+
 sys.path.insert(0, os.path.abspath('../..'))
 
 # -- General configuration ------------------------------------------------
@@ -30,8 +37,16 @@
 # ones.
 extensions = [
     'sphinx.ext.autodoc',
-    'sphinx.ext.napoleon'
+    'sphinx.ext.napoleon',
+    'sphinx.ext.intersphinx'
 ]
+
+# Use intersphinx to reference the python builtin library docs
+intersphinx_mapping = {
+    'python': ('https://docs.python.org/3', None),
+    'APScheduler': ('https://apscheduler.readthedocs.io/en/3.x/', None)
+}
+
 # Don't show type hints in the signature - that just makes it hardly readable
 # and we document the types anyway
 autodoc_typehints = 'none'
@@ -45,7 +60,7 @@
 source_suffix = '.rst'
 
 # The encoding of source files.
-#source_encoding = 'utf-8-sig'
+# source_encoding = 'utf-8-sig'
 
 # The master toctree document.
 master_doc = 'index'
@@ -299,11 +314,62 @@
 
 # -- script stuff --------------------------------------------------------
 
+# get the sphinx(!) logger
+# Makes sure logs render in red and also plays nicely with e.g. the `nitpicky` option.
+sphinx_logger = logging.getLogger(__name__)
+
+CONSTANTS_ROLE = 'tg-const'
+import telegram  # We need this so that the `eval` below works
+
+
+class TGConstXRefRole(PyXRefRole):
+    """This is a bit of Sphinx magic. We add a new role type called tg-const that allows us to
+    reference values from the `telegram.constants.module` while using the actual value as title
+    of the link.
+
+    Example:
+
+        :tg-const:`telegram.constants.MessageLimit.TEXT_LENGTH` renders as `4096` but links to the
+        constant.
+    """
+    def process_link(self, env: BuildEnvironment, refnode: Element,
+                     has_explicit_title: bool, title: str, target: str) -> Tuple[str, str]:
+        title, target = super().process_link(env, refnode, has_explicit_title, title, target)
+        try:
+            # We use `eval` to get the value of the expression. Maybe there are better ways to
+            # do this via importlib or so, but it does the job for now
+            value = eval(target)
+            # Maybe we need a better check if the target is actually from tg.constants
+            # for now checking if it's an Enum suffices since those are used nowhere else in PTB
+            if isinstance(value, Enum):
+                # Special casing for file size limits
+                if isinstance(value, telegram.constants.FileSizeLimit):
+                    return f'{int(value.value / 1e6)} MB', target
+                return repr(value.value), target
+            sphinx_logger.warning(
+                f'%s:%d: WARNING: Did not convert reference %s. :{CONSTANTS_ROLE}: is not supposed'
+                ' to be used with this type of target.',
+                refnode.source,
+                refnode.line,
+                refnode.rawsource,
+            )
+            return title, target
+        except Exception as exc:
+            sphinx_logger.exception(
+                f'%s:%d: WARNING: Did not convert reference %s due to an exception.',
+                refnode.source,
+                refnode.line,
+                refnode.rawsource,
+                exc_info=exc
+            )
+            return title, target
+
 
 def autodoc_skip_member(app, what, name, obj, skip, options):
     pass
 
 
-def setup(app):
+def setup(app: Sphinx):
     app.add_css_file("dark.css")
     app.connect('autodoc-skip-member', autodoc_skip_member)
+    app.add_role_to_domain('py', CONSTANTS_ROLE, TGConstXRefRole())
diff --git a/docs/source/telegram.chataction.rst b/docs/source/telegram.chataction.rst
diff --git a/docs/source/telegram.ext.utils.stack.rst b/docs/source/telegram.ext.utils.stack.rst
diff --git a/docs/source/telegram.parsemode.rst b/docs/source/telegram.parsemode.rst
diff --git a/docs/source/telegram.rst b/docs/source/telegram.rst
@@ -17,7 +17,6 @@ telegram package
     telegram.botcommandscopechatmember
     telegram.callbackquery
     telegram.chat
-    telegram.chataction
     telegram.chatinvitelink
     telegram.chatlocation
     telegram.chatmember
@@ -52,7 +51,6 @@ telegram package
     telegram.messageautodeletetimerchanged
     telegram.messageid
     telegram.messageentity
-    telegram.parsemode
     telegram.photosize
     telegram.poll
     telegram.pollanswer

diff --git a/examples/chatmemberbot.py b/examples/chatmemberbot.py
@@ -14,7 +14,8 @@
 import logging
 from typing import Tuple, Optional
 
-from telegram import Update, Chat, ChatMember, ParseMode, ChatMemberUpdated
+from telegram import Update, Chat, ChatMember, ChatMemberUpdated
+from telegram.constants import ParseMode
 from telegram.ext import (
     CommandHandler,
     ChatMemberHandler,

diff --git a/examples/contexttypesbot.py b/examples/contexttypesbot.py
@@ -13,7 +13,8 @@
 from collections import defaultdict
 from typing import DefaultDict, Optional, Set
 
-from telegram import Update, InlineKeyboardButton, InlineKeyboardMarkup, ParseMode
+from telegram import Update, InlineKeyboardButton, InlineKeyboardMarkup
+from telegram.constants import ParseMode
 from telegram.ext import (
     CommandHandler,
     CallbackContext,
@@ -57,7 +58,7 @@ def message_clicks(self) -> Optional[int]:
     def message_clicks(self, value: int) -> None:
         """Allow to change the count"""
         if not self._message_id:
-            raise RuntimeError('There is no message associated with this context obejct.')
+            raise RuntimeError('There is no message associated with this context object.')
         self.chat_data.clicks_per_message[self._message_id] = value
 
     @classmethod

diff --git a/examples/deeplinking.py b/examples/deeplinking.py
@@ -20,7 +20,8 @@
 
 import logging
 
-from telegram import ParseMode, InlineKeyboardMarkup, InlineKeyboardButton, Update, helpers
+from telegram import InlineKeyboardMarkup, InlineKeyboardButton, Update, helpers
+from telegram.constants import ParseMode
 from telegram.ext import (
     CommandHandler,
     CallbackQueryHandler,

diff --git a/examples/errorhandlerbot.py b/examples/errorhandlerbot.py
@@ -8,7 +8,8 @@
 import logging
 import traceback
 
-from telegram import Update, ParseMode
+from telegram import Update
+from telegram.constants import ParseMode
 from telegram.ext import CommandHandler, Updater, CallbackContext
 
 # Enable logging

diff --git a/examples/inlinebot.py b/examples/inlinebot.py
@@ -15,7 +15,8 @@
 import logging
 from uuid import uuid4
 
-from telegram import InlineQueryResultArticle, ParseMode, InputTextMessageContent, Update
+from telegram import InlineQueryResultArticle, InputTextMessageContent, Update
+from telegram.constants import ParseMode
 from telegram.helpers import escape_markdown
 from telegram.ext import Updater, InlineQueryHandler, CommandHandler, CallbackContext
 

diff --git a/examples/pollbot.py b/examples/pollbot.py
@@ -11,13 +11,13 @@
 
 from telegram import (
     Poll,
-    ParseMode,
     KeyboardButton,
     KeyboardButtonPollType,
     ReplyKeyboardMarkup,
     ReplyKeyboardRemove,
     Update,
 )
+from telegram.constants import ParseMode
 from telegram.ext import (
     CommandHandler,
     PollAnswerHandler,

diff --git a/telegram/__init__.py b/telegram/__init__.py
@@ -47,7 +47,6 @@
 from ._files.location import Location
 from ._files.venue import Venue
 from ._files.videonote import VideoNote
-from ._chataction import ChatAction
 from ._dice import Dice
 from ._userprofilephotos import UserProfilePhotos
 from ._keyboardbuttonpolltype import KeyboardButtonPollType
@@ -58,7 +57,6 @@
 from ._forcereply import ForceReply
 from ._files.inputfile import InputFile
 from ._files.file import File
-from ._parsemode import ParseMode
 from ._messageentity import MessageEntity
 from ._messageid import MessageId
 from ._games.game import Game
@@ -168,6 +166,7 @@
     'Animation',
     'Audio',
     'Bot',
+    'bot_api_version',
     'BotCommand',
     'BotCommandScope',
     'BotCommandScopeAllChatAdministrators',
@@ -180,7 +179,6 @@
     'CallbackGame',
     'CallbackQuery',
     'Chat',
-    'ChatAction',
     'ChatInviteLink',
     'ChatLocation',
     'ChatMember',
@@ -256,7 +254,6 @@
     'MessageEntity',
     'MessageId',
     'OrderInfo',
-    'ParseMode',
     'PassportData',
     'PassportElementError',
     'PassportElementErrorDataField',