Skip to content

Commit 9596343

Browse files
tsnoamtsnoam
committed
pep8 fixes
1 parent c9630ee commit 9596343

50 files changed

Lines changed: 490 additions & 488 deletions

File tree

Some content is hidden

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

‎telegram/ext/conversationhandler.py‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -232,11 +232,11 @@ def check_update(self, update):
232232
233233
"""
234234
# Ignore messages in channels
235-
if (not isinstance(update, Update) or
236-
update.channel_post or
237-
self.per_chat and not update.effective_chat or
238-
self.per_message and not update.callback_query or
239-
update.callback_query and self.per_chat and not update.callback_query.message):
235+
if (not isinstance(update, Update)
236+
or update.channel_post
237+
or self.per_chat and not update.effective_chat
238+
or self.per_message and not update.callback_query
239+
or update.callback_query and self.per_chat and not update.callback_query.message):
240240
return False
241241

242242
key = self._get_key(update)

‎telegram/ext/filters.py‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -441,8 +441,8 @@ class _ChatCreated(BaseFilter):
441441
name = 'Filters.status_update.chat_created'
442442

443443
def filter(self, message):
444-
return bool(message.group_chat_created or message.supergroup_chat_created or
445-
message.channel_chat_created)
444+
return bool(message.group_chat_created or message.supergroup_chat_created
445+
or message.channel_chat_created)
446446

447447
chat_created = _ChatCreated()
448448
""":obj:`Filter`: Messages that contain :attr:`telegram.Message.group_chat_created`,
@@ -480,11 +480,11 @@ def filter(self, message):
480480
name = 'Filters.status_update'
481481

482482
def filter(self, message):
483-
return bool(self.new_chat_members(message) or self.left_chat_member(message) or
484-
self.new_chat_title(message) or self.new_chat_photo(message) or
485-
self.delete_chat_photo(message) or self.chat_created(message) or
486-
self.migrate(message) or self.pinned_message(message) or
487-
self.connected_website(message))
483+
return bool(self.new_chat_members(message) or self.left_chat_member(message)
484+
or self.new_chat_title(message) or self.new_chat_photo(message)
485+
or self.delete_chat_photo(message) or self.chat_created(message)
486+
or self.migrate(message) or self.pinned_message(message)
487+
or self.connected_website(message))
488488

489489
status_update = _StatusUpdate()
490490
"""Subset for messages containing a status update.
@@ -628,8 +628,8 @@ def filter(self, message):
628628
return bool(message.from_user and message.from_user.id in self.user_ids)
629629
else:
630630
# self.usernames is not None
631-
return bool(message.from_user and message.from_user.username and
632-
message.from_user.username in self.usernames)
631+
return bool(message.from_user and message.from_user.username
632+
and message.from_user.username in self.usernames)
633633

634634
class chat(BaseFilter):
635635
"""Filters messages to allow only those which are from specified chat ID.

‎telegram/files/inputfile.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -55,9 +55,9 @@ def __init__(self, obj, filename=None, attach=None):
5555

5656
if filename:
5757
self.filename = filename
58-
elif (hasattr(obj, 'name') and
59-
not isinstance(obj.name, int) and # py3
60-
obj.name != '<fdopen>'): # py2
58+
elif (hasattr(obj, 'name')
59+
and not isinstance(obj.name, int) # py3
60+
and obj.name != '<fdopen>'): # py2
6161
# on py2.7, pylint fails to understand this properly
6262
# pylint: disable=E1101
6363
self.filename = os.path.basename(obj.name)

‎telegram/passport/passportelementerrors.py‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -148,8 +148,8 @@ def __init__(self,
148148
super(PassportElementErrorFiles, self).__init__('files', type, message)
149149
self.file_hashes = file_hashes
150150

151-
self._id_attrs = ((self.source, self.type, self.message) +
152-
tuple([file_hash for file_hash in file_hashes]))
151+
self._id_attrs = ((self.source, self.type, self.message)
152+
+ tuple([file_hash for file_hash in file_hashes]))
153153

154154

155155
class PassportElementErrorFrontSide(PassportElementError):
@@ -323,8 +323,8 @@ def __init__(self,
323323
type, message)
324324
self.file_hashes = file_hashes
325325

326-
self._id_attrs = ((self.source, self.type, self.message) +
327-
tuple([file_hash for file_hash in file_hashes]))
326+
self._id_attrs = ((self.source, self.type, self.message)
327+
+ tuple([file_hash for file_hash in file_hashes]))
328328

329329

330330
class PassportElementErrorUnspecified(PassportElementError):

‎telegram/vendor/ptb_urllib3‎

‎tests/test_encryptedcredentials.py‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -43,12 +43,12 @@ def test_to_dict(self, encrypted_credentials):
4343
encrypted_credentials_dict = encrypted_credentials.to_dict()
4444

4545
assert isinstance(encrypted_credentials_dict, dict)
46-
assert (encrypted_credentials_dict['data'] ==
47-
encrypted_credentials.data)
48-
assert (encrypted_credentials_dict['hash'] ==
49-
encrypted_credentials.hash)
50-
assert (encrypted_credentials_dict['secret'] ==
51-
encrypted_credentials.secret)
46+
assert (encrypted_credentials_dict['data']
47+
== encrypted_credentials.data)
48+
assert (encrypted_credentials_dict['hash']
49+
== encrypted_credentials.hash)
50+
assert (encrypted_credentials_dict['secret']
51+
== encrypted_credentials.secret)
5252

5353
def test_equality(self):
5454
a = EncryptedCredentials(self.data, self.hash, self.secret)

‎tests/test_encryptedpassportelement.py‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -58,21 +58,21 @@ def test_to_dict(self, encrypted_passport_element):
5858
encrypted_passport_element_dict = encrypted_passport_element.to_dict()
5959

6060
assert isinstance(encrypted_passport_element_dict, dict)
61-
assert (encrypted_passport_element_dict['type'] ==
62-
encrypted_passport_element.type)
63-
assert (encrypted_passport_element_dict['data'] ==
64-
encrypted_passport_element.data)
65-
assert (encrypted_passport_element_dict['phone_number'] ==
66-
encrypted_passport_element.phone_number)
67-
assert (encrypted_passport_element_dict['email'] ==
68-
encrypted_passport_element.email)
61+
assert (encrypted_passport_element_dict['type']
62+
== encrypted_passport_element.type)
63+
assert (encrypted_passport_element_dict['data']
64+
== encrypted_passport_element.data)
65+
assert (encrypted_passport_element_dict['phone_number']
66+
== encrypted_passport_element.phone_number)
67+
assert (encrypted_passport_element_dict['email']
68+
== encrypted_passport_element.email)
6969
assert isinstance(encrypted_passport_element_dict['files'], list)
70-
assert (encrypted_passport_element_dict['front_side'] ==
71-
encrypted_passport_element.front_side.to_dict())
72-
assert (encrypted_passport_element_dict['reverse_side'] ==
73-
encrypted_passport_element.reverse_side.to_dict())
74-
assert (encrypted_passport_element_dict['selfie'] ==
75-
encrypted_passport_element.selfie.to_dict())
70+
assert (encrypted_passport_element_dict['front_side']
71+
== encrypted_passport_element.front_side.to_dict())
72+
assert (encrypted_passport_element_dict['reverse_side']
73+
== encrypted_passport_element.reverse_side.to_dict())
74+
assert (encrypted_passport_element_dict['selfie']
75+
== encrypted_passport_element.selfie.to_dict())
7676

7777
def test_equality(self):
7878
a = EncryptedPassportElement(self.type, data=self.data)

‎tests/test_inlinekeyboardbutton.py‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,8 @@ def test_expected_values(self, inline_keyboard_button):
4848
assert inline_keyboard_button.url == self.url
4949
assert inline_keyboard_button.callback_data == self.callback_data
5050
assert inline_keyboard_button.switch_inline_query == self.switch_inline_query
51-
assert (inline_keyboard_button.switch_inline_query_current_chat ==
52-
self.switch_inline_query_current_chat)
51+
assert (inline_keyboard_button.switch_inline_query_current_chat
52+
== self.switch_inline_query_current_chat)
5353
assert inline_keyboard_button.callback_game == self.callback_game
5454
assert inline_keyboard_button.pay == self.pay
5555

@@ -60,9 +60,9 @@ def test_to_dict(self, inline_keyboard_button):
6060
assert inline_keyboard_button_dict['text'] == inline_keyboard_button.text
6161
assert inline_keyboard_button_dict['url'] == inline_keyboard_button.url
6262
assert inline_keyboard_button_dict['callback_data'] == inline_keyboard_button.callback_data
63-
assert (inline_keyboard_button_dict['switch_inline_query'] ==
64-
inline_keyboard_button.switch_inline_query)
65-
assert (inline_keyboard_button_dict['switch_inline_query_current_chat'] ==
66-
inline_keyboard_button.switch_inline_query_current_chat)
63+
assert (inline_keyboard_button_dict['switch_inline_query']
64+
== inline_keyboard_button.switch_inline_query)
65+
assert (inline_keyboard_button_dict['switch_inline_query_current_chat']
66+
== inline_keyboard_button.switch_inline_query_current_chat)
6767
assert inline_keyboard_button_dict['callback_game'] == inline_keyboard_button.callback_game
6868
assert inline_keyboard_button_dict['pay'] == inline_keyboard_button.pay

‎tests/test_inlinequeryresultarticle.py‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,8 @@ def test_expected_values(self, inline_query_result_article):
5555
assert inline_query_result_article.type == self.type
5656
assert inline_query_result_article.id == self.id
5757
assert inline_query_result_article.title == self.title
58-
assert (inline_query_result_article.input_message_content.to_dict() ==
59-
self.input_message_content.to_dict())
58+
assert (inline_query_result_article.input_message_content.to_dict()
59+
== self.input_message_content.to_dict())
6060
assert inline_query_result_article.reply_markup.to_dict() == self.reply_markup.to_dict()
6161
assert inline_query_result_article.url == self.url
6262
assert inline_query_result_article.hide_url == self.hide_url
@@ -72,20 +72,20 @@ def test_to_dict(self, inline_query_result_article):
7272
assert inline_query_result_article_dict['type'] == inline_query_result_article.type
7373
assert inline_query_result_article_dict['id'] == inline_query_result_article.id
7474
assert inline_query_result_article_dict['title'] == inline_query_result_article.title
75-
assert (inline_query_result_article_dict['input_message_content'] ==
76-
inline_query_result_article.input_message_content.to_dict())
77-
assert (inline_query_result_article_dict['reply_markup'] ==
78-
inline_query_result_article.reply_markup.to_dict())
75+
assert (inline_query_result_article_dict['input_message_content']
76+
== inline_query_result_article.input_message_content.to_dict())
77+
assert (inline_query_result_article_dict['reply_markup']
78+
== inline_query_result_article.reply_markup.to_dict())
7979
assert inline_query_result_article_dict['url'] == inline_query_result_article.url
8080
assert inline_query_result_article_dict['hide_url'] == inline_query_result_article.hide_url
81-
assert (inline_query_result_article_dict['description'] ==
82-
inline_query_result_article.description)
83-
assert (inline_query_result_article_dict['thumb_url'] ==
84-
inline_query_result_article.thumb_url)
85-
assert (inline_query_result_article_dict['thumb_height'] ==
86-
inline_query_result_article.thumb_height)
87-
assert (inline_query_result_article_dict['thumb_width'] ==
88-
inline_query_result_article.thumb_width)
81+
assert (inline_query_result_article_dict['description']
82+
== inline_query_result_article.description)
83+
assert (inline_query_result_article_dict['thumb_url']
84+
== inline_query_result_article.thumb_url)
85+
assert (inline_query_result_article_dict['thumb_height']
86+
== inline_query_result_article.thumb_height)
87+
assert (inline_query_result_article_dict['thumb_width']
88+
== inline_query_result_article.thumb_width)
8989

9090
def test_equality(self):
9191
a = InlineQueryResultArticle(self.id, self.title, self.input_message_content)

‎tests/test_inlinequeryresultaudio.py‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,8 @@ def test_expected_values(self, inline_query_result_audio):
5858
assert inline_query_result_audio.audio_duration == self.audio_duration
5959
assert inline_query_result_audio.caption == self.caption
6060
assert inline_query_result_audio.parse_mode == self.parse_mode
61-
assert (inline_query_result_audio.input_message_content.to_dict() ==
62-
self.input_message_content.to_dict())
61+
assert (inline_query_result_audio.input_message_content.to_dict()
62+
== self.input_message_content.to_dict())
6363
assert inline_query_result_audio.reply_markup.to_dict() == self.reply_markup.to_dict()
6464

6565
def test_to_dict(self, inline_query_result_audio):
@@ -71,14 +71,14 @@ def test_to_dict(self, inline_query_result_audio):
7171
assert inline_query_result_audio_dict['audio_url'] == inline_query_result_audio.audio_url
7272
assert inline_query_result_audio_dict['title'] == inline_query_result_audio.title
7373
assert inline_query_result_audio_dict['performer'] == inline_query_result_audio.performer
74-
assert (inline_query_result_audio_dict['audio_duration'] ==
75-
inline_query_result_audio.audio_duration)
74+
assert (inline_query_result_audio_dict['audio_duration']
75+
== inline_query_result_audio.audio_duration)
7676
assert inline_query_result_audio_dict['caption'] == inline_query_result_audio.caption
7777
assert inline_query_result_audio_dict['parse_mode'] == inline_query_result_audio.parse_mode
78-
assert (inline_query_result_audio_dict['input_message_content'] ==
79-
inline_query_result_audio.input_message_content.to_dict())
80-
assert (inline_query_result_audio_dict['reply_markup'] ==
81-
inline_query_result_audio.reply_markup.to_dict())
78+
assert (inline_query_result_audio_dict['input_message_content']
79+
== inline_query_result_audio.input_message_content.to_dict())
80+
assert (inline_query_result_audio_dict['reply_markup']
81+
== inline_query_result_audio.reply_markup.to_dict())
8282

8383
def test_equality(self):
8484
a = InlineQueryResultAudio(self.id, self.audio_url, self.title)

0 commit comments

Comments
 (0)