X Tutup
Skip to content

Commit 960862c

Browse files
jsmnbomjsmnbom
committed
Merge branch 'master' into october3
# Conflicts: # telegram/bot.py # telegram/callbackquery.py # telegram/chat.py # telegram/ext/messagehandler.py # telegram/inlinekeyboardbutton.py # telegram/inlinequeryresultcachedaudio.py # telegram/message.py # tests/test_filters.py
2 parents 78088f4 + 4e5f458 commit 960862c

Some content is hidden

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

50 files changed

+1481
-847
lines changed

‎.gitignore‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,3 +68,6 @@ telegram.mp4
6868
telegram.ogg
6969
telegram.png
7070
telegram.webp
71+
72+
# original files from merges
73+
*.orig

‎docs/source/conf.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
import sys
1616
import os
1717
import shlex
18-
import telegram
18+
# import telegram
1919

2020
# If extensions (or modules to document with autodoc) are in another directory,
2121
# add these directories to sys.path here. If the directory is relative to the
@@ -59,9 +59,9 @@
5959
# built documents.
6060
#
6161
# The short X.Y version.
62-
version = telegram.__version__[:3]
62+
version = '5.1' # telegram.__version__[:3]
6363
# The full version, including alpha/beta/rc tags.
64-
release = telegram.__version__
64+
release = '5.1.0' # telegram.__version__
6565

6666
# The language for content autogenerated by Sphinx. Refer to documentation
6767
# for a list of supported languages.

‎docs/source/telegram.ext.filters.rst‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
telegram.ext.filters module
2+
===========================
3+
4+
.. automodule:: telegram.ext.filters
5+
:members:
6+
:undoc-members:
7+
:show-inheritance:

‎docs/source/telegram.ext.rst‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ Submodules
1515
telegram.ext.commandhandler
1616
telegram.ext.inlinequeryhandler
1717
telegram.ext.messagehandler
18+
telegram.ext.filters
1819
telegram.ext.regexhandler
1920
telegram.ext.stringcommandhandler
2021
telegram.ext.stringregexhandler

‎telegram/audio.py‎

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -35,24 +35,30 @@ class Audio(TelegramObject):
3535
Args:
3636
file_id (str):
3737
duration (int):
38-
**kwargs: Arbitrary keyword arguments.
39-
40-
Keyword Args:
4138
performer (Optional[str]):
4239
title (Optional[str]):
4340
mime_type (Optional[str]):
4441
file_size (Optional[int]):
42+
**kwargs: Arbitrary keyword arguments.
43+
4544
"""
4645

47-
def __init__(self, file_id, duration, **kwargs):
46+
def __init__(self,
47+
file_id,
48+
duration,
49+
performer='',
50+
title='',
51+
mime_type='',
52+
file_size=0,
53+
**kwargs):
4854
# Required
4955
self.file_id = str(file_id)
5056
self.duration = int(duration)
5157
# Optionals
52-
self.performer = kwargs.get('performer', '')
53-
self.title = kwargs.get('title', '')
54-
self.mime_type = str(kwargs.get('mime_type', ''))
55-
self.file_size = int(kwargs.get('file_size', 0))
58+
self.performer = performer
59+
self.title = title
60+
self.mime_type = str(mime_type)
61+
self.file_size = int(file_size)
5662

5763
@staticmethod
5864
def de_json(data, bot):

0 commit comments

Comments
 (0)
X Tutup