Skip to content

Commit f969124

Browse files
JosXaJosXa
committed
2 parents e33b2e3 + 94abf16 commit f969124

28 files changed

+652
-116
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

‎.travis.yml‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ python:
44
- "3.4"
55
- "3.5"
66
- "3.6"
7+
- "3.7-dev"
78
- "pypy-5.7.1"
89

910
dist: trusty
@@ -23,7 +24,8 @@ before_cache:
2324

2425
install:
2526
- pip install -U codecov pytest-cov
26-
- pip install -U wheel
27+
- echo $TRAVIS_PYTHON_VERSION
28+
- if [[ $TRAVIS_PYTHON_VERSION == '3.7'* ]]; then pip install -U git+https://github.com/yaml/pyyaml.git; fi
2729
- pip install -U -r requirements.txt
2830
- pip install -U -r requirements-dev.txt
2931
- if [[ $TRAVIS_PYTHON_VERSION != 'pypy'* ]]; then pip install ujson; fi

‎AUTHORS.rst‎

Lines changed: 4 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,6 +53,7 @@ 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>`_
5759
- `Paul Larsen <https://github.com/PaulSonOfLars>`_
@@ -62,8 +64,10 @@ The following wonderful people contributed directly or indirectly to this projec
6264
- `Simon Schürrle <https://github.com/SitiSchu>`_
6365
- `sooyhwang <https://github.com/sooyhwang>`_
6466
- `thodnev <https://github.com/thodnev>`_
67+
- `Trainer Jono <https://github.com/Tr-Jono>`_
6568
- `Valentijn <https://github.com/Faalentijn>`_
6669
- `voider1 <https://github.com/voider1>`_
70+
- `Wagner Macedo <https://github.com/wagnerluis1982>`_
6771
- `wjt <https://github.com/wjt>`_
6872

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

‎CHANGES.rst‎

Lines changed: 59 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,65 @@
11
=======
22
Changes
33
=======
4+
**2018-05-02**
5+
*Released 10.1.0*
6+
7+
Fixes changing previous behaviour:
8+
9+
- Add urllib3 fix for socks5h support (`#1085`_)
10+
- Fix send_sticker() timeout=20 (`#1088`_)
11+
12+
Fixes:
13+
14+
- Add a caption_entity filter for filtering caption entities (`#1068`_)
15+
- Inputfile encode filenames (`#1086`_)
16+
- InputFile: Fix proper naming of file when reading from subprocess.PIPE (`#1079`_)
17+
- Remove pytest-catchlog from requirements (`#1099`_)
18+
- Documentation fixes (`#1061`_, `#1078`_, `#1081`_, `#1096`_)
19+
20+
.. _`#1061`: https://github.com/python-telegram-bot/python-telegram-bot/pull/1061
21+
.. _`#1068`: https://github.com/python-telegram-bot/python-telegram-bot/pull/1068
22+
.. _`#1078`: https://github.com/python-telegram-bot/python-telegram-bot/pull/1078
23+
.. _`#1079`: https://github.com/python-telegram-bot/python-telegram-bot/pull/1079
24+
.. _`#1081`: https://github.com/python-telegram-bot/python-telegram-bot/pull/1081
25+
.. _`#1085`: https://github.com/python-telegram-bot/python-telegram-bot/pull/1085
26+
.. _`#1086`: https://github.com/python-telegram-bot/python-telegram-bot/pull/1086
27+
.. _`#1088`: https://github.com/python-telegram-bot/python-telegram-bot/pull/1088
28+
.. _`#1096`: https://github.com/python-telegram-bot/python-telegram-bot/pull/1096
29+
.. _`#1099`: https://github.com/python-telegram-bot/python-telegram-bot/pull/1099
30+
31+
**2018-04-17**
32+
*Released 10.0.2*
33+
34+
Important fix:
35+
36+
- Handle utf8 decoding errors (`#1076`_)
37+
38+
New features:
39+
40+
- Added Filter.regex (`#1028`_)
41+
- Filters for Category and file types (`#1046`_)
42+
- Added video note filter (`#1067`_)
43+
44+
Fixes:
45+
46+
- Fix in telegram.Message (`#1042`_)
47+
- Make chat_id a positional argument inside shortcut methods of Chat and User classes (`#1050`_)
48+
- Make Bot.full_name return a unicode object. (`#1063`_)
49+
- CommandHandler faster check (`#1074`_)
50+
- Correct documentation of Dispatcher.add_handler (`#1071`_)
51+
- Various small fixes to documentation.
52+
53+
.. _`#1028`: https://github.com/python-telegram-bot/python-telegram-bot/pull/1028
54+
.. _`#1042`: https://github.com/python-telegram-bot/python-telegram-bot/pull/1042
55+
.. _`#1046`: https://github.com/python-telegram-bot/python-telegram-bot/pull/1046
56+
.. _`#1050`: https://github.com/python-telegram-bot/python-telegram-bot/pull/1050
57+
.. _`#1067`: https://github.com/python-telegram-bot/python-telegram-bot/pull/1067
58+
.. _`#1063`: https://github.com/python-telegram-bot/python-telegram-bot/pull/1063
59+
.. _`#1074`: https://github.com/python-telegram-bot/python-telegram-bot/pull/1074
60+
.. _`#1076`: https://github.com/python-telegram-bot/python-telegram-bot/pull/1076
61+
.. _`#1071`: https://github.com/python-telegram-bot/python-telegram-bot/pull/1071
62+
463
**2018-03-05**
564
*Released 10.0.1*
665

‎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

‎appveyor.yml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ install:
2626
- "python --version"
2727
# We need wheel installed to build wheels
2828
- "pip install -U codecov pytest-cov"
29-
- "pip install -U wheel"
3029
- "pip install -r requirements.txt"
3130
- "pip install -r requirements-dev.txt"
3231

‎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 = '10.0' # telegram.__version__[:3]
61+
version = '10.1' # telegram.__version__[:3]
6262
# The full version, including alpha/beta/rc tags.
63-
release = '10.0.1' # telegram.__version__
63+
release = '10.1.0' # 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):

‎examples/README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Examples
22

3-
The examples in this folder are small bots meant to show you how a bot that is written with `python-telegram-bot` looks like. Some bots focus on one specific aspect of the Telegram Bot API while others focus on one of the mechanics of this library. Except for the [`echobot.py`](#pure-api) example, they all use the high-level framework this library provides with the [`telegram.ext`](https://python-telegram-bot.readthedocs.io/en/latest/telegram.ext.html) submodule.
3+
In this folder there are small examples to show what a bot written with `python-telegram-bot` looks like. Some bots focus on one specific aspect of the Telegram Bot API while others focus on one of the mechanics of this library. Except for the [`echobot.py`](#pure-api) example, they all use the high-level framework this library provides with the [`telegram.ext`](https://python-telegram-bot.readthedocs.io/en/latest/telegram.ext.html) submodule.
44

55
All examples are licensed under the [CC0 License](https://github.com/python-telegram-bot/python-telegram-bot/blob/master/examples/LICENSE.txt) and are therefore fully dedicated to the public domain. You can use them as the base for your own bots without worrying about copyrights.
66

‎requirements-dev.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,5 @@ yapf
66
pre-commit
77
beautifulsoup4
88
pytest
9-
pytest-catchlog
109
pytest-timeout
10+
wheel

‎telegram/bot.py‎

Lines changed: 60 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -545,7 +545,7 @@ def send_sticker(self,
545545
disable_notification=False,
546546
reply_to_message_id=None,
547547
reply_markup=None,
548-
timeout=None,
548+
timeout=20,
549549
**kwargs):
550550
"""Use this method to send .webp stickers.
551551
@@ -3070,61 +3070,120 @@ def __reduce__(self):
30703070

30713071
# camelCase aliases
30723072
getMe = get_me
3073+
"""Alias for :attr:`get_me`"""
30733074
sendMessage = send_message
3075+
"""Alias for :attr:`send_message`"""
30743076
deleteMessage = delete_message
3077+
"""Alias for :attr:`delete_message`"""
30753078
forwardMessage = forward_message
3079+
"""Alias for :attr:`forward_message`"""
30763080
sendPhoto = send_photo
3081+
"""Alias for :attr:`send_photo`"""
30773082
sendAudio = send_audio
3083+
"""Alias for :attr:`send_audio`"""
30783084
sendDocument = send_document
3085+
"""Alias for :attr:`send_document`"""
30793086
sendSticker = send_sticker
3087+
"""Alias for :attr:`send_sticker`"""
30803088
sendVideo = send_video
3089+
"""Alias for :attr:`send_video`"""
30813090
sendVoice = send_voice
3091+
"""Alias for :attr:`send_voice`"""
30823092
sendVideoNote = send_video_note
3093+
"""Alias for :attr:`send_video_note`"""
30833094
sendMediaGroup = send_media_group
3095+
"""Alias for :attr:`send_media_group`"""
30843096
sendLocation = send_location
3097+
"""Alias for :attr:`send_location`"""
30853098
editMessageLiveLocation = edit_message_live_location
3099+
"""Alias for :attr:`edit_message_live_location`"""
30863100
stopMessageLiveLocation = stop_message_live_location
3101+
"""Alias for :attr:`stop_message_live_location`"""
30873102
sendVenue = send_venue
3103+
"""Alias for :attr:`send_venue`"""
30883104
sendContact = send_contact
3105+
"""Alias for :attr:`send_contact`"""
30893106
sendGame = send_game
3107+
"""Alias for :attr:`send_game`"""
30903108
sendChatAction = send_chat_action
3109+
"""Alias for :attr:`send_chat_action`"""
30913110
answerInlineQuery = answer_inline_query
3111+
"""Alias for :attr:`answer_inline_query`"""
30923112
getUserProfilePhotos = get_user_profile_photos
3113+
"""Alias for :attr:`get_user_profile_photos`"""
30933114
getFile = get_file
3115+
"""Alias for :attr:`get_file`"""
30943116
kickChatMember = kick_chat_member
3117+
"""Alias for :attr:`kick_chat_member`"""
30953118
unbanChatMember = unban_chat_member
3119+
"""Alias for :attr:`unban_chat_member`"""
30963120
answerCallbackQuery = answer_callback_query
3121+
"""Alias for :attr:`answer_callback_query`"""
30973122
editMessageText = edit_message_text
3123+
"""Alias for :attr:`edit_message_text`"""
30983124
editMessageCaption = edit_message_caption
3125+
"""Alias for :attr:`edit_message_caption`"""
30993126
editMessageReplyMarkup = edit_message_reply_markup
3127+
"""Alias for :attr:`edit_message_reply_markup`"""
31003128
getUpdates = get_updates
3129+
"""Alias for :attr:`get_updates`"""
31013130
setWebhook = set_webhook
3131+
"""Alias for :attr:`set_webhook`"""
31023132
deleteWebhook = delete_webhook
3133+
"""Alias for :attr:`delete_webhook`"""
31033134
leaveChat = leave_chat
3135+
"""Alias for :attr:`leave_chat`"""
31043136
getChat = get_chat
3137+
"""Alias for :attr:`get_chat`"""
31053138
getChatAdministrators = get_chat_administrators
3139+
"""Alias for :attr:`get_chat_administrators`"""
31063140
getChatMember = get_chat_member
3141+
"""Alias for :attr:`get_chat_member`"""
31073142
setChatStickerSet = set_chat_sticker_set
3143+
"""Alias for :attr:`set_chat_sticker_set`"""
31083144
deleteChatStickerSet = delete_chat_sticker_set
3145+
"""Alias for :attr:`delete_chat_sticker_set`"""
31093146
getChatMembersCount = get_chat_members_count
3147+
"""Alias for :attr:`get_chat_members_count`"""
31103148
getWebhookInfo = get_webhook_info
3149+
"""Alias for :attr:`get_webhook_info`"""
31113150
setGameScore = set_game_score
3151+
"""Alias for :attr:`set_game_score`"""
31123152
getGameHighScores = get_game_high_scores
3153+
"""Alias for :attr:`get_game_high_scores`"""
31133154
sendInvoice = send_invoice
3155+
"""Alias for :attr:`send_invoice`"""
31143156
answerShippingQuery = answer_shipping_query
3157+
"""Alias for :attr:`answer_shipping_query`"""
31153158
answerPreCheckoutQuery = answer_pre_checkout_query
3159+
"""Alias for :attr:`answer_pre_checkout_query`"""
31163160
restrictChatMember = restrict_chat_member
3161+
"""Alias for :attr:`restrict_chat_member`"""
31173162
promoteChatMember = promote_chat_member
3163+
"""Alias for :attr:`promote_chat_member`"""
31183164
exportChatInviteLink = export_chat_invite_link
3165+
"""Alias for :attr:`export_chat_invite_link`"""
31193166
setChatPhoto = set_chat_photo
3167+
"""Alias for :attr:`set_chat_photo`"""
31203168
deleteChatPhoto = delete_chat_photo
3169+
"""Alias for :attr:`delete_chat_photo`"""
31213170
setChatTitle = set_chat_title
3171+
"""Alias for :attr:`set_chat_title`"""
31223172
setChatDescription = set_chat_description
3173+
"""Alias for :attr:`set_chat_description`"""
31233174
pinChatMessage = pin_chat_message
3175+
"""Alias for :attr:`pin_chat_message`"""
31243176
unpinChatMessage = unpin_chat_message
3177+
"""Alias for :attr:`unpin_chat_message`"""
31253178
getStickerSet = get_sticker_set
3179+
"""Alias for :attr:`get_sticker_set`"""
31263180
uploadStickerFile = upload_sticker_file
3181+
"""Alias for :attr:`upload_sticker_file`"""
31273182
createNewStickerSet = create_new_sticker_set
3183+
"""Alias for :attr:`create_new_sticker_set`"""
31283184
addStickerToSet = add_sticker_to_set
3185+
"""Alias for :attr:`add_sticker_to_set`"""
31293186
setStickerPositionInSet = set_sticker_position_in_set
3187+
"""Alias for :attr:`set_sticker_position_in_set`"""
31303188
deleteStickerFromSet = delete_sticker_from_set
3189+
"""Alias for :attr:`delete_sticker_from_set`"""

0 commit comments

Comments
 (0)