Merge pull request #348 from python-telegram-bot/urllib3_fix_proxy_auth

Urllib3 fix proxy auth

.codeclimate.yml

@@ -1,20 +1,5 @@
+languages:
+  Python: true
 exclude_paths:
+- "telegram/emoji.py"
 - "tests/*"
-- "examples/*"
-engines:
-  duplication:
-    enabled: true
-    config:
-      languages:
-      - python:
-    checks:
-      Similar code:
-        enabled: false
-
-  radon:
-    enabled: true
-    config:
-      threshold: "C"
-ratings:
-  paths:
-    - "**.py"

.coveragerc

@@ -0,0 +1,5 @@
+[run]
+source = telegram
+
+[report]
+omit = tests/

.github/CONTRIBUTING.rst

@@ -10,32 +10,25 @@ Setting things up
 
 2. Clone your forked repository of ``python-telegram-bot`` to your computer:
 
-   .. 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
+   ``$ cd python-telegram-bot``
 
 3. Add a track to the original repository:
 
-   .. code-block:: bash
-
-      $ git remote add upstream https://github.com/python-telegram-bot/python-telegram-bot
+   ``$ git remote add upstream https://github.com/python-telegram-bot/python-telegram-bot``
 
 4. Install dependencies:
 
-   .. code-block:: bash
-
-      $ sudo pip install -r requirements.txt -r requirements-dev.txt
+   ``$ pip install -r requirements.txt -r requirements-dev.txt``
 
 
 5. Install pre-commit hooks:
 
-   .. code-block:: bash
-
-      $ pre-commit install
+   ``$ pre-commit install``
 
 Finding something to do
-#######################
+-----------------------
 
 If you already know what you'd like to work on, you can skip this section.
 
@@ -44,7 +37,7 @@ If you have an idea for something to do, first check if it's already been filed
 Another great way to start contributing is by writing tests. Tests are really important because they help prevent developers from accidentally breaking existing code, allowing them to build cool things faster. If you're interested in helping out, let the development team know by posting to the `developers' mailing list`_, and we'll help you get started.
 
 Instructions for making a code change
-#####################################
+-------------------------------------
 
 The central development branch is ``master``, which should be clean and ready for release at any time. In general, all changes should be done as feature branches based off of ``master``.
 
@@ -54,12 +47,13 @@ Here's how to make a one-off code change.
 
 2. **Create a new branch with this name, starting from** ``master``. In other words, run:
 
-   .. code-block:: bash
+   ``$ git fetch upstream``
 
-      $ git fetch upstream
-      $ git checkout master
-      $ git merge upstream/master
-      $ git checkout -b your-branch-name
+   ``$ git checkout master``
+
+   ``$ git merge upstream/master``
+
+   ``$ git checkout -b your-branch-name``
 
 3. **Make a commit to your feature branch**. Each commit should be self-contained and have a descriptive commit message that helps other developers understand why the changes were made.
 
@@ -81,33 +75,19 @@ Here's how to make a one-off code change.
 
    - Before making a commit ensure that all automated tests still pass:
 
-     .. code-block::
-
-        $ make test
-
-     If you don't have ``make``, do:
-
-     .. code-block::
-
-        $ pytest -v
+      ``$ make test``
 
    - To actually make the commit (this will trigger tests for yapf, lint and pep8 automatically):
 
-     .. code-block:: bash
+      ``$ git add your-file-changed.py``
 
-        $ git add your-file-changed.py
+        - yapf may change code formatting, make sure to re-add them to your commit.
 
-   - yapf may change code formatting, make sure to re-add them to your commit.
-
-     .. code-block:: bash
-
-      $ git commit -a -m "your-commit-message-here"
+      ``$ git commit -a -m "your-commit-message-here"``
 
    - Finally, push it to your GitHub fork, run:
 
-     .. code-block:: bash
-
-      $ git push origin your-branch-name
+      ``$ git push origin your-branch-name``
 
 4. **When your feature is ready to merge, create a pull request.**
 
@@ -127,89 +107,73 @@ Here's how to make a one-off code change.
 
    - Resolve any merge conflicts that arise. To resolve conflicts between 'your-branch-name' (in your fork) and 'master' (in the ``python-telegram-bot`` repository), run:
 
-     .. code-block:: bash
+      ``$ git checkout your-branch-name``
 
-        $ git checkout your-branch-name
-        $ git fetch upstream
-        $ git merge upstream/master
-        $ ...[fix the conflicts]...
-        $ ...[make sure the tests pass before committing]...
-        $ git commit -a
-        $ git push origin your-branch-name
+      ``$ git fetch upstream``
 
-   - If after merging you see local modified files in ``telegram/vendor/`` directory, that you didn't actually touch, that means you need to update submodules with this command:
+      ``$ git merge upstream/master``
 
-     .. code-block:: bash
+      ``$ ...[fix the conflicts]...``
 
-        $ git submodule update --init --recursive
+      ``$ ...[make sure the tests pass before committing]...``
+
+      ``$ git commit -a``
+
+      ``$ git push origin your-branch-name``
 
    - At the end, the reviewer will merge the pull request.
 
 6. **Tidy up!** Delete the feature branch from both your local clone and the GitHub repository:
 
-   .. code-block:: bash
+   ``$ git branch -D your-branch-name``
 
-      $ git branch -D your-branch-name
-      $ git push origin --delete your-branch-name
+   ``$ git push origin --delete your-branch-name``
 
 7. **Celebrate.** Congratulations, you have contributed to ``python-telegram-bot``!
 
 Style commandments
-------------------
+==================
 
 Specific commandments
-#####################
+---------------------
 
 - Avoid using "double quotes" where you can reasonably use 'single quotes'.
 
-Assert comparison order
-#######################
+AssertEqual argument order
+--------------------------
 
-- assert statements should compare in **actual** == **expected** order.
-For example (assuming ``test_call`` is the thing being tested):
-
-.. code-block:: python
-
-    # GOOD
-    assert test_call() == 5
-
-    # BAD
-    assert 5 == test_call()
+assertEqual method's arguments should be in ('actual', 'expected') order.
 
 Properly calling callables
-##########################
+--------------------------
 
 Methods, functions and classes can specify optional parameters (with default
 values) using Python's keyword arg syntax. When providing a value to such a
-callable we prefer that the call also uses keyword arg syntax. For example:
+callable we prefer that the call also uses keyword arg syntax. For example::
 
-.. code-block:: python
+    # GOOD
+    f(0, optional=True)
 
-   # GOOD
-   f(0, optional=True)
-
-   # BAD
-   f(0, True)
+    # BAD
+    f(0, True)
 
 This gives us the flexibility to re-order arguments and more importantly
 to add new required arguments. It's also more explicit and easier to read.
 
 Properly defining optional arguments
-####################################
+------------------------------------
 
-It's always good to not initialize optional arguments at class creation,
-instead use ``**kwargs`` to get them. It's well known Telegram API can
-change without notice, in that case if a new argument is added it won't
-break the API classes. For example:
-
-.. code-block:: python
+It's always good to not initialize optional arguments at class creation, 
+instead use ``**kwargs`` to get them. It's well known Telegram API can 
+change without notice, in that case if a new argument is added it won't 
+break the API classes. For example::
 
     # GOOD
-    def __init__(self, id, name, last_name=None, **kwargs):
-       self.last_name = last_name
+    def __init__(self, id, name, **kwargs):
+       self.last_name = kwargs.get('last_name', '')
 
     # BAD
-    def __init__(self, id, name, last_name=None):
+    def __init__(self, id, name, last_name=''):
        self.last_name = last_name
 
 
@@ -219,4 +183,4 @@ break the API classes. For example:
 .. _`PEP 8 Style Guide`: https://www.python.org/dev/peps/pep-0008/
 .. _`Google Python Style Guide`: https://google-styleguide.googlecode.com/svn/trunk/pyguide.html
 .. _`Google Python Style Docstrings`: http://sphinx-doc.org/latest/ext/example_google.html
-.. _AUTHORS.rst: ../AUTHORS.rst
+.. _AUTHORS.rst: https://github.com/python-telegram-bot/python-telegram-bot/blob/master/AUTHORS.rst

.github/ISSUE_TEMPLATE.md

@@ -1,15 +1,6 @@
 <!--
 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
-master branch. Please make sure to upgrade & recreate the issue on the latest
-version prior to opening an issue.
 -->
 ### Steps to reproduce
 1.
@@ -28,9 +19,13 @@ Tell us what happens instead
 **Operating System:**
 
 
-**Version of Python, python-telegram-bot & dependencies:**
+**Version of Python:**
 
-``$ python -m telegram``
+``$ python -V``
+
+**Version of python-telegram-bot:**
+
+``$ python -c 'import telegram; print(telegram.__version__)'``
 
 ### Logs
 Insert logs here (if necessary)

.gitignore

@@ -65,14 +65,6 @@ target/
 # unitests files
 telegram.mp3
 telegram.mp4
-telegram2.mp4
 telegram.ogg
 telegram.png
 telegram.webp
-telegram.jpg
-
-# original files from merges
-*.orig
-
-# Exclude .exrc file for Vim
-.exrc

.gitmodules

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

.pre-commit-config.yaml

@@ -1,20 +1,18 @@
--   repo: git://github.com/python-telegram-bot/mirrors-yapf
-    sha: master
+-   repo: git://github.com/pre-commit/mirrors-yapf
+    sha: 316b795b2f32cbe80047aff7e842b72368d5a2c1
     hooks:
     -   id: yapf
         files: ^(telegram|tests)/.*\.py$
-        args:
-        - --diff
 -   repo: git://github.com/pre-commit/pre-commit-hooks
-    sha: 78818b90cd694c29333ba54d38f9e60b6359ccfc
+    sha: 6dfcb89af3c9b4d172cc2e5a8a2fa0f54615a338
     hooks:
     -   id: flake8
         files: ^telegram/.*\.py$
 -   repo: git://github.com/pre-commit/mirrors-pylint
-    sha: v1.7.1
+    sha: 4de6c8dfadef1a271a814561ce05b8bc1c446d22
     hooks:
     -   id: pylint
         files: ^telegram/.*\.py$
         args:
         - --errors-only
-        - --disable=import-error
+        - --disable=no-name-in-module,import-error

.readthedocs.yml

@@ -1,9 +0,0 @@
-# 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

@@ -1,38 +1,18 @@
 language: python
 python:
+  - "2.6"
   - "2.7"
+  - "3.3"
   - "3.4"
   - "3.5"
-  - "3.6"
-  - "pypy-5.7.1"
-  - "pypy3.5-5.8.0"
-
-dist: trusty
-sudo: false
-
-branches:
-  only:
-    - master
-
-cache:
-  directories:
-    - $HOME/.cache/pip
-    - $HOME/.pre-commit
-before_cache:
-  - rm -f $HOME/.cache/pip/log/debug.log
-  - rm -f $HOME/.pre-commit/pre-commit.log
-
+  - "pypy"
+  - "pypy3"
 install:
-  - pip install -U codecov pytest-cov
-  - pip install -U wheel
-  - pip install -U -r requirements.txt
-  - pip install -U -r requirements-dev.txt
-  - if [[ $TRAVIS_PYTHON_VERSION != 'pypy'* ]]; then pip install ujson; fi
-
+  - pip install coveralls
+  - pip install -r requirements.txt
+  - pip install -r requirements-dev.txt
 script:
-  - pytest -v -m nocoverage
-  - pytest -v -m "not nocoverage" --cov
-
+  - nosetests -v --with-flaky --no-flaky-report --with-coverage --cover-package=telegram/
+  - 'if [ $TRAVIS_PYTHON_VERSION != 2.6 ] && [ $TRAVIS_PYTHON_VERSION != 3.3 ] && [ $TRAVIS_PYTHON_VERSION != pypy3 ]; then pre-commit run --all-files; fi'
 after_success:
-  - coverage combine
-  - codecov -F Travis
+  coveralls

AUTHORS.rst

@@ -1,65 +1,30 @@
 Credits
 =======
 
-``python-telegram-bot`` was originally created by
-`Leandro Toledo <https://github.com/leandrotoledo>`_ and is now maintained by
-`Jannes Höke <https://github.com/jh0ker>`_ (`@jh0ker <https://t.me/jh0ker>`_ on Telegram) and
-`Noam Meltzer <https://github.com/tsnoam>`_.
-
-We're vendoring urllib3 as part of ``python-telegram-bot`` which is distributed under the MIT
-license. For more info, full credits & license terms, the sources can be found here:
-`https://github.com/python-telegram-bot/urllib3`.
+``python-telegram-bot`` is written and maintained by `Leandro Toledo <https://github.com/leandrotoledo>`_.
 
 Contributors
 ------------
 
 The following wonderful people contributed directly or indirectly to this project:
 
-- `Alateas <https://github.com/alateas>`_
-- `Anton Tagunov <https://github.com/anton-tagunov>`_
 - `Avanatiker <https://github.com/Avanatiker>`_
 - `Balduro <https://github.com/Balduro>`_
 - `bimmlerd <https://github.com/bimmlerd>`_
-- `d-qoi <https://github.com/d-qoi>`_
-- `daimajia <https://github.com/daimajia>`_
-- `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>`_
-- `ihoru <https://github.com/ihoru>`_
-- `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>`_
-- `jlmadurga <https://github.com/jlmadurga>`_
-- `John Yong <https://github.com/whipermr5>`_
-- `Joscha Götzer <https://github.com/Rostgnom>`_
-- `jossalgon <https://github.com/jossalgon>`_
 - `JRoot3D <https://github.com/JRoot3D>`_
-- `Kjwon15 <https://github.com/kjwon15>`_
-- `Li-aung Yip <https://github.com/LiaungYip>`_
+- `jlmadurga <https://github.com/jlmadurga>`_
 - `macrojames <https://github.com/macrojames>`_
-- `Michael Elovskikh <https://github.com/wronglink>`_
 - `naveenvhegde <https://github.com/naveenvhegde>`_
-- `neurrone <https://github.com/neurrone>`_
 - `njittam <https://github.com/njittam>`_
 - `Noam Meltzer <https://github.com/tsnoam>`_
 - `Oleg Shlyazhko <https://github.com/ollmer>`_
-- `overquota <https://github.com/overquota>`_
-- `Patrick Hofmann <https://github.com/PH89>`_
-- `Pieter Schutz <https://github.com/eldinnie>`_
 - `Rahiel Kasim <https://github.com/rahiel>`_
-- `Sascha <https://github.com/saschalalala>`_
 - `Shelomentsev D <https://github.com/shelomentsevd>`_
-- `Simon Schürrle <https://github.com/SitiSchu>`_
 - `sooyhwang <https://github.com/sooyhwang>`_
-- `thodnev <https://github.com/thodnev>`_
-- `Valentijn <https://github.com/Faalentijn>`_
-- `voider1 <https://github.com/voider1>`_
 - `wjt <https://github.com/wjt>`_
 
 Please add yourself here alphabetically when you submit your first pull request.

CHANGES.rst

@@ -1,224 +1,3 @@
-=======
-Changes
-=======
-**2017-12-08**
-*Released 9.0.0*
-
-Breaking changes (possibly)
-
-- Drop support for python 3.3 (PR `#930`_)
-
-
-New Features
-
-- Support Bot API 3.5 (PR `#920`_)
-
-
-Changes
-
-- Fix race condition in dispatcher start/stop (`#887`_)
-- Log error trace if there is no error handler registered (`#694`_)
-- Update examples with consistent string formatting (`#870`_)
-- Various changes and improvements to the docs.
-
-.. _`#920`: https://github.com/python-telegram-bot/python-telegram-bot/pull/920
-.. _`#930`: https://github.com/python-telegram-bot/python-telegram-bot/pull/930
-.. _`#887`: https://github.com/python-telegram-bot/python-telegram-bot/pull/887
-.. _`#694`: https://github.com/python-telegram-bot/python-telegram-bot/pull/694
-.. _`#870`: https://github.com/python-telegram-bot/python-telegram-bot/pull/870
-
-**2017-10-15**
-*Released 8.1.1*
-
-- Fix Commandhandler crashing on single character messages (PR `#873`_).
-
-.. _`#873`: https://github.com/python-telegram-bot/python-telegram-bot/pull/871
-
-**2017-10-14**
-*Released 8.1.0*
-
-New features
-- Support Bot API 3.4 (PR `#865`_).
-
-Changes
-- MessageHandler & RegexHandler now consider channel_updates.
-- Fix command not recognized if it is directly followed by a newline (PR `#869`_).
-- Removed Bot._message_wrapper (PR `#822`_).
-- Unitests are now also running on AppVeyor (Windows VM).
-- Various unitest improvements.
-- Documentation fixes.
-
-.. _`#822`: https://github.com/python-telegram-bot/python-telegram-bot/pull/822
-.. _`#865`: https://github.com/python-telegram-bot/python-telegram-bot/pull/865
-.. _`#869`: https://github.com/python-telegram-bot/python-telegram-bot/pull/869
-
-**2017-09-01**
-*Released 8.0.0*
-
-New features
-
-- Fully support Bot Api 3.3 (PR `#806`_).
-- DispatcherHandlerStop (`see docs`_).
-- Regression fix for text_html & text_markdown (PR `#777`_).
-- Added effective_attachment to message (PR `#766`_).
-
-Non backward compatible changes
-
-- Removed Botan support from the library  (PR `#776`_).
-- Fully support Bot Api 3.3 (PR `#806`_).
-- Remove de_json() (PR `#789`_).
-
-Changes
-
-- Sane defaults for tcp socket options on linux (PR `#754`_).
-- Add RESTRICTED as constant to ChatMember (PR `#761`_).
-- Add rich comparison to CallbackQuery (PR `#764`_).
-- Fix get_game_high_scores (PR `#771`_).
-- Warn on small con_pool_size during custom initalization of Updater (PR `#793`_).
-- Catch exceptions in error handlerfor errors that happen during polling (PR `#810`_).
-- For testing we switched to pytest (PR `#788`_).
-- Lots of small improvements to our tests and documentation.
-
-
-.. _`see docs`: http://python-telegram-bot.readthedocs.io/en/stable/telegram.ext.dispatcher.html#telegram.ext.Dispatcher.add_handler
-.. _`#777`: https://github.com/python-telegram-bot/python-telegram-bot/pull/777
-.. _`#806`: https://github.com/python-telegram-bot/python-telegram-bot/pull/806
-.. _`#766`: https://github.com/python-telegram-bot/python-telegram-bot/pull/766
-.. _`#776`: https://github.com/python-telegram-bot/python-telegram-bot/pull/776
-.. _`#789`: https://github.com/python-telegram-bot/python-telegram-bot/pull/789
-.. _`#754`: https://github.com/python-telegram-bot/python-telegram-bot/pull/754
-.. _`#761`: https://github.com/python-telegram-bot/python-telegram-bot/pull/761
-.. _`#764`: https://github.com/python-telegram-bot/python-telegram-bot/pull/764
-.. _`#771`: https://github.com/python-telegram-bot/python-telegram-bot/pull/771
-.. _`#788`: https://github.com/python-telegram-bot/python-telegram-bot/pull/788
-.. _`#793`: https://github.com/python-telegram-bot/python-telegram-bot/pull/793
-.. _`#810`: https://github.com/python-telegram-bot/python-telegram-bot/pull/810
-
-**2017-07-28**
-*Released 7.0.1*
-
-- Fix TypeError exception in RegexHandler (PR #751).
-- Small documentation fix (PR #749).
-
-**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*
-
-- Add support for Bot API 2.3.1
-- Add support for ``deleteMessage`` API method
-- New, simpler API for ``JobQueue`` - https://github.com/python-telegram-bot/python-telegram-bot/pull/484
-- Download files into file-like objects - https://github.com/python-telegram-bot/python-telegram-bot/pull/459
-- Use vendor ``urllib3`` to address issues with timeouts
-  - The default timeout for messages is now 5 seconds. For sending media, the default timeout is now 20 seconds.
-- String attributes that are not set are now ``None`` by default, instead of empty strings
-- Add ``text_markdown`` and ``text_html`` properties to ``Message`` - https://github.com/python-telegram-bot/python-telegram-bot/pull/507
-- Add support for Socks5 proxy - https://github.com/python-telegram-bot/python-telegram-bot/pull/518
-- Add support for filters in ``CommandHandler`` - https://github.com/python-telegram-bot/python-telegram-bot/pull/536
-- Add the ability to invert (not) filters - https://github.com/python-telegram-bot/python-telegram-bot/pull/552
-- Add ``Filters.group`` and ``Filters.private``
-- Compatibility with GAE via ``urllib3.contrib`` package - https://github.com/python-telegram-bot/python-telegram-bot/pull/583
-- Add equality rich comparision operators to telegram objects - https://github.com/python-telegram-bot/python-telegram-bot/pull/604
-- Several bugfixes and other improvements
-- Remove some deprecated code
-
-**2017-04-17**
-
-*Released 5.3.1*
-
-- Hotfix release due to bug introduced by urllib3 version 1.21
-
-**2016-12-11**
-
-*Released 5.3*
-
-- Implement API changes of November 21st (Bot API 2.3)
-- ``JobQueue`` now supports ``datetime.timedelta`` in addition to seconds
-- ``JobQueue`` now supports running jobs only on certain days
-- New ``Filters.reply`` filter
-- Bugfix for ``Message.edit_reply_markup``
-- Other bugfixes
-
-**2016-10-25**
-
-*Released 5.2*
-
-- Implement API changes of October 3rd (games update)
-- Add ``Message.edit_*`` methods
-- Filters for the ``MessageHandler`` can now be combined using bitwise operators (``& and |``)
-- Add a way to save user- and chat-related data temporarily
-- Other bugfixes and improvements
-
-**2016-09-24**
-
-*Released 5.1*
-
-- Drop Python 2.6 support
-- Deprecate ``telegram.Emoji``
-
-- Use ``ujson`` if available
-- Add instance methods to ``Message``, ``Chat``, ``User``, ``InlineQuery`` and ``CallbackQuery``
-- RegEx filtering for ``CallbackQueryHandler`` and ``InlineQueryHandler``
-- New ``MessageHandler`` filters: ``forwarded`` and ``entity``
-- Add ``Message.get_entity`` to correctly handle UTF-16 codepoints and ``MessageEntity`` offsets
-- Fix bug in ``ConversationHandler`` when first handler ends the conversation
-- Allow multiple ``Dispatcher`` instances
-- Add ``ChatMigrated`` Exception
-- Properly split and handle arguments in ``CommandHandler``
-
-**2016-07-15**
-
-*Released 5.0*
-
-- Rework ``JobQueue``
-- Introduce ``ConversationHandler``
-- Introduce ``telegram.constants`` - https://github.com/python-telegram-bot/python-telegram-bot/pull/342
-
 **2016-07-12**
 
 *Released 4.3.4*

CODE_OF_CONDUCT.md

@@ -1,46 +0,0 @@
-# Contributor Covenant Code of Conduct
-
-## Our Pledge
-
-In the interest of fostering an open and welcoming environment, we as contributors and maintainers pledge to making participation in our project and our community a harassment-free experience for everyone, regardless of age, body size, disability, ethnicity, gender identity and expression, level of experience, nationality, personal appearance, race, religion, or sexual identity and orientation.
-
-## Our Standards
-
-Examples of behavior that contributes to creating a positive environment include:
-
-* Using welcoming and inclusive language
-* Being respectful of differing viewpoints and experiences
-* Gracefully accepting constructive criticism
-* Focusing on what is best for the community
-* Showing empathy towards other community members
-
-Examples of unacceptable behavior by participants include:
-
-* The use of sexualized language or imagery and unwelcome sexual attention or advances
-* Trolling, insulting/derogatory comments, and personal or political attacks
-* Public or private harassment
-* Publishing others' private information, such as a physical or electronic address, without explicit permission
-* Other conduct which could reasonably be considered inappropriate in a professional setting
-
-## Our Responsibilities
-
-Project maintainers are responsible for clarifying the standards of acceptable behavior and are expected to take appropriate and fair corrective action in response to any instances of unacceptable behavior.
-
-Project maintainers have the right and responsibility to remove, edit, or reject comments, commits, code, wiki edits, issues, and other contributions that are not aligned to this Code of Conduct, or to ban temporarily or permanently any contributor for other behaviors that they deem inappropriate, threatening, offensive, or harmful.
-
-## Scope
-
-This Code of Conduct applies both within project spaces and in public spaces when an individual is representing the project or its community. Examples of representing a project or community include using an official project e-mail address, posting via an official social media account, or acting as an appointed representative at an online or offline event. Representation of a project may be further defined and clarified by project maintainers.
-
-## Enforcement
-
-Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting the project team at devs@python-telegram-bot.org. The project team will review and investigate all complaints, and will respond in a way that it deems appropriate to the circumstances. The project team is obligated to maintain confidentiality with regard to the reporter of an incident. Further details of specific enforcement policies may be posted separately.
-
-Project maintainers who do not follow or enforce the Code of Conduct in good faith may face temporary or permanent repercussions as determined by other members of the project's leadership.
-
-## Attribution
-
-This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4, available at [http://contributor-covenant.org/version/1/4][version]
-
-[homepage]: http://contributor-covenant.org
-[version]: http://contributor-covenant.org/version/1/4/

Makefile

@@ -2,7 +2,7 @@
 .PHONY: clean pep257 pep8 yapf lint test install
 
 PYLINT          := pylint
-PYTEST          := pytest
+NOSETESTS       := nosetests
 PEP257          := pep257
 PEP8            := flake8
 YAPF            := yapf
@@ -29,7 +29,7 @@ lint:
 	$(PYLINT) -E telegram --disable=no-name-in-module,import-error
 
 test:
-	$(PYTEST) -v
+	$(NOSETESTS) -v
 
 install:
 	$(PIP)  install -r requirements.txt -r requirements-dev.txt
@@ -41,11 +41,11 @@ help:
 	@echo "- pep8        Check style with flake8"
 	@echo "- lint        Check style with pylint"
 	@echo "- yapf        Check style with yapf"
-	@echo "- test        Run tests using pytest"
+	@echo "- test        Run tests"
 	@echo
 	@echo "Available variables:"
 	@echo "- PYLINT      default: $(PYLINT)"
-	@echo "- PYTEST      default: $(PYTEST)"
+	@echo "- NOSETESTS   default: $(NOSETESTS)"
 	@echo "- PEP257      default: $(PEP257)"
 	@echo "- PEP8        default: $(PEP8)"
 	@echo "- YAPF        default: $(YAPF)"

README.rst

@@ -1,9 +1,9 @@
 .. image:: https://github.com/python-telegram-bot/logos/blob/master/logo-text/png/ptb-logo-text_768.png?raw=true
    :align: center
-   :target: https://python-telegram-bot.org
+   :target: https://github.com/python-telegram-bot/logos
    :alt: python-telegram-bot Logo
 
-We have made you a wrapper you can't refuse
+Not **just** a Python wrapper around the Telegram Bot API
 
 *Stay tuned for library updates and new releases on our* `Telegram Channel <https://telegram.me/pythontelegrambotchannel>`_.
 
@@ -15,12 +15,8 @@ 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/
+   :target: https://pythonhosted.org/python-telegram-bot/
    :alt: Documentation Status
 
 .. image:: https://img.shields.io/pypi/l/python-telegram-bot.svg
@@ -31,30 +27,22 @@ We have made you a wrapper you can't refuse
    :target: https://travis-ci.org/python-telegram-bot/python-telegram-bot
    :alt: Travis CI Status
 
-.. image:: https://img.shields.io/appveyor/ci/Eldinnie/python-telegram-bot/master.svg?logo=appveyor
-   :target: https://ci.appveyor.com/project/Eldinnie/python-telegram-bot
-   :alt: AppVeyor CI Status
-
 .. image:: https://codeclimate.com/github/python-telegram-bot/python-telegram-bot/badges/gpa.svg
    :target: https://codeclimate.com/github/python-telegram-bot/python-telegram-bot
    :alt: Code Climate
 
-.. image:: https://codecov.io/gh/python-telegram-bot/python-telegram-bot/branch/master/graph/badge.svg
-   :target: https://codecov.io/gh/python-telegram-bot/python-telegram-bot
-   :alt: Code coverage
+.. image:: https://coveralls.io/repos/python-telegram-bot/python-telegram-bot/badge.svg?branch=master&service=github
+   :target: https://coveralls.io/github/python-telegram-bot/python-telegram-bot?branch=master
+   :alt: Coveralls
    
 .. image:: http://isitmaintained.com/badge/resolution/python-telegram-bot/python-telegram-bot.svg
    :target: http://isitmaintained.com/project/python-telegram-bot/python-telegram-bot
-   :alt: Median time to resolve an issue
+   :alt: Average time to resolve an issue
 
 .. image:: https://img.shields.io/badge/Telegram-Group-blue.svg
    :target: https://telegram.me/pythontelegrambotgroup
    :alt: Telegram Group
 
-.. image:: https://img.shields.io/badge/IRC-Channel-blue.svg
-   :target: https://webchat.freenode.net/?channels=##python-telegram-bot
-   :alt: IRC Bridge
-
 =================
 Table of contents
 =================
@@ -85,7 +73,8 @@ Introduction
 
 This library provides a pure Python interface for the
 `Telegram Bot API <https://core.telegram.org/bots/api>`_.
-It's compatible with Python versions 2.7, 3.3+ and `PyPy <http://pypy.org/>`_.
+It works with Python versions from 2.6+ (**Note:** Support for 2.6 will be dropped at some point
+this year. 2.7 will still be supported).
 It also works with `Google App Engine <https://cloud.google.com/appengine>`_.
 
 In addition to the pure API implementation, this library features a number of high-level classes to
@@ -96,7 +85,7 @@ make the development of bots easy and straightforward. These classes are contain
 Telegram API support
 ====================
 
-All types and methods of the Telegram Bot API 3.4 are supported.
+As of **28. May 2016**, all types and methods of the Telegram Bot API are supported.
 
 ==========
 Installing
@@ -108,20 +97,6 @@ You can install or upgrade python-telegram-bot with:
 
     $ pip install python-telegram-bot --upgrade
 
-Or you can install from source with:
-
-.. code:: shell
-
-    $ git clone https://github.com/python-telegram-bot/python-telegram-bot --recursive
-    $ cd python-telegram-bot
-    $ python setup.py install
-    
-In case you have a previously cloned local repository already, you should initialize the added urllib3 submodule before installing with:
-
-.. code:: shell
-
-    $ git submodule update --init --recursive
-
 ===============
 Getting started
 ===============
@@ -134,7 +109,7 @@ Our Wiki contains a lot of resources to get you started with ``python-telegram-b
 Other references:
 
 - `Telegram API documentation <https://core.telegram.org/bots/api>`_
-- `python-telegram-bot documentation <https://python-telegram-bot.readthedocs.io/>`_
+- `python-telegram-bot documentation <https://pythonhosted.org/python-telegram-bot/>`_
 
 -------------------
 Learning by example
@@ -142,11 +117,21 @@ Learning by example
 
 We believe that the best way to learn and understand this simple package is by example. So here
 are some examples for you to review. Even if it's not your approach for learning, please take a
-look at ``echobot2``, it is de facto the base for most of the bots out there. Best of all,
+look at ``echobot2`` (below), it is de facto the base for most of the bots out there. Best of all,
 the code for these examples are released to the public domain, so you can start by grabbing the
 code and building on top of it.
 
-Visit `this page <https://github.com/python-telegram-bot/python-telegram-bot/blob/master/examples/README.md>`_ to discover the official examples or look at the examples on the `wiki <https://github.com/python-telegram-bot/python-telegram-bot/wiki/Examples>`_ to see other bots the community has built.
+- `echobot2 <https://github.com/python-telegram-bot/python-telegram-bot/blob/master/examples/echobot2.py>`_ replies back messages.
+
+- `inlinebot <https://github.com/python-telegram-bot/python-telegram-bot/blob/master/examples/inlinebot.py>`_ basic example of an `inline bot <https://core.telegram.org/bots/inline>`_.
+
+- `state machine bot <https://github.com/python-telegram-bot/python-telegram-bot/blob/master/examples/state_machine_bot.py>`_ keeps the state for individual users, useful for multipart conversations.
+
+- `timerbot <https://github.com/python-telegram-bot/python-telegram-bot/blob/master/examples/timerbot.py>`_ uses the ``JobQueue`` to send timed messages.
+
+- `echobot <https://github.com/python-telegram-bot/python-telegram-bot/blob/master/examples/legacy/echobot.py>`_ uses only the pure API to echo messages.
+
+Look at the examples on the `wiki <https://github.com/python-telegram-bot/python-telegram-bot/wiki/Examples>`_ to see other bots the community has built.
 
 -------
 Logging
@@ -180,7 +165,7 @@ If you want DEBUG logs instead:
 Documentation
 =============
 
-``python-telegram-bot``'s documentation lives at `readthedocs.io <https://python-telegram-bot.readthedocs.io/>`_.
+``python-telegram-bot``'s documentation lives at `pythonhosted.org <https://pythonhosted.org/python-telegram-bot/>`_.
 
 ============
 Getting help

appveyor.yml

@@ -1,39 +0,0 @@
-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:\\Python34"
-    - PYTHON: "C:\\Python35"
-    - PYTHON: "C:\\Python36"
-
-branches:
-  only:
-  - master
-
-skip_branch_with_pr: true
-
-max_jobs: 1
-
-install:
-  - "SET PATH=%PYTHON%;%PYTHON%\\Scripts;%PATH%"
-  - "git submodule update --init --recursive"
-  # Check that we have the expected version and architecture for Python
-  - "python --version"
-  # We need wheel installed to build wheels
-  - "pip install -U codecov pytest-cov"
-  - "pip install -U wheel"
-  - "pip install -r requirements.txt"
-  - "pip install -r requirements-dev.txt"
-
-build: off
-
-test_script:
-  - "pytest -m \"not nocoverage\" --cov --cov-report xml:coverage.xml"
-
-after_test:
- - "codecov -f coverage.xml -F Appveyor"

codecov.yml

@@ -1,4 +0,0 @@
-comment:
-  layout: "diff, files"
-  behavior: default
-  require_changes: false

docs/Makefile

@@ -189,4 +189,4 @@ xml:
 pseudoxml:
 	$(SPHINXBUILD) -b pseudoxml $(ALLSPHINXOPTS) $(BUILDDIR)/pseudoxml
 	@echo
-	@echo "Build finished. The pseudo-XML files are in $(BUILDDIR)/pseudoxml."
+	@echo "Build finished. The pseudo-XML files are in $(BUILDDIR)/pseudoxml."

docs/requirements-docs.txt

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

docs/source/conf.py

@@ -11,10 +11,11 @@
 #
 # All configuration values have a default; values that are commented out
 # serve to show the default.
+
 import sys
 import os
 import shlex
-# import telegram
+import telegram
 
 # 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
@@ -24,7 +25,7 @@ sys.path.insert(0, os.path.abspath('../..'))
 # -- General configuration ------------------------------------------------
 
 # If your documentation needs a minimal Sphinx version, state it here.
-needs_sphinx = '1.5.4'  # fixes issues with autodoc-skip-member and napoleon
+#needs_sphinx = '1.0'
 
 # Add any Sphinx extension module names here, as strings. They can be
 # extensions coming with Sphinx (named 'sphinx.ext.*') or your custom
@@ -50,7 +51,7 @@ master_doc = 'index'
 
 # General information about the project.
 project = u'Python Telegram Bot'
-copyright = u'2015-2017, Leandro Toledo'
+copyright = u'2015-2016, Leandro Toledo'
 author = u'Leandro Toledo'
 
 # The version info for the project you're documenting, acts as replacement for
@@ -58,9 +59,9 @@ author = u'Leandro Toledo'
 # built documents.
 #
 # The short X.Y version.
-version = '9.0'  # telegram.__version__[:3]
+version = telegram.__version__[:3]
 # The full version, including alpha/beta/rc tags.
-release = '9.0.0'  # telegram.__version__
+release = telegram.__version__
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
@@ -130,12 +131,12 @@ html_theme = 'sphinx_rtd_theme'
 
 # The name of an image file (relative to this directory) to place at the top
 # of the sidebar.
-html_logo = 'ptb-logo-orange.png'
+#html_logo = None
 
 # 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 = 'ptb-logo-orange.ico'
+#html_favicon = None
 
 # 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,
@@ -208,17 +209,14 @@ htmlhelp_basename = 'PythonTelegramBotdoc'
 # -- Options for LaTeX output ---------------------------------------------
 
 latex_elements = {
-
 # The paper size ('letterpaper' or 'a4paper').
-    'papersize': 'a4paper',
+#'papersize': 'letterpaper',
 
 # The font size ('10pt', '11pt' or '12pt').
 #'pointsize': '10pt',
 
 # Additional stuff for the LaTeX preamble.
-    'preamble': r'''\setcounter{tocdepth}{2}
-\usepackage{enumitem}
-\setlistdepth{99}''',
+#'preamble': '',
 
 # Latex figure (float) alignment
 #'figure_align': 'htbp',
@@ -229,12 +227,12 @@ latex_elements = {
 #  author, documentclass [howto, manual, or own class]).
 latex_documents = [
   (master_doc, 'PythonTelegramBot.tex', u'Python Telegram Bot Documentation',
-   author, 'manual'),
+   u'Leandro Toledo', 'manual'),
 ]
 
 # The name of an image file (relative to this directory) to place at the top of
 # the title page.
-latex_logo = 'ptb-logo_1024.png'
+#latex_logo = None
 
 # For "manual" documents, if this is true, then toplevel headings are parts,
 # not chapters.
@@ -273,7 +271,7 @@ man_pages = [
 #  dir menu entry, description, category)
 texinfo_documents = [
   (master_doc, 'PythonTelegramBot', u'Python Telegram Bot Documentation',
-   author, 'PythonTelegramBot', "We have made you a wrapper you can't refuse",
+   author, 'PythonTelegramBot', 'Not just a Python wrapper around the Telegram Bot API',
    'Miscellaneous'),
 ]
 
@@ -288,21 +286,3 @@ 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,16 +6,12 @@
 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>`_.
+Contents:
 
 .. toctree::
-   telegram
+   :maxdepth: 2
 
-Changelog
----------
 
-.. include:: ..\\..\\CHANGES.rst
 
 Indices and tables
 ==================

docs/source/modules.rst

@@ -0,0 +1,7 @@
+telegram
+========
+
+.. toctree::
+   :maxdepth: 4
+
+   telegram

docs/source/telegram.animation.rst

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

docs/source/telegram.audio.rst

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

docs/source/telegram.base.rst

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

docs/source/telegram.bot.rst

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

docs/source/telegram.callbackgame.rst

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

docs/source/telegram.callbackquery.rst

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

docs/source/telegram.chat.rst

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

docs/source/telegram.chataction.rst

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

docs/source/telegram.chatmember.rst

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

docs/source/telegram.chatphoto.rst

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

docs/source/telegram.choseninlineresult.rst

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

docs/source/telegram.constants.rst

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

docs/source/telegram.contact.rst

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

docs/source/telegram.contrib.botan.rst

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

docs/source/telegram.document.rst

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

docs/source/telegram.emoji.rst

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

docs/source/telegram.ext.callbackqueryhandler.rst

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

docs/source/telegram.ext.choseninlineresulthandler.rst

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

docs/source/telegram.ext.commandhandler.rst

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

docs/source/telegram.ext.conversationhandler.rst

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

docs/source/telegram.ext.delayqueue.rst

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

docs/source/telegram.ext.dispatcher.rst

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

docs/source/telegram.ext.filters.rst

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

docs/source/telegram.ext.handler.rst

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

docs/source/telegram.ext.inlinequeryhandler.rst

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

docs/source/telegram.ext.job.rst

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

docs/source/telegram.ext.jobqueue.rst

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

docs/source/telegram.ext.messagehandler.rst

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

docs/source/telegram.ext.messagequeue.rst

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

docs/source/telegram.ext.precheckoutqueryhandler.rst

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

docs/source/telegram.ext.regexhandler.rst

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

docs/source/telegram.ext.rst

@@ -1,31 +1,28 @@
 telegram.ext package
 ====================
 
+Submodules
+----------
+
 .. toctree::
 
     telegram.ext.updater
     telegram.ext.dispatcher
-    telegram.ext.filters
-    telegram.ext.job
     telegram.ext.jobqueue
-    telegram.ext.messagequeue
-    telegram.ext.delayqueue
-
-Handlers
---------
-
-.. toctree::
-
     telegram.ext.handler
-    telegram.ext.callbackqueryhandler
     telegram.ext.choseninlineresulthandler
-    telegram.ext.conversationhandler
     telegram.ext.commandhandler
     telegram.ext.inlinequeryhandler
     telegram.ext.messagehandler
-    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

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

docs/source/telegram.ext.stringcommandhandler.rst

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

docs/source/telegram.ext.stringregexhandler.rst

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

docs/source/telegram.ext.typehandler.rst

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

docs/source/telegram.ext.updater.rst

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

docs/source/telegram.file.rst

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

docs/source/telegram.forcereply.rst

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

docs/source/telegram.game.rst

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

docs/source/telegram.gamehighscore.rst

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

docs/source/telegram.inlinekeyboardbutton.rst

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

docs/source/telegram.inlinekeyboardmarkup.rst

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

docs/source/telegram.inlinequery.rst

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

docs/source/telegram.inlinequeryresult.rst

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

docs/source/telegram.inlinequeryresultarticle.rst

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

docs/source/telegram.inlinequeryresultaudio.rst

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

docs/source/telegram.inlinequeryresultcachedaudio.rst

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

docs/source/telegram.inlinequeryresultcacheddocument.rst

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

docs/source/telegram.inlinequeryresultcachedgif.rst

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

docs/source/telegram.inlinequeryresultcachedmpeg4gif.rst

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

docs/source/telegram.inlinequeryresultcachedphoto.rst

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

docs/source/telegram.inlinequeryresultcachedsticker.rst

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

docs/source/telegram.inlinequeryresultcachedvideo.rst

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

docs/source/telegram.inlinequeryresultcachedvoice.rst

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

docs/source/telegram.inlinequeryresultcontact.rst

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

docs/source/telegram.inlinequeryresultdocument.rst

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

docs/source/telegram.inlinequeryresultgame.rst

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

docs/source/telegram.inlinequeryresultgif.rst

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

docs/source/telegram.inlinequeryresultlocation.rst

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

docs/source/telegram.inlinequeryresultmpeg4gif.rst

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

docs/source/telegram.inlinequeryresultphoto.rst

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

docs/source/telegram.inlinequeryresultvenue.rst

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

docs/source/telegram.inlinequeryresultvideo.rst

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

docs/source/telegram.inlinequeryresultvoice.rst

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

docs/source/telegram.inputcontactmessagecontent.rst

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

docs/source/telegram.inputfile.rst

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

docs/source/telegram.inputlocationmessagecontent.rst

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

docs/source/telegram.inputmedia.rst

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

docs/source/telegram.inputmediaphoto.rst

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

docs/source/telegram.inputmediavideo.rst

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

docs/source/telegram.inputmessagecontent.rst

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

docs/source/telegram.inputtextmessagecontent.rst

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

docs/source/telegram.inputvenuemessagecontent.rst

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

docs/source/telegram.invoice.rst

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