CHANGES.rst: cosmetic fix

[ci skip]

.github/CONTRIBUTING.rst

@@ -12,7 +12,7 @@ Setting things up
 
    .. code-block:: bash
 
-      $ git clone https://github.com/<your username>/python-telegram-bot
+      $ git clone https://github.com/<your username>/python-telegram-bot --recursive
       $ cd python-telegram-bot
 
 3. Add a track to the original repository:

.github/ISSUE_TEMPLATE.md

@@ -1,5 +1,10 @@
 <!--
 Thanks for reporting issues of python-telegram-bot!
+
+Use this template to notify us if you found a bug, or if you want to request a new feature.
+If you're looking for help with programming your bot using our library, feel free to ask your
+questions in out telegram group at: https://t.me/pythontelegrambotgroup
+
 To make it easier for us to help you please enter detailed information below.
 
 Please note, we only support the latest version of python-telegram-bot and

.gitignore

@@ -65,9 +65,11 @@ target/
 # unitests files
 telegram.mp3
 telegram.mp4
+telegram2.mp4
 telegram.ogg
 telegram.png
 telegram.webp
+telegram.jpg
 
 # original files from merges
 *.orig

.gitmodules

@@ -1,4 +1,4 @@
 [submodule "telegram/vendor/urllib3"]
-	path = telegram/vendor/urllib3
+	path = telegram/vendor/ptb_urllib3
 	url = https://github.com/python-telegram-bot/urllib3.git
 	branch = ptb

.pre-commit-config.yaml

@@ -1,15 +1,17 @@
 -   repo: git://github.com/python-telegram-bot/mirrors-yapf
-    sha: v0.12.2
+    sha: master
     hooks:
     -   id: yapf
         files: ^(telegram|tests)/.*\.py$
+        args:
+        - --diff
 -   repo: git://github.com/pre-commit/pre-commit-hooks
-    sha: 18d7035de5388cc7775be57f529c154bf541aab9
+    sha: 78818b90cd694c29333ba54d38f9e60b6359ccfc
     hooks:
     -   id: flake8
         files: ^telegram/.*\.py$
 -   repo: git://github.com/pre-commit/mirrors-pylint
-    sha: v1.5.5
+    sha: v1.7.1
     hooks:
     -   id: pylint
         files: ^telegram/.*\.py$

.readthedocs.yml

@@ -0,0 +1,9 @@
+# syntax: https://docs.readthedocs.io/en/latest/yaml-config.html
+
+formats:
+    - pdf
+
+python:
+   setup_py_install: true
+
+requirements_file: docs/requirements-docs.txt

.travis.yml

@@ -5,18 +5,31 @@ python:
   - "3.4"
   - "3.5"
   - "3.6"
-  - "pypy"
-  - "pypy3"
+  - "pypy-5.7.1"
+  - "pypy3.5-5.8.0"
+
+dist: trusty
+sudo: false
+
 branches:
   only:
     - master
+
+cache:
+  directories:
+    - $HOME/.cache/pip
+before_cache:
+  - rm -f $HOME/.cache/pip/log/debug.log
+
 install:
   - pip install coveralls
+  - pip install -U wheel
   - pip install -r requirements.txt
   - pip install -r requirements-dev.txt
   - if [[ $TRAVIS_PYTHON_VERSION != 'pypy'* ]]; then pip install ujson; fi
+
 script:
-  - nosetests -v --with-flaky --no-flaky-report --with-coverage --cover-package=telegram/ tests
-  - if [[ $TRAVIS_PYTHON_VERSION == 3.5 ]]; then pre-commit run --all-files; fi
+  - python travis.py
+
 after_success:
-  coveralls
+  coveralls

AUTHORS.rst

@@ -15,6 +15,7 @@ Contributors
 
 The following wonderful people contributed directly or indirectly to this project:
 
+- `Alateas <https://github.com/alateas>`_
 - `Avanatiker <https://github.com/Avanatiker>`_
 - `Anton Tagunov <https://github.com/anton-tagunov>`_
 - `Balduro <https://github.com/Balduro>`_
@@ -24,11 +25,14 @@ The following wonderful people contributed directly or indirectly to this projec
 - `Eli Gao <https://github.com/eligao>`_
 - `ErgoZ Riftbit Vaper <https://github.com/ergoz>`_
 - `Eugene Lisitsky <https://github.com/lisitsky>`_
+- `Eugenio Panadero <https://github.com/azogue>`_
 - `evgfilim1 <https://github.com/evgfilim1>`_
 - `franciscod <https://github.com/franciscod>`_
 - `Hugo Damer <https://github.com/HakimusGIT>`_
 - `Jacob Bom <https://github.com/bomjacob>`_
 - `JASON0916 <https://github.com/JASON0916>`_
+- `jeffffc <https://github.com/jeffffc>`_
+- `Jelle Besseling <https://github.com/pingiun>`_
 - `jh0ker <https://github.com/jh0ker>`_
 - `John Yong <https://github.com/whipermr5>`_
 - `jossalgon <https://github.com/jossalgon>`_
@@ -48,6 +52,7 @@ The following wonderful people contributed directly or indirectly to this projec
 - `Pieter Schutz <https://github.com/eldinnie>`_
 - `Rahiel Kasim <https://github.com/rahiel>`_
 - `Joscha Götzer <https://github.com/Rostgnom>`_
+- `Sascha <https://github.com/saschalalala>`_
 - `Shelomentsev D <https://github.com/shelomentsevd>`_
 - `sooyhwang <https://github.com/sooyhwang>`_
 - `thodnev <https://github.com/thodnev>`_

CHANGES.rst

@@ -2,6 +2,52 @@
 Changes
 =======
 
+**2017-07-25**
+*Released 7.0.0*
+
+- Fully support Bot API 3.2.
+- New filters for handling messages from specific chat/user id (PR #677).
+- Add the possibility to add objects as arguments to send_* methods (PR #742).
+- Fixed download of URLs with UTF-8 chars in path (PR #688).
+- Fixed URL parsing for ``Message`` text properties (PR #689).
+- Fixed args dispatching in ``MessageQueue``'s decorator (PR #705).
+- Fixed regression preventing IPv6 only hosts from connnecting to Telegram servers (Issue #720).
+- ConvesationHandler - check if a user exist before using it (PR #699).
+- Removed deprecated ``telegram.Emoji``.
+- Removed deprecated ``Botan`` import from ``utils`` (``Botan`` is still available through ``contrib``).
+- Removed deprecated ``ReplyKeyboardHide``.
+- Removed deprecated ``edit_message`` argument of ``bot.set_game_score``.
+- Internal restructure of files.
+- Improved documentation.
+- Improved unitests.
+
+**2017-06-18**
+
+*Released 6.1.0*
+
+- Fully support Bot API 3.0
+- Add more fine-grained filters for status updates
+- Bug fixes and other improvements
+
+**2017-05-29**
+
+*Released 6.0.3*
+
+- Faulty PyPI release
+
+**2017-05-29**
+
+*Released 6.0.2*
+
+- Avoid confusion with user's ``urllib3`` by renaming vendored ``urllib3`` to ``ptb_urllib3``
+
+**2017-05-19**
+
+*Released 6.0.1*
+
+- Add support for ``User.language_code``
+- Fix ``Message.text_html`` and ``Message.text_markdown`` for messages with emoji
+
 **2017-05-19**
 
 *Released 6.0.0*
@@ -73,6 +119,7 @@ Changes
 
 - Rework ``JobQueue``
 - Introduce ``ConversationHandler``
+- Introduce ``telegram.constants`` - https://github.com/python-telegram-bot/python-telegram-bot/pull/342
 
 **2016-07-12**
 

README.rst

@@ -15,6 +15,10 @@ We have made you a wrapper you can't refuse
    :target: https://pypi.python.org/pypi/python-telegram-bot
    :alt: Supported python versions
 
+.. image:: https://www.cpu.re/static/python-telegram-bot/downloads.svg
+   :target: https://www.cpu.re/static/python-telegram-bot/downloads-by-python-version.txt
+   :alt: PyPi Package Monthly Download
+
 .. image:: https://img.shields.io/badge/docs-latest-af1a97.svg
    :target: https://python-telegram-bot.readthedocs.io/
    :alt: Documentation Status
@@ -84,7 +88,7 @@ make the development of bots easy and straightforward. These classes are contain
 Telegram API support
 ====================
 
-As of **4. Dec 2016**, all types and methods of the Telegram Bot API are supported.
+As of **23. July 2017**, all types and methods of the Telegram Bot API 3.2 are supported.
 
 ==========
 Installing

appveyor.yml

@@ -0,0 +1,31 @@
+environment:
+
+  matrix:
+    # For Python versions available on Appveyor, see
+    # http://www.appveyor.com/docs/installed-software#python
+    # The list here is complete (excluding Python 2.6, which
+    # isn't covered by this document) at the time of writing.
+
+    - PYTHON: "C:\\Python27"
+    - PYTHON: "C:\\Python33"
+    - PYTHON: "C:\\Python34"
+    - PYTHON: "C:\\Python35"
+    - PYTHON: "C:\\Python36"
+
+install:
+  # We need wheel installed to build wheels
+  - "git submodule update --init --recursive"
+  - "%PYTHON%\\python.exe -m pip install -U wheel"
+  - "%PYTHON%\\python.exe -m pip install -r requirements.txt"
+  - "%PYTHON%\\python.exe -m pip install -r requirements-dev.txt"
+
+build: off
+
+cache: C:\Users\appveyor\pip\wheels
+
+test_script:
+  - "%python%\\Scripts\\nosetests -v --with-flaky --no-flaky-report tests"
+
+after_test:
+  # This step builds your wheels.
+  - "%PYTHON%\\python.exe setup.py bdist_wheel"

docs/requirements-docs.txt

@@ -1,3 +1,3 @@
-sphinx
+sphinx>=1.5.4
 sphinx_rtd_theme
 sphinx-pypi-upload

docs/source/conf.py

@@ -11,7 +11,6 @@
 #
 # All configuration values have a default; values that are commented out
 # serve to show the default.
-
 import sys
 import os
 import shlex
@@ -25,7 +24,7 @@ sys.path.insert(0, os.path.abspath('../..'))
 # -- General configuration ------------------------------------------------
 
 # If your documentation needs a minimal Sphinx version, state it here.
-#needs_sphinx = '1.0'
+needs_sphinx = '1.5.4'  # fixes issues with autodoc-skip-member and napoleon
 
 # Add any Sphinx extension module names here, as strings. They can be
 # extensions coming with Sphinx (named 'sphinx.ext.*') or your custom
@@ -59,9 +58,9 @@ author = u'Leandro Toledo'
 # built documents.
 #
 # The short X.Y version.
-version = '6.0'  # telegram.__version__[:3]
+version = '7.0'  # telegram.__version__[:3]
 # The full version, including alpha/beta/rc tags.
-release = '6.0.0'  # telegram.__version__
+release = '7.0.0'  # telegram.__version__
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
@@ -136,7 +135,7 @@ html_logo = 'ptb-logo-orange.png'
 # The name of an image file (within the static path) to use as favicon of the
 # docs.  This file should be a Windows icon file (.ico) being 16x16 or 32x32
 # pixels large.
-#html_favicon = None
+html_favicon = 'ptb-logo-orange.ico'
 
 # Add any paths that contain custom static files (such as style sheets) here,
 # relative to this directory. They are copied after the builtin static files,
@@ -289,3 +288,21 @@ texinfo_documents = [
 
 # If true, do not generate a @detailmenu in the "Top" node's menu.
 #texinfo_no_detailmenu = False
+
+# -- script stuff --------------------------------------------------------
+
+import inspect
+
+
+def autodoc_skip_member(app, what, name, obj, skip, options):
+    try:
+        if inspect.getmodule(obj).__name__.startswith('telegram') and inspect.isfunction(obj):
+            if name.lower() != name:
+                return True
+    except AttributeError:
+        pass
+    # Return None so napoleon can handle it
+
+
+def setup(app):
+    app.connect('autodoc-skip-member', autodoc_skip_member)

docs/source/index.rst

@@ -6,6 +6,9 @@
 Welcome to Python Telegram Bot's documentation!
 ===============================================
 
+Below you can find the documentation for the python-telegram-bot library. except for the .ext package most of the
+objects in the package reflect the types as defined by the `telegram bot api <https://core.telegram.org/bots/api>`_.
+
 .. toctree::
    telegram
 

docs/source/telegram.animation.rst

@@ -1,7 +1,6 @@
-telegram.animation module
-=========================
+telegram.Animation
+==================
 
-.. automodule:: telegram.animation
+.. autoclass:: telegram.Animation
     :members:
-    :undoc-members:
     :show-inheritance:

docs/source/telegram.audio.rst

@@ -1,7 +1,6 @@
-telegram.audio module
-=====================
+telegram.Audio
+==============
 
-.. automodule:: telegram.audio
+.. autoclass:: telegram.Audio
     :members:
-    :undoc-members:
     :show-inheritance:

docs/source/telegram.base.rst

@@ -1,7 +0,0 @@
-telegram.base module
-====================
-
-.. automodule:: telegram.base
-    :members:
-    :undoc-members:
-    :show-inheritance:

docs/source/telegram.bot.rst

@@ -1,6 +1,6 @@
-telegram.bot module
-===================
+telegram.Bot
+============
 
-.. automodule:: telegram.bot
+.. autoclass:: telegram.Bot
     :members:
-    :show-inheritance:
+    :show-inheritance:

docs/source/telegram.callbackgame.rst

@@ -1,7 +1,6 @@
-telegram.callbackgame module
-============================
+telegram.Callbackgame
+=====================
 
-.. automodule:: telegram.callbackgame
+.. autoclass:: telegram.CallbackGame
     :members:
-    :undoc-members:
     :show-inheritance:

docs/source/telegram.callbackquery.rst

@@ -1,7 +1,6 @@
-telegram.callbackquery module
-=============================
+telegram.CallbackQuery
+======================
 
-.. automodule:: telegram.callbackquery
+.. autoclass:: telegram.CallbackQuery
     :members:
-    :undoc-members:
     :show-inheritance:

docs/source/telegram.chat.rst

@@ -1,7 +1,6 @@
-telegram.chat module
-=========================
+telegram.Chat
+=============
 
-.. automodule:: telegram.chat
+.. autoclass:: telegram.Chat
     :members:
-    :undoc-members:
     :show-inheritance:

docs/source/telegram.chataction.rst

@@ -1,7 +1,6 @@
-telegram.chataction module
-==========================
+telegram.ChatAction
+===================
 
-.. automodule:: telegram.chataction
+.. autoclass:: telegram.ChatAction
     :members:
-    :undoc-members:
     :show-inheritance:

docs/source/telegram.chatmember.rst

@@ -1,7 +1,6 @@
-telegram.chatmember module
-==========================
+telegram.ChatMember
+===================
 
-.. automodule:: telegram.chatmember
+.. autoclass:: telegram.ChatMember
     :members:
-    :undoc-members:
     :show-inheritance:

docs/source/telegram.chatphoto.rst

@@ -0,0 +1,6 @@
+telegram.ChatPhoto
+==================
+
+.. autoclass:: telegram.ChatPhoto
+    :members:
+    :show-inheritance:

docs/source/telegram.choseninlineresult.rst

@@ -1,7 +1,6 @@
-telegram.choseninlineresult module
-==================================
+telegram.ChosenInlineResult
+===========================
 
-.. automodule:: telegram.choseninlineresult
+.. autoclass:: telegram.ChosenInlineResult
     :members:
-    :undoc-members:
     :show-inheritance:

docs/source/telegram.constants.rst

@@ -1,7 +1,6 @@
-telegram.constants module
+telegram.constants Module
 =========================
 
 .. automodule:: telegram.constants
     :members:
-    :undoc-members:
     :show-inheritance:

docs/source/telegram.contact.rst

@@ -1,7 +1,6 @@
-telegram.contact module
-=======================
+telegram.Contact
+================
 
-.. automodule:: telegram.contact
+.. autoclass:: telegram.Contact
     :members:
-    :undoc-members:
     :show-inheritance:

docs/source/telegram.contrib.botan.rst

@@ -1,7 +1,7 @@
-telegram.contrib.botan module
-=============================
+telegram.contrib.Botan
+======================
 
-.. automodule:: telegram.contrib.botan
+.. autoclass:: telegram.contrib.Botan
     :members:
     :undoc-members:
     :show-inheritance:

docs/source/telegram.contrib.rst

@@ -15,3 +15,4 @@ Module contents
     :members:
     :undoc-members:
     :show-inheritance:
+    :noindex:

docs/source/telegram.document.rst

@@ -1,7 +1,6 @@
-telegram.document module
-========================
+telegram.Document
+=================
 
-.. automodule:: telegram.document
+.. autoclass:: telegram.Document
     :members:
-    :undoc-members:
     :show-inheritance:

docs/source/telegram.ext.callbackqueryhandler.rst

@@ -1,7 +1,6 @@
-telegram.ext.callbackqueryhandler module
-========================================
+telegram.ext.CallbackQueryHandler
+=================================
 
-.. automodule:: telegram.ext.callbackqueryhandler
+.. autoclass:: telegram.ext.CallbackQueryHandler
     :members:
-    :undoc-members:
     :show-inheritance:

docs/source/telegram.ext.choseninlineresulthandler.rst

@@ -1,7 +1,6 @@
-telegram.ext.choseninlineresulthandler module
-=============================================
+telegram.ext.ChosenInlineResultHandler
+======================================
 
-.. automodule:: telegram.ext.choseninlineresulthandler
+.. autoclass:: telegram.ext.ChosenInlineResultHandler
     :members:
-    :undoc-members:
     :show-inheritance:

docs/source/telegram.ext.commandhandler.rst

@@ -1,7 +1,6 @@
-telegram.ext.commandhandler module
-==================================
+telegram.ext.CommandHandler
+===========================
 
-.. automodule:: telegram.ext.commandhandler
+.. autoclass:: telegram.ext.CommandHandler
     :members:
-    :undoc-members:
     :show-inheritance:

docs/source/telegram.ext.conversationhandler.rst

@@ -1,7 +1,6 @@
-telegram.ext.conversationhandler module
-=======================================
+telegram.ext.ConversationHandler
+================================
 
-.. automodule:: telegram.ext.conversationhandler
+.. autoclass:: telegram.ext.ConversationHandler
     :members:
-    :undoc-members:
     :show-inheritance:

docs/source/telegram.ext.delayqueue.rst

@@ -0,0 +1,7 @@
+telegram.ext.DelayQueue
+=======================
+
+.. autoclass:: telegram.ext.DelayQueue
+    :members:
+    :show-inheritance:
+    :special-members:

docs/source/telegram.ext.dispatcher.rst

@@ -1,7 +1,6 @@
-telegram.ext.dispatcher module
-==============================
+telegram.ext.Dispatcher
+=======================
 
-.. automodule:: telegram.ext.dispatcher
+.. autoclass:: telegram.ext.Dispatcher
     :members:
-    :undoc-members:
     :show-inheritance:

docs/source/telegram.ext.filters.rst

@@ -1,7 +1,6 @@
-telegram.ext.filters module
+telegram.ext.filters Module
 ===========================
 
 .. automodule:: telegram.ext.filters
     :members:
-    :undoc-members:
     :show-inheritance:

docs/source/telegram.ext.handler.rst

@@ -1,7 +1,7 @@
-telegram.ext.handler module
-===========================
+telegram.ext.Handler
+====================
 
-.. automodule:: telegram.ext.handler
+.. autoclass:: telegram.ext.Handler
     :members:
     :undoc-members:
     :show-inheritance:

docs/source/telegram.ext.inlinequeryhandler.rst

@@ -1,7 +1,6 @@
-telegram.ext.inlinequeryhandler module
-======================================
+telegram.ext.InlineQueryHandler
+===============================
 
-.. automodule:: telegram.ext.inlinequeryhandler
+.. autoclass:: telegram.ext.InlineQueryHandler
     :members:
-    :undoc-members:
     :show-inheritance:

docs/source/telegram.ext.jobqueue.rst

@@ -1,7 +1,6 @@
-telegram.ext.jobqueue module
-============================
+telegram.ext.JobQueue
+=====================
 
-.. automodule:: telegram.ext.jobqueue
+.. autoclass:: telegram.ext.JobQueue
     :members:
-    :undoc-members:
     :show-inheritance:

docs/source/telegram.ext.messagehandler.rst

@@ -1,7 +1,6 @@
-telegram.ext.messagehandler module
-==================================
+telegram.ext.MessageHandler
+===========================
 
-.. automodule:: telegram.ext.messagehandler
+.. autoclass:: telegram.ext.MessageHandler
     :members:
-    :undoc-members:
     :show-inheritance:

docs/source/telegram.ext.messagequeue.rst

@@ -1,7 +1,7 @@
-telegram.ext.messagequeue module
-================================
+telegram.ext.MessageQueue
+=========================
 
-.. automodule:: telegram.ext.messagequeue
+.. autoclass:: telegram.ext.MessageQueue
     :members:
-    :undoc-members:
     :show-inheritance:
+    :special-members:

docs/source/telegram.ext.precheckoutqueryhandler.rst

@@ -0,0 +1,6 @@
+telegram.ext.PreCheckoutQueryHandler
+====================================
+
+.. autoclass:: telegram.ext.PreCheckoutQueryHandler
+    :members:
+    :show-inheritance:

docs/source/telegram.ext.regexhandler.rst

@@ -1,7 +1,6 @@
-telegram.ext.regexhandler module
-================================
+telegram.ext.RegexHandler
+=========================
 
-.. automodule:: telegram.ext.regexhandler
+.. autoclass:: telegram.ext.RegexHandler
     :members:
-    :undoc-members:
     :show-inheritance:

docs/source/telegram.ext.rst

@@ -1,14 +1,20 @@
 telegram.ext package
 ====================
 
-Submodules
-----------
-
 .. toctree::
 
     telegram.ext.updater
     telegram.ext.dispatcher
+    telegram.ext.filters
     telegram.ext.jobqueue
+    telegram.ext.messagequeue
+    telegram.ext.delayqueue
+
+Handlers
+--------
+
+.. toctree::
+
     telegram.ext.handler
     telegram.ext.callbackqueryhandler
     telegram.ext.choseninlineresulthandler
@@ -16,17 +22,9 @@ Submodules
     telegram.ext.commandhandler
     telegram.ext.inlinequeryhandler
     telegram.ext.messagehandler
-    telegram.ext.messagequeue
-    telegram.ext.filters
+    telegram.ext.precheckoutqueryhandler
     telegram.ext.regexhandler
+    telegram.ext.shippingqueryhandler
     telegram.ext.stringcommandhandler
     telegram.ext.stringregexhandler
     telegram.ext.typehandler
-
-Module contents
----------------
-
-.. automodule:: telegram.ext
-    :members:
-    :undoc-members:
-    :show-inheritance:

docs/source/telegram.ext.shippingqueryhandler.rst

@@ -0,0 +1,6 @@
+telegram.ext.ShippingQueryHandler
+=================================
+
+.. autoclass:: telegram.ext.ShippingQueryHandler
+    :members:
+    :show-inheritance:

docs/source/telegram.ext.stringcommandhandler.rst

@@ -1,7 +1,6 @@
-telegram.ext.stringcommandhandler module
-========================================
+telegram.ext.StringCommandHandler
+=================================
 
-.. automodule:: telegram.ext.stringcommandhandler
+.. autoclass:: telegram.ext.StringCommandHandler
     :members:
-    :undoc-members:
     :show-inheritance:

docs/source/telegram.ext.stringregexhandler.rst

@@ -1,7 +1,6 @@
-telegram.ext.stringregexhandler module
-======================================
+telegram.ext.StringRegexHandler
+===============================
 
-.. automodule:: telegram.ext.stringregexhandler
+.. autoclass:: telegram.ext.StringRegexHandler
     :members:
-    :undoc-members:
     :show-inheritance:

docs/source/telegram.ext.typehandler.rst

@@ -1,7 +1,6 @@
-telegram.ext.typehandler module
-===============================
+telegram.ext.TypeHandler
+========================
 
-.. automodule:: telegram.ext.typehandler
+.. autoclass:: telegram.ext.TypeHandler
     :members:
-    :undoc-members:
     :show-inheritance:

docs/source/telegram.ext.updater.rst

@@ -1,7 +1,6 @@
-telegram.ext.updater module
-===========================
+telegram.ext.Updater
+====================
 
-.. automodule:: telegram.ext.updater
+.. autoclass:: telegram.ext.Updater
     :members:
-    :undoc-members:
     :show-inheritance:

docs/source/telegram.file.rst

@@ -1,7 +1,6 @@
-telegram.file module
-====================
+telegram.File
+=============
 
-.. automodule:: telegram.file
+.. autoclass:: telegram.File
     :members:
-    :undoc-members:
     :show-inheritance:

docs/source/telegram.forcereply.rst

@@ -1,7 +1,6 @@
-telegram.forcereply module
-==========================
+telegram.ForceReply
+===================
 
-.. automodule:: telegram.forcereply
+.. autoclass:: telegram.ForceReply
     :members:
-    :undoc-members:
     :show-inheritance:

docs/source/telegram.game.rst

@@ -1,7 +1,6 @@
-telegram.game module
-====================
+telegram.Game
+=============
 
-.. automodule:: telegram.game
+.. autoclass:: telegram.Game
     :members:
-    :undoc-members:
     :show-inheritance:

docs/source/telegram.gamehighscore.rst

@@ -1,7 +1,6 @@
-telegram.gamehighscore module
-=============================
+telegram.GameHighScore
+======================
 
-.. automodule:: telegram.gamehighscore
+.. autoclass:: telegram.GameHighScore
     :members:
-    :undoc-members:
     :show-inheritance:

docs/source/telegram.inlinekeyboardbutton.rst

@@ -1,7 +1,6 @@
-telegram.inlinekeyboardbutton module
-====================================
+telegram.InlineKeyboardButton
+=============================
 
-.. automodule:: telegram.inlinekeyboardbutton
+.. autoclass:: telegram.InlineKeyboardButton
     :members:
-    :undoc-members:
     :show-inheritance:

docs/source/telegram.inlinekeyboardmarkup.rst

@@ -1,7 +1,6 @@
-telegram.inlinekeyboardmarkup module
-====================================
+telegram.InlineKeyboardMarkup
+=============================
 
-.. automodule:: telegram.inlinekeyboardmarkup
+.. autoclass:: telegram.InlineKeyboardMarkup
     :members:
-    :undoc-members:
     :show-inheritance:

docs/source/telegram.inlinequery.rst

@@ -1,7 +1,6 @@
-telegram.inlinequery module
-===========================
+telegram.InlineQuery
+====================
 
-.. automodule:: telegram.inlinequery
+.. autoclass:: telegram.InlineQuery
     :members:
-    :undoc-members:
     :show-inheritance:

docs/source/telegram.inlinequeryresult.rst

@@ -1,7 +1,6 @@
-telegram.inlinequeryresult module
-=================================
+telegram.InlineQueryResult
+==========================
 
-.. automodule:: telegram.inlinequeryresult
+.. autoclass:: telegram.InlineQueryResult
     :members:
-    :undoc-members:
     :show-inheritance:

docs/source/telegram.inlinequeryresultarticle.rst

@@ -1,7 +1,6 @@
-telegram.inlinequeryresultarticle module
-========================================
+telegram.InlineQueryResultArticle
+=================================
 
-.. automodule:: telegram.inlinequeryresultarticle
+.. autoclass:: telegram.InlineQueryResultArticle
     :members:
-    :undoc-members:
     :show-inheritance:

docs/source/telegram.inlinequeryresultaudio.rst

@@ -1,7 +1,6 @@
-telegram.inlinequeryresultaudio module
-======================================
+telegram.InlineQueryResultAudio
+===============================
 
-.. automodule:: telegram.inlinequeryresultaudio
+.. autoclass:: telegram.InlineQueryResultAudio
     :members:
-    :undoc-members:
     :show-inheritance:

docs/source/telegram.inlinequeryresultcachedaudio.rst

@@ -1,7 +1,6 @@
-telegram.inlinequeryresultcachedaudio module
-============================================
+telegram.InlineQueryResultCachedAudio
+=====================================
 
-.. automodule:: telegram.inlinequeryresultcachedaudio
+.. autoclass:: telegram.InlineQueryResultCachedAudio
     :members:
-    :undoc-members:
     :show-inheritance:

docs/source/telegram.inlinequeryresultcacheddocument.rst

@@ -1,7 +1,6 @@
-telegram.inlinequeryresultcacheddocument module
-===============================================
+telegram.InlineQueryResultCachedDocument
+========================================
 
-.. automodule:: telegram.inlinequeryresultcacheddocument
+.. autoclass:: telegram.InlineQueryResultCachedDocument
     :members:
-    :undoc-members:
     :show-inheritance:

docs/source/telegram.inlinequeryresultcachedgif.rst

@@ -1,7 +1,6 @@
-telegram.inlinequeryresultcachedgif module
-==========================================
+telegram.InlineQueryResultCachedGif
+===================================
 
-.. automodule:: telegram.inlinequeryresultcachedgif
+.. autoclass:: telegram.InlineQueryResultCachedGif
     :members:
-    :undoc-members:
     :show-inheritance:

docs/source/telegram.inlinequeryresultcachedmpeg4gif.rst

@@ -1,7 +1,6 @@
-telegram.inlinequeryresultcachedmpeg4gif module
-===============================================
+telegram.InlineQueryResultCachedMpeg4Gif
+========================================
 
-.. automodule:: telegram.inlinequeryresultcachedmpeg4gif
+.. autoclass:: telegram.InlineQueryResultCachedMpeg4Gif
     :members:
-    :undoc-members:
     :show-inheritance:

docs/source/telegram.inlinequeryresultcachedphoto.rst

@@ -1,7 +1,6 @@
-telegram.inlinequeryresultcachedphoto module
-============================================
+telegram.InlineQueryResultCachedPhoto
+=====================================
 
-.. automodule:: telegram.inlinequeryresultcachedphoto
+.. autoclass:: telegram.InlineQueryResultCachedPhoto
     :members:
-    :undoc-members:
     :show-inheritance:

docs/source/telegram.inlinequeryresultcachedsticker.rst

@@ -1,7 +1,6 @@
-telegram.inlinequeryresultcachedsticker module
-==============================================
+telegram.InlineQueryResultCachedSticker
+=======================================
 
-.. automodule:: telegram.inlinequeryresultcachedsticker
+.. autoclass:: telegram.InlineQueryResultCachedSticker
     :members:
-    :undoc-members:
     :show-inheritance:

docs/source/telegram.inlinequeryresultcachedvideo.rst

@@ -1,7 +1,6 @@
-telegram.inlinequeryresultcachedvideo module
-============================================
+telegram.InlineQueryResultCachedVideo
+=====================================
 
-.. automodule:: telegram.inlinequeryresultcachedvideo
+.. autoclass:: telegram.InlineQueryResultCachedVideo
     :members:
-    :undoc-members:
     :show-inheritance:

docs/source/telegram.inlinequeryresultcachedvoice.rst

@@ -1,7 +1,6 @@
-telegram.inlinequeryresultcachedvoice module
-============================================
+telegram.InlineQueryResultCachedVoice
+=====================================
 
-.. automodule:: telegram.inlinequeryresultcachedvoice
+.. autoclass:: telegram.InlineQueryResultCachedVoice
     :members:
-    :undoc-members:
     :show-inheritance:

docs/source/telegram.inlinequeryresultcontact.rst

@@ -1,7 +1,6 @@
-telegram.inlinequeryresultcontact module
-========================================
+telegram.InlineQueryResultContact
+=================================
 
-.. automodule:: telegram.inlinequeryresultcontact
+.. autoclass:: telegram.InlineQueryResultContact
     :members:
-    :undoc-members:
     :show-inheritance:

docs/source/telegram.inlinequeryresultdocument.rst

@@ -1,7 +1,6 @@
-telegram.inlinequeryresultdocument module
-=========================================
+telegram.InlineQueryResultDocument
+==================================
 
-.. automodule:: telegram.inlinequeryresultdocument
+.. autoclass:: telegram.InlineQueryResultDocument
     :members:
-    :undoc-members:
     :show-inheritance:

docs/source/telegram.inlinequeryresultgame.rst

@@ -1,7 +1,6 @@
-telegram.inlinequeryresultgame module
-=====================================
+telegram.InlineQueryResultGame
+==============================
 
-.. automodule:: telegram.inlinequeryresultgame
+.. autoclass:: telegram.InlineQueryResultGame
     :members:
-    :undoc-members:
     :show-inheritance:

docs/source/telegram.inlinequeryresultgif.rst

@@ -1,7 +1,6 @@
-telegram.inlinequeryresultgif module
-====================================
+telegram.InlineQueryResultGif
+=============================
 
-.. automodule:: telegram.inlinequeryresultgif
+.. autoclass:: telegram.InlineQueryResultGif
     :members:
-    :undoc-members:
     :show-inheritance:

docs/source/telegram.inlinequeryresultlocation.rst

@@ -1,7 +1,6 @@
-telegram.inlinequeryresultlocation module
-=========================================
+telegram.InlineQueryResultLocation
+==================================
 
-.. automodule:: telegram.inlinequeryresultlocation
+.. autoclass:: telegram.InlineQueryResultLocation
     :members:
-    :undoc-members:
     :show-inheritance:

docs/source/telegram.inlinequeryresultmpeg4gif.rst

@@ -1,7 +1,6 @@
-telegram.inlinequeryresultmpeg4gif module
-=========================================
+telegram.InlineQueryResultMpeg4Gif
+==================================
 
-.. automodule:: telegram.inlinequeryresultmpeg4gif
+.. autoclass:: telegram.InlineQueryResultMpeg4Gif
     :members:
-    :undoc-members:
     :show-inheritance:

docs/source/telegram.inlinequeryresultphoto.rst

@@ -1,7 +1,6 @@
-telegram.inlinequeryresultphoto module
-======================================
+telegram.InlineQueryResultPhoto
+===============================
 
-.. automodule:: telegram.inlinequeryresultphoto
+.. autoclass:: telegram.InlineQueryResultPhoto
     :members:
-    :undoc-members:
     :show-inheritance:

docs/source/telegram.inlinequeryresultvenue.rst

@@ -1,7 +1,6 @@
-telegram.inlinequeryresultvenue module
-======================================
+telegram.InlineQueryResultVenue
+===============================
 
-.. automodule:: telegram.inlinequeryresultvenue
+.. autoclass:: telegram.InlineQueryResultVenue
     :members:
-    :undoc-members:
     :show-inheritance:

docs/source/telegram.inlinequeryresultvideo.rst

@@ -1,7 +1,6 @@
-telegram.inlinequeryresultvideo module
-======================================
+telegram.InlineQueryResultVideo
+===============================
 
-.. automodule:: telegram.inlinequeryresultvideo
+.. autoclass:: telegram.InlineQueryResultVideo
     :members:
-    :undoc-members:
     :show-inheritance:

docs/source/telegram.inlinequeryresultvoice.rst

@@ -1,7 +1,6 @@
-telegram.inlinequeryresultvoice module
-======================================
+telegram.InlineQueryResultVoice
+===============================
 
-.. automodule:: telegram.inlinequeryresultvoice
+.. autoclass:: telegram.InlineQueryResultVoice
     :members:
-    :undoc-members:
     :show-inheritance:

docs/source/telegram.inputcontactmessagecontent.rst

@@ -1,7 +1,6 @@
-telegram.inputcontactmessagecontent module
-==========================================
+telegram.InputContactMessageContent
+===================================
 
-.. automodule:: telegram.inputcontactmessagecontent
+.. autoclass:: telegram.InputContactMessageContent
     :members:
-    :undoc-members:
     :show-inheritance:

docs/source/telegram.inputfile.rst

@@ -1,7 +1,6 @@
-telegram.inputfile module
-=========================
+telegram.InputFile
+==================
 
-.. automodule:: telegram.inputfile
+.. autoclass:: telegram.InputFile
     :members:
-    :undoc-members:
     :show-inheritance:

docs/source/telegram.inputlocationmessagecontent.rst

@@ -1,7 +1,6 @@
-telegram.inputlocationmessagecontent module
-===========================================
+telegram.InputLocationMessageContent
+====================================
 
-.. automodule:: telegram.inputlocationmessagecontent
+.. autoclass:: telegram.InputLocationMessageContent
     :members:
-    :undoc-members:
     :show-inheritance:

docs/source/telegram.inputmessagecontent.rst

@@ -1,7 +1,6 @@
-telegram.inputmessagecontent module
-===================================
+telegram.InputMessageContent
+============================
 
-.. automodule:: telegram.inputmessagecontent
+.. autoclass:: telegram.InputMessageContent
     :members:
-    :undoc-members:
     :show-inheritance:

docs/source/telegram.inputtextmessagecontent.rst

@@ -1,7 +1,6 @@
-telegram.inputtextmessagecontent module
-=======================================
+telegram.InputTextMessageContent
+================================
 
-.. automodule:: telegram.inputtextmessagecontent
+.. autoclass:: telegram.InputTextMessageContent
     :members:
-    :undoc-members:
     :show-inheritance:

docs/source/telegram.inputvenuemessagecontent.rst

@@ -1,7 +1,6 @@
-telegram.inputvenuemessagecontent module
-========================================
+telegram.InputVenueMessageContent
+=================================
 
-.. automodule:: telegram.inputvenuemessagecontent
+.. autoclass:: telegram.InputVenueMessageContent
     :members:
-    :undoc-members:
     :show-inheritance:

docs/source/telegram.invoice.rst

@@ -0,0 +1,6 @@
+telegram.Invoice
+================
+
+.. autoclass:: telegram.Invoice
+    :members:
+    :show-inheritance:

docs/source/telegram.keyboardbutton.rst

@@ -1,7 +1,6 @@
-telegram.keyboardbutton module
-==============================
+telegram.KeyboardButton
+=======================
 
-.. automodule:: telegram.keyboardbutton
+.. autoclass:: telegram.KeyboardButton
     :members:
-    :undoc-members:
     :show-inheritance:

docs/source/telegram.labeledprice.rst

@@ -0,0 +1,6 @@
+telegram.LabeledPrice
+=====================
+
+.. autoclass:: telegram.LabeledPrice
+    :members:
+    :show-inheritance:

docs/source/telegram.location.rst

@@ -1,7 +1,6 @@
-telegram.location module
-========================
+telegram.Location
+=================
 
-.. automodule:: telegram.location
+.. autoclass:: telegram.Location
     :members:
-    :undoc-members:
     :show-inheritance:

docs/source/telegram.maskposition.rst

@@ -0,0 +1,6 @@
+telegram.MaskPosition
+=====================
+
+.. autoclass:: telegram.MaskPosition
+    :members:
+    :show-inheritance:

docs/source/telegram.message.rst

@@ -1,7 +1,6 @@
-telegram.message module
-=======================
+telegram.Message
+================
 
-.. automodule:: telegram.message
+.. autoclass:: telegram.Message
     :members:
-    :undoc-members:
     :show-inheritance:

docs/source/telegram.messageentity.rst

@@ -1,7 +1,6 @@
-telegram.messageentity module
-=============================
+telegram.MessageEntity
+======================
 
-.. automodule:: telegram.messageentity
+.. autoclass:: telegram.MessageEntity
     :members:
-    :undoc-members:
     :show-inheritance:

docs/source/telegram.orderinfo.rst

@@ -0,0 +1,6 @@
+telegram.OrderInfo
+==================
+
+.. autoclass:: telegram.OrderInfo
+    :members:
+    :show-inheritance:

docs/source/telegram.parsemode.rst

@@ -1,7 +1,6 @@
-telegram.parsemode module
-=========================
+telegram.ParseMode
+==================
 
-.. automodule:: telegram.parsemode
+.. autoclass:: telegram.ParseMode
     :members:
-    :undoc-members:
     :show-inheritance:

docs/source/telegram.photosize.rst

@@ -1,7 +1,6 @@
-telegram.photosize module
-=========================
+telegram.PhotoSize
+==================
 
-.. automodule:: telegram.photosize
+.. autoclass:: telegram.PhotoSize
     :members:
-    :undoc-members:
     :show-inheritance:

docs/source/telegram.precheckoutquery.rst

@@ -0,0 +1,6 @@
+telegram.PreCheckoutQuery
+=========================
+
+.. autoclass:: telegram.PreCheckoutQuery
+    :members:
+    :show-inheritance:

docs/source/telegram.replykeyboardmarkup.rst

@@ -1,7 +1,6 @@
-telegram.replykeyboardmarkup module
-===================================
+telegram.ReplyKeyboardMarkup
+============================
 
-.. automodule:: telegram.replykeyboardmarkup
+.. autoclass:: telegram.ReplyKeyboardMarkup
     :members:
-    :undoc-members:
     :show-inheritance:

docs/source/telegram.replykeyboardremove.rst

@@ -1,7 +1,6 @@
-telegram.replykeyboardremove module
-===================================
+telegram.ReplyKeyboardRemove
+============================
 
-.. automodule:: telegram.replykeyboardremove
+.. autoclass:: telegram.ReplyKeyboardRemove
     :members:
-    :undoc-members:
     :show-inheritance:

docs/source/telegram.replymarkup.rst

@@ -1,7 +1,6 @@
-telegram.replymarkup module
-===========================
+telegram.ReplyMarkup
+====================
 
-.. automodule:: telegram.replymarkup
+.. autoclass:: telegram.ReplyMarkup
     :members:
-    :undoc-members:
     :show-inheritance:

docs/source/telegram.rst

@@ -1,33 +1,59 @@
 telegram package
 ================
 
-Submodules
-----------
-
 .. toctree::
 
    telegram.contrib
    telegram.ext
-   telegram.animation
    telegram.audio
-   telegram.base
    telegram.bot
-   telegram.callbackgame
    telegram.callbackquery
    telegram.chat
    telegram.chataction
    telegram.chatmember
-   telegram.choseninlineresult
+   telegram.chatphoto
    telegram.constants
    telegram.contact
    telegram.document
    telegram.error
    telegram.file
    telegram.forcereply
-   telegram.game
-   telegram.gamehighscore
    telegram.inlinekeyboardbutton
    telegram.inlinekeyboardmarkup
+   telegram.inputfile
+   telegram.keyboardbutton
+   telegram.location
+   telegram.message
+   telegram.messageentity
+   telegram.parsemode
+   telegram.photosize
+   telegram.replykeyboardremove
+   telegram.replykeyboardmarkup
+   telegram.replymarkup
+   telegram.telegramobject
+   telegram.update
+   telegram.user
+   telegram.userprofilephotos
+   telegram.venue
+   telegram.video
+   telegram.videonote
+   telegram.voice
+   telegram.webhookinfo
+
+Stickers
+--------
+
+.. toctree::
+
+   telegram.sticker
+   telegram.stickerset
+   telegram.maskposition
+
+Inline Mode
+-----------
+
+.. toctree::
+
    telegram.inlinequery
    telegram.inlinequeryresult
    telegram.inlinequeryresultarticle
@@ -50,29 +76,37 @@ Submodules
    telegram.inlinequeryresultvenue
    telegram.inlinequeryresultvideo
    telegram.inlinequeryresultvoice
-   telegram.inputcontactmessagecontent
-   telegram.inputfile
-   telegram.inputlocationmessagecontent
    telegram.inputmessagecontent
    telegram.inputtextmessagecontent
+   telegram.inputlocationmessagecontent
    telegram.inputvenuemessagecontent
-   telegram.keyboardbutton
-   telegram.location
-   telegram.message
-   telegram.messageentity
-   telegram.parsemode
-   telegram.photosize
-   telegram.replykeyboardremove
-   telegram.replykeyboardmarkup
-   telegram.replymarkup
-   telegram.sticker
-   telegram.update
-   telegram.user
-   telegram.userprofilephotos
-   telegram.venue
-   telegram.video
-   telegram.voice
-   telegram.webhookinfo
+   telegram.inputcontactmessagecontent
+   telegram.choseninlineresult
+
+Payments
+--------
+
+.. toctree::
+
+   telegram.labeledprice
+   telegram.invoice
+   telegram.shippingaddress
+   telegram.orderinfo
+   telegram.shippingoption
+   telegram.successfulpayment
+   telegram.shippingquery
+   telegram.precheckoutquery
+
+Games
+-----
+
+.. toctree::
+
+   telegram.game
+   telegram.animation
+   telegram.callbackgame
+   telegram.gamehighscore
+
 
 Module contents
 ---------------
@@ -81,3 +115,4 @@ Module contents
     :members:
     :undoc-members:
     :show-inheritance:
+    :noindex: