Skip to content

Commit 2954379

Browse files
EldinnieEldinnie
committed
Merge branch 'master' into presistence
2 parents dce3109 + 3bef2fa commit 2954379

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

48 files changed

+1295
-316
lines changed

‎.readthedocs.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,6 @@ formats:
55

66
python:
77
setup_py_install: true
8+
version: 3
89

910
requirements_file: docs/requirements-docs.txt

‎AUTHORS.rst‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ The following wonderful people contributed directly or indirectly to this projec
2424
- `daimajia <https://github.com/daimajia>`_
2525
- `Daniel Reed <https://github.com/nmlorg>`_
2626
- `Eli Gao <https://github.com/eligao>`_
27+
- `Emilio Molinari <https://github.com/xates>`_
2728
- `ErgoZ Riftbit Vaper <https://github.com/ergoz>`_
2829
- `Eugene Lisitsky <https://github.com/lisitsky>`_
2930
- `Eugenio Panadero <https://github.com/azogue>`_
@@ -52,17 +53,21 @@ The following wonderful people contributed directly or indirectly to this projec
5253
- `Noam Meltzer <https://github.com/tsnoam>`_
5354
- `Oleg Shlyazhko <https://github.com/ollmer>`_
5455
- `Oleg Sushchenko <https://github.com/feuillemorte>`_
56+
- `Or Bin <https://github.com/OrBin>`_
5557
- `overquota <https://github.com/overquota>`_
5658
- `Patrick Hofmann <https://github.com/PH89>`_
59+
- `Paul Larsen <https://github.com/PaulSonOfLars>`_
5760
- `Pieter Schutz <https://github.com/eldinnie>`_
5861
- `Rahiel Kasim <https://github.com/rahiel>`_
5962
- `Sascha <https://github.com/saschalalala>`_
6063
- `Shelomentsev D <https://github.com/shelomentsevd>`_
6164
- `Simon Schürrle <https://github.com/SitiSchu>`_
6265
- `sooyhwang <https://github.com/sooyhwang>`_
6366
- `thodnev <https://github.com/thodnev>`_
67+
- `Trainer Jono <https://github.com/Tr-Jono>`_
6468
- `Valentijn <https://github.com/Faalentijn>`_
6569
- `voider1 <https://github.com/voider1>`_
70+
- `Wagner Macedo <https://github.com/wagnerluis1982>`_
6671
- `wjt <https://github.com/wjt>`_
6772

6873
Please add yourself here alphabetically when you submit your first pull request.

‎CHANGES.rst‎

Lines changed: 109 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,115 @@
11
=======
22
Changes
33
=======
4+
**2018-04-17**
5+
*Released 10.0.2*
6+
7+
Important fix:
8+
9+
- Handle utf8 decoding errors (`#1076`_)
10+
11+
New features:
12+
13+
- Added Filter.regex (`#1028`_)
14+
- Filters for Category and file types (`#1046`_)
15+
- Added video note filter (`#1067`_)
16+
17+
Fixes:
18+
19+
- Fix in telegram.Message (`#1042`_)
20+
- Make chat_id a positional argument inside shortcut methods of Chat and User classes (`#1050`_)
21+
- Make Bot.full_name return a unicode object. (`#1063`_)
22+
- CommandHandler faster check (`#1074`_)
23+
- Correct documentation of Dispatcher.add_handler (`#1071`_)
24+
- Various small fixes to documentation.
25+
26+
.. _`#1028`: https://github.com/python-telegram-bot/python-telegram-bot/pull/1028
27+
.. _`#1042`: https://github.com/python-telegram-bot/python-telegram-bot/pull/1042
28+
.. _`#1046`: https://github.com/python-telegram-bot/python-telegram-bot/pull/1046
29+
.. _`#1050`: https://github.com/python-telegram-bot/python-telegram-bot/pull/1050
30+
.. _`#1067`: https://github.com/python-telegram-bot/python-telegram-bot/pull/1067
31+
.. _`#1063`: https://github.com/python-telegram-bot/python-telegram-bot/pull/1063
32+
.. _`#1074`: https://github.com/python-telegram-bot/python-telegram-bot/pull/1074
33+
.. _`#1076`: https://github.com/python-telegram-bot/python-telegram-bot/pull/1076
34+
.. _`#1071`: https://github.com/python-telegram-bot/python-telegram-bot/pull/1071
35+
36+
**2018-03-05**
37+
*Released 10.0.1*
38+
39+
Fixes:
40+
41+
- Fix conversationhandler timeout (PR `#1032`_)
42+
- Add missing docs utils (PR `#912`_)
43+
44+
.. _`#1032`: https://github.com/python-telegram-bot/python-telegram-bot/pull/826
45+
.. _`#912`: https://github.com/python-telegram-bot/python-telegram-bot/pull/826
46+
47+
**2018-03-02**
48+
*Released 10.0.0*
49+
50+
Non backward compatabile changes and changed defaults
51+
52+
- JobQueue: Remove deprecated prevent_autostart & put() (PR `#1012`_)
53+
- Bot, Updater: Remove deprecated network_delay (PR `#1012`_)
54+
- Remove deprecated Message.new_chat_member (PR `#1012`_)
55+
- Retry bootstrap phase indefinitely (by default) on network errors (PR `#1018`_)
56+
57+
New Features
58+
59+
- Support v3.6 API (PR `#1006`_)
60+
- User.full_name convinience property (PR `#949`_)
61+
- Add `send_phone_number_to_provider` and `send_email_to_provider` arguments to send_invoice (PR `#986`_)
62+
- Bot: Add shortcut methods reply_{markdown,html} (PR `#827`_)
63+
- Bot: Add shortcut method reply_media_group (PR `#994`_)
64+
- Added utils.helpers.effective_message_type (PR `#826`_)
65+
- Bot.get_file now allows passing a file in addition to file_id (PR `#963`_)
66+
- Add .get_file() to Audio, Document, PhotoSize, Sticker, Video, VideoNote and Voice (PR `#963`_)
67+
- Add .send_*() methods to User and Chat (PR `#963`_)
68+
- Get jobs by name (PR `#1011`_)
69+
- Add Message caption html/markdown methods (PR `#1013`_)
70+
- File.download_as_bytearray - new method to get a d/led file as bytearray (PR `#1019`_)
71+
- File.download(): Now returns a meaningful return value (PR `#1019`_)
72+
- Added conversation timeout in ConversationHandler (PR `#895`_)
73+
74+
Changes
75+
76+
- Store bot in PreCheckoutQuery (PR `#953`_)
77+
- Updater: Issue INFO log upon received signal (PR `#951`_)
78+
- JobQueue: Thread safety fixes (PR `#977`_)
79+
- WebhookHandler: Fix exception thrown during error handling (PR `#985`_)
80+
- Explicitly check update.effective_chat in ConversationHandler.check_update (PR `#959`_)
81+
- Updater: Better handling of timeouts during get_updates (PR `#1007`_)
82+
- Remove unnecessary to_dict() (PR `#834`_)
83+
- CommandHandler - ignore strings in entities and "/" followed by whitespace (PR `#1020`_)
84+
- Documentation & style fixes (PR `#942`_, PR `#956`_, PR `#962`_, PR `#980`_, PR `#983`_)
85+
86+
.. _`#826`: https://github.com/python-telegram-bot/python-telegram-bot/pull/826
87+
.. _`#827`: https://github.com/python-telegram-bot/python-telegram-bot/pull/827
88+
.. _`#834`: https://github.com/python-telegram-bot/python-telegram-bot/pull/834
89+
.. _`#895`: https://github.com/python-telegram-bot/python-telegram-bot/pull/895
90+
.. _`#942`: https://github.com/python-telegram-bot/python-telegram-bot/pull/942
91+
.. _`#949`: https://github.com/python-telegram-bot/python-telegram-bot/pull/949
92+
.. _`#951`: https://github.com/python-telegram-bot/python-telegram-bot/pull/951
93+
.. _`#956`: https://github.com/python-telegram-bot/python-telegram-bot/pull/956
94+
.. _`#953`: https://github.com/python-telegram-bot/python-telegram-bot/pull/953
95+
.. _`#962`: https://github.com/python-telegram-bot/python-telegram-bot/pull/962
96+
.. _`#959`: https://github.com/python-telegram-bot/python-telegram-bot/pull/959
97+
.. _`#963`: https://github.com/python-telegram-bot/python-telegram-bot/pull/963
98+
.. _`#977`: https://github.com/python-telegram-bot/python-telegram-bot/pull/977
99+
.. _`#980`: https://github.com/python-telegram-bot/python-telegram-bot/pull/980
100+
.. _`#983`: https://github.com/python-telegram-bot/python-telegram-bot/pull/983
101+
.. _`#985`: https://github.com/python-telegram-bot/python-telegram-bot/pull/985
102+
.. _`#986`: https://github.com/python-telegram-bot/python-telegram-bot/pull/986
103+
.. _`#994`: https://github.com/python-telegram-bot/python-telegram-bot/pull/994
104+
.. _`#1006`: https://github.com/python-telegram-bot/python-telegram-bot/pull/1006
105+
.. _`#1007`: https://github.com/python-telegram-bot/python-telegram-bot/pull/1007
106+
.. _`#1011`: https://github.com/python-telegram-bot/python-telegram-bot/pull/1011
107+
.. _`#1012`: https://github.com/python-telegram-bot/python-telegram-bot/pull/1012
108+
.. _`#1013`: https://github.com/python-telegram-bot/python-telegram-bot/pull/1013
109+
.. _`#1018`: https://github.com/python-telegram-bot/python-telegram-bot/pull/1018
110+
.. _`#1019`: https://github.com/python-telegram-bot/python-telegram-bot/pull/1019
111+
.. _`#1020`: https://github.com/python-telegram-bot/python-telegram-bot/pull/1020
112+
4113
**2017-12-08**
5114
*Released 9.0.0*
6115

‎README.rst‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,17 @@
55

66
We have made you a wrapper you can't refuse
77

8+
We have a vibrant community of developers helping each other in our `Telegram group <https://telegram.me/pythontelegrambotgroup>`_. Join us!
9+
810
*Stay tuned for library updates and new releases on our* `Telegram Channel <https://telegram.me/pythontelegrambotchannel>`_.
911

1012
.. image:: https://img.shields.io/pypi/v/python-telegram-bot.svg
11-
:target: https://pypi.python.org/pypi/python-telegram-bot
13+
:target: https://pypi.org/project/python-telegram-bot/
1214
:alt: PyPi Package Version
1315

1416
.. image:: https://img.shields.io/pypi/pyversions/python-telegram-bot.svg
15-
:target: https://pypi.python.org/pypi/python-telegram-bot
16-
:alt: Supported python versions
17+
:target: https://pypi.org/project/python-telegram-bot/
18+
:alt: Supported Python versions
1719

1820
.. image:: https://www.cpu.re/static/python-telegram-bot/downloads.svg
1921
:target: https://www.cpu.re/static/python-telegram-bot/downloads-by-python-version.txt
@@ -31,8 +33,8 @@ We have made you a wrapper you can't refuse
3133
:target: https://travis-ci.org/python-telegram-bot/python-telegram-bot
3234
:alt: Travis CI Status
3335

34-
.. image:: https://img.shields.io/appveyor/ci/Eldinnie/python-telegram-bot/master.svg?logo=appveyor
35-
:target: https://ci.appveyor.com/project/Eldinnie/python-telegram-bot
36+
.. image:: https://img.shields.io/appveyor/ci/python-telegram-bot/python-telegram-bot/master.svg?logo=appveyor
37+
:target: https://ci.appveyor.com/project/python-telegram-bot/python-telegram-bot
3638
:alt: AppVeyor CI Status
3739

3840

@@ -93,7 +95,7 @@ make the development of bots easy and straightforward. These classes are contain
9395
Telegram API support
9496
====================
9597

96-
All types and methods of the Telegram Bot API 3.4 are supported.
98+
All types and methods of the Telegram Bot API 3.6 are supported.
9799

98100
==========
99101
Installing

‎docs/source/conf.py‎

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -58,9 +58,9 @@
5858
# built documents.
5959
#
6060
# The short X.Y version.
61-
version = '9.0' # telegram.__version__[:3]
61+
version = '10.0' # telegram.__version__[:3]
6262
# The full version, including alpha/beta/rc tags.
63-
release = '9.0.0' # telegram.__version__
63+
release = '10.0.2' # telegram.__version__
6464

6565
# The language for content autogenerated by Sphinx. Refer to documentation
6666
# for a list of supported languages.
@@ -291,17 +291,9 @@
291291

292292
# -- script stuff --------------------------------------------------------
293293

294-
import inspect
295-
296294

297295
def autodoc_skip_member(app, what, name, obj, skip, options):
298-
try:
299-
if inspect.getmodule(obj).__name__.startswith('telegram') and inspect.isfunction(obj):
300-
if name.lower() != name:
301-
return True
302-
except AttributeError:
303-
pass
304-
# Return None so napoleon can handle it
296+
pass
305297

306298

307299
def setup(app):

‎docs/source/index.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ objects in the package reflect the types as defined by the `telegram bot api <ht
1515
Changelog
1616
---------
1717

18-
.. include:: ..\\..\\CHANGES.rst
18+
.. include:: ../../CHANGES.rst
1919

2020
Indices and tables
2121
==================

‎docs/source/telegram.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ telegram package
33

44
.. toctree::
55

6-
telegram.utils.helpers
76
telegram.ext
7+
telegram.utils
88
telegram.audio
99
telegram.bot
1010
telegram.callbackquery

‎docs/source/telegram.utils.promise.rst‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
telegram.utils.promise.Promise
2+
==============================
3+
4+
.. autoclass:: telegram.utils.promise.Promise
5+
:members:
6+
:show-inheritance:

‎docs/source/telegram.utils.request.rst‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
telegram.utils.request.Request
2+
==============================
3+
4+
.. autoclass:: telegram.utils.request.Request
5+
:members:
6+
:show-inheritance:

‎docs/source/telegram.utils.rst‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
telegram.utils package
2+
======================
3+
4+
.. toctree::
5+
6+
telegram.utils.helpers
7+
telegram.utils.promise
8+
telegram.utils.request

0 commit comments

Comments
 (0)