mirror of
https://github.com/python-telegram-bot/python-telegram-bot.git
synced 2025-03-16 20:29:55 +01:00
Fix a bunch of flake8 W504 errors
This commit is contained in:
parent
7fcbfc19f5
commit
66e43c5932
15 changed files with 126 additions and 127 deletions
|
@ -145,19 +145,19 @@ class CommandHandler(Handler):
|
|||
:obj:`bool`
|
||||
|
||||
"""
|
||||
if (isinstance(update, Update) and
|
||||
(update.message or update.edited_message and self.allow_edited)):
|
||||
if (isinstance(update, Update)
|
||||
and (update.message or update.edited_message and self.allow_edited)):
|
||||
message = update.effective_message
|
||||
|
||||
if (message.entities and message.entities[0].type == MessageEntity.BOT_COMMAND and
|
||||
message.entities[0].offset == 0):
|
||||
if (message.entities and message.entities[0].type == MessageEntity.BOT_COMMAND
|
||||
and message.entities[0].offset == 0):
|
||||
command = message.text[1:message.entities[0].length]
|
||||
args = message.text.split()[1:]
|
||||
command = command.split('@')
|
||||
command.append(message.bot.username)
|
||||
|
||||
if not (command[0].lower() in self.command and
|
||||
command[1].lower() == message.bot.username.lower()):
|
||||
if not (command[0].lower() in self.command
|
||||
and command[1].lower() == message.bot.username.lower()):
|
||||
return None
|
||||
|
||||
if self.filters is None or self.filters(message):
|
||||
|
@ -308,8 +308,8 @@ class PrefixHandler(CommandHandler):
|
|||
:obj:`bool`
|
||||
|
||||
"""
|
||||
if (isinstance(update, Update) and
|
||||
(update.message or update.edited_message and self.allow_edited)):
|
||||
if (isinstance(update, Update)
|
||||
and (update.message or update.edited_message and self.allow_edited)):
|
||||
message = update.effective_message
|
||||
|
||||
text_list = message.text.split()
|
||||
|
|
|
@ -83,14 +83,14 @@ class TestCallbackQueryHandler(object):
|
|||
self.test_flag = groupdict == {'begin': 't', 'end': ' data'}
|
||||
|
||||
def callback_context(self, update, context):
|
||||
self.test_flag = (isinstance(context, CallbackContext) and
|
||||
isinstance(context.bot, Bot) and
|
||||
isinstance(update, Update) and
|
||||
isinstance(context.update_queue, Queue) and
|
||||
isinstance(context.job_queue, JobQueue) and
|
||||
isinstance(context.user_data, dict) and
|
||||
context.chat_data is None and
|
||||
isinstance(update.callback_query, CallbackQuery))
|
||||
self.test_flag = (isinstance(context, CallbackContext)
|
||||
and isinstance(context.bot, Bot)
|
||||
and isinstance(update, Update)
|
||||
and isinstance(context.update_queue, Queue)
|
||||
and isinstance(context.job_queue, JobQueue)
|
||||
and isinstance(context.user_data, dict)
|
||||
and context.chat_data is None
|
||||
and isinstance(update.callback_query, CallbackQuery))
|
||||
|
||||
def callback_context_pattern(self, update, context):
|
||||
if context.match.groups():
|
||||
|
|
|
@ -80,14 +80,14 @@ class TestChosenInlineResultHandler(object):
|
|||
self.test_flag = (job_queue is not None) and (update_queue is not None)
|
||||
|
||||
def callback_context(self, update, context):
|
||||
self.test_flag = (isinstance(context, CallbackContext) and
|
||||
isinstance(context.bot, Bot) and
|
||||
isinstance(update, Update) and
|
||||
isinstance(context.update_queue, Queue) and
|
||||
isinstance(context.job_queue, JobQueue) and
|
||||
isinstance(context.user_data, dict) and
|
||||
context.chat_data is None and
|
||||
isinstance(update.chosen_inline_result, ChosenInlineResult))
|
||||
self.test_flag = (isinstance(context, CallbackContext)
|
||||
and isinstance(context.bot, Bot)
|
||||
and isinstance(update, Update)
|
||||
and isinstance(context.update_queue, Queue)
|
||||
and isinstance(context.job_queue, JobQueue)
|
||||
and isinstance(context.user_data, dict)
|
||||
and context.chat_data is None
|
||||
and isinstance(update.chosen_inline_result, ChosenInlineResult))
|
||||
|
||||
def test_basic(self, dp, chosen_inline_result):
|
||||
handler = ChosenInlineResultHandler(self.callback_basic)
|
||||
|
|
|
@ -95,14 +95,14 @@ class TestCommandHandler(object):
|
|||
self.test_flag = args == ['one', 'two']
|
||||
|
||||
def callback_context(self, update, context):
|
||||
self.test_flag = (isinstance(context, CallbackContext) and
|
||||
isinstance(context.bot, Bot) and
|
||||
isinstance(update, Update) and
|
||||
isinstance(context.update_queue, Queue) and
|
||||
isinstance(context.job_queue, JobQueue) and
|
||||
isinstance(context.user_data, dict) and
|
||||
isinstance(context.chat_data, dict) and
|
||||
isinstance(update.message, Message))
|
||||
self.test_flag = (isinstance(context, CallbackContext)
|
||||
and isinstance(context.bot, Bot)
|
||||
and isinstance(update, Update)
|
||||
and isinstance(context.update_queue, Queue)
|
||||
and isinstance(context.job_queue, JobQueue)
|
||||
and isinstance(context.user_data, dict)
|
||||
and isinstance(context.chat_data, dict)
|
||||
and isinstance(update.message, Message))
|
||||
|
||||
def callback_context_args(self, update, context):
|
||||
self.test_flag = context.args == ['one', 'two']
|
||||
|
@ -378,14 +378,14 @@ class TestPrefixHandler(object):
|
|||
self.test_flag = args == ['one', 'two']
|
||||
|
||||
def callback_context(self, update, context):
|
||||
self.test_flag = (isinstance(context, CallbackContext) and
|
||||
isinstance(context.bot, Bot) and
|
||||
isinstance(update, Update) and
|
||||
isinstance(context.update_queue, Queue) and
|
||||
isinstance(context.job_queue, JobQueue) and
|
||||
isinstance(context.user_data, dict) and
|
||||
isinstance(context.chat_data, dict) and
|
||||
isinstance(update.message, Message))
|
||||
self.test_flag = (isinstance(context, CallbackContext)
|
||||
and isinstance(context.bot, Bot)
|
||||
and isinstance(update, Update)
|
||||
and isinstance(context.update_queue, Queue)
|
||||
and isinstance(context.job_queue, JobQueue)
|
||||
and isinstance(context.user_data, dict)
|
||||
and isinstance(context.chat_data, dict)
|
||||
and isinstance(update.message, Message))
|
||||
|
||||
def callback_context_args(self, update, context):
|
||||
self.test_flag = context.args == ['one', 'two']
|
||||
|
|
|
@ -73,11 +73,11 @@ class TestDispatcher(object):
|
|||
self.received = update.message
|
||||
|
||||
def callback_context(self, update, context):
|
||||
if (isinstance(context, CallbackContext) and
|
||||
isinstance(context.bot, Bot) and
|
||||
isinstance(context.update_queue, Queue) and
|
||||
isinstance(context.job_queue, JobQueue) and
|
||||
isinstance(context.error, TelegramError)):
|
||||
if (isinstance(context, CallbackContext)
|
||||
and isinstance(context.bot, Bot)
|
||||
and isinstance(context.update_queue, Queue)
|
||||
and isinstance(context.job_queue, JobQueue)
|
||||
and isinstance(context.error, TelegramError)):
|
||||
self.received = context.error.message
|
||||
|
||||
def test_error_handler(self, dp):
|
||||
|
|
|
@ -87,14 +87,14 @@ class TestCallbackQueryHandler(object):
|
|||
self.test_flag = groupdict == {'begin': 't', 'end': ' query'}
|
||||
|
||||
def callback_context(self, update, context):
|
||||
self.test_flag = (isinstance(context, CallbackContext) and
|
||||
isinstance(context.bot, Bot) and
|
||||
isinstance(update, Update) and
|
||||
isinstance(context.update_queue, Queue) and
|
||||
isinstance(context.job_queue, JobQueue) and
|
||||
isinstance(context.user_data, dict) and
|
||||
context.chat_data is None and
|
||||
isinstance(update.inline_query, InlineQuery))
|
||||
self.test_flag = (isinstance(context, CallbackContext)
|
||||
and isinstance(context.bot, Bot)
|
||||
and isinstance(update, Update)
|
||||
and isinstance(context.update_queue, Queue)
|
||||
and isinstance(context.job_queue, JobQueue)
|
||||
and isinstance(context.user_data, dict)
|
||||
and context.chat_data is None
|
||||
and isinstance(update.inline_query, InlineQuery))
|
||||
|
||||
def callback_context_pattern(self, update, context):
|
||||
if context.match.groups():
|
||||
|
|
|
@ -67,13 +67,13 @@ class TestJobQueue(object):
|
|||
self.job_time = time.time()
|
||||
|
||||
def job_context_based_callback(self, context):
|
||||
if (isinstance(context, CallbackContext) and
|
||||
isinstance(context.job, Job) and
|
||||
isinstance(context.update_queue, Queue) and
|
||||
context.job.context == 2 and
|
||||
context.chat_data is None and
|
||||
context.user_data is None and
|
||||
context.job_queue is context.job.job_queue):
|
||||
if (isinstance(context, CallbackContext)
|
||||
and isinstance(context.job, Job)
|
||||
and isinstance(context.update_queue, Queue)
|
||||
and context.job.context == 2
|
||||
and context.chat_data is None
|
||||
and context.user_data is None
|
||||
and context.job_queue is context.job.job_queue):
|
||||
self.result += 1
|
||||
|
||||
def test_run_once(self, job_queue):
|
||||
|
|
|
@ -74,23 +74,21 @@ class TestMessageHandler(object):
|
|||
self.test_flag = (job_queue is not None) and (update_queue is not None)
|
||||
|
||||
def callback_context(self, update, context):
|
||||
self.test_flag = (
|
||||
isinstance(context, CallbackContext) and
|
||||
isinstance(context.bot, Bot) and
|
||||
isinstance(update, Update) and
|
||||
isinstance(context.update_queue, Queue) and
|
||||
isinstance(context.job_queue, JobQueue) and
|
||||
isinstance(context.chat_data, dict) and
|
||||
(
|
||||
(isinstance(context.user_data, dict) and
|
||||
(isinstance(update.message, Message) or
|
||||
isinstance(update.edited_message, Message)))
|
||||
or
|
||||
(context.user_data is None and
|
||||
(isinstance(update.channel_post, Message) or
|
||||
isinstance(update.edited_channel_post, Message)))
|
||||
)
|
||||
)
|
||||
self.test_flag = (isinstance(context, CallbackContext)
|
||||
and isinstance(context.bot, Bot)
|
||||
and isinstance(update, Update)
|
||||
and isinstance(context.update_queue, Queue)
|
||||
and isinstance(context.job_queue, JobQueue)
|
||||
and isinstance(context.chat_data, dict)
|
||||
and ((isinstance(context.user_data, dict)
|
||||
and (isinstance(update.message, Message)
|
||||
or isinstance(update.edited_message, Message))
|
||||
)
|
||||
or (context.user_data is None
|
||||
and (isinstance(update.channel_post, Message)
|
||||
or isinstance(update.edited_channel_post, Message))
|
||||
))
|
||||
)
|
||||
|
||||
def test_basic(self, dp, message):
|
||||
handler = MessageHandler(None, self.callback_basic)
|
||||
|
|
|
@ -22,6 +22,7 @@ import pytest
|
|||
|
||||
from telegram import (PassportData, PassportFile, Bot, File, PassportElementErrorSelfie,
|
||||
PassportElementErrorDataField, Credentials, TelegramDecryptionError)
|
||||
|
||||
# Generated using the scope:
|
||||
# {
|
||||
# data: [
|
||||
|
@ -305,13 +306,13 @@ class TestPassport(object):
|
|||
|
||||
def test_mocked_set_passport_data_errors(self, monkeypatch, bot, chat_id, passport_data):
|
||||
def test(_, url, data, **kwargs):
|
||||
return (data['user_id'] == chat_id and
|
||||
data['errors'][0]['file_hash'] == (passport_data.decrypted_credentials
|
||||
.secure_data.driver_license
|
||||
.selfie.file_hash) and
|
||||
data['errors'][1]['data_hash'] == (passport_data.decrypted_credentials
|
||||
.secure_data.driver_license
|
||||
.data.data_hash))
|
||||
return (data['user_id'] == chat_id
|
||||
and data['errors'][0]['file_hash'] == (passport_data.decrypted_credentials
|
||||
.secure_data.driver_license
|
||||
.selfie.file_hash)
|
||||
and data['errors'][1]['data_hash'] == (passport_data.decrypted_credentials
|
||||
.secure_data.driver_license
|
||||
.data.data_hash))
|
||||
|
||||
monkeypatch.setattr('telegram.utils.request.Request.post', test)
|
||||
message = bot.set_passport_data_errors(chat_id, [
|
||||
|
|
|
@ -80,14 +80,14 @@ class TestPreCheckoutQueryHandler(object):
|
|||
self.test_flag = (job_queue is not None) and (update_queue is not None)
|
||||
|
||||
def callback_context(self, update, context):
|
||||
self.test_flag = (isinstance(context, CallbackContext) and
|
||||
isinstance(context.bot, Bot) and
|
||||
isinstance(update, Update) and
|
||||
isinstance(context.update_queue, Queue) and
|
||||
isinstance(context.job_queue, JobQueue) and
|
||||
isinstance(context.user_data, dict) and
|
||||
context.chat_data is None and
|
||||
isinstance(update.pre_checkout_query, PreCheckoutQuery))
|
||||
self.test_flag = (isinstance(context, CallbackContext)
|
||||
and isinstance(context.bot, Bot)
|
||||
and isinstance(update, Update)
|
||||
and isinstance(context.update_queue, Queue)
|
||||
and isinstance(context.job_queue, JobQueue)
|
||||
and isinstance(context.user_data, dict)
|
||||
and context.chat_data is None
|
||||
and isinstance(update.pre_checkout_query, PreCheckoutQuery))
|
||||
|
||||
def test_basic(self, dp, pre_checkout_query):
|
||||
handler = PreCheckoutQueryHandler(self.callback_basic)
|
||||
|
|
|
@ -80,14 +80,14 @@ class TestRegexHandler(object):
|
|||
self.test_flag = groupdict == {'begin': 't', 'end': ' message'}
|
||||
|
||||
def callback_context(self, update, context):
|
||||
self.test_flag = (isinstance(context, CallbackContext) and
|
||||
isinstance(context.bot, Bot) and
|
||||
isinstance(update, Update) and
|
||||
isinstance(context.update_queue, Queue) and
|
||||
isinstance(context.job_queue, JobQueue) and
|
||||
isinstance(context.user_data, dict) and
|
||||
isinstance(context.chat_data, dict) and
|
||||
isinstance(update.message, Message))
|
||||
self.test_flag = (isinstance(context, CallbackContext)
|
||||
and isinstance(context.bot, Bot)
|
||||
and isinstance(update, Update)
|
||||
and isinstance(context.update_queue, Queue)
|
||||
and isinstance(context.job_queue, JobQueue)
|
||||
and isinstance(context.user_data, dict)
|
||||
and isinstance(context.chat_data, dict)
|
||||
and isinstance(update.message, Message))
|
||||
|
||||
def callback_context_pattern(self, update, context):
|
||||
if context.match.groups():
|
||||
|
|
|
@ -81,14 +81,14 @@ class TestShippingQueryHandler(object):
|
|||
self.test_flag = (job_queue is not None) and (update_queue is not None)
|
||||
|
||||
def callback_context(self, update, context):
|
||||
self.test_flag = (isinstance(context, CallbackContext) and
|
||||
isinstance(context.bot, Bot) and
|
||||
isinstance(update, Update) and
|
||||
isinstance(context.update_queue, Queue) and
|
||||
isinstance(context.job_queue, JobQueue) and
|
||||
isinstance(context.user_data, dict) and
|
||||
context.chat_data is None and
|
||||
isinstance(update.shipping_query, ShippingQuery))
|
||||
self.test_flag = (isinstance(context, CallbackContext)
|
||||
and isinstance(context.bot, Bot)
|
||||
and isinstance(update, Update)
|
||||
and isinstance(context.update_queue, Queue)
|
||||
and isinstance(context.job_queue, JobQueue)
|
||||
and isinstance(context.user_data, dict)
|
||||
and context.chat_data is None
|
||||
and isinstance(update.shipping_query, ShippingQuery))
|
||||
|
||||
def test_basic(self, dp, shiping_query):
|
||||
handler = ShippingQueryHandler(self.callback_basic)
|
||||
|
|
|
@ -74,13 +74,13 @@ class TestStringCommandHandler(object):
|
|||
self.test_flag = args == ['one', 'two']
|
||||
|
||||
def callback_context(self, update, context):
|
||||
self.test_flag = (isinstance(context, CallbackContext) and
|
||||
isinstance(context.bot, Bot) and
|
||||
isinstance(update, str) and
|
||||
isinstance(context.update_queue, Queue) and
|
||||
isinstance(context.job_queue, JobQueue) and
|
||||
context.user_data is None and
|
||||
context.chat_data is None)
|
||||
self.test_flag = (isinstance(context, CallbackContext)
|
||||
and isinstance(context.bot, Bot)
|
||||
and isinstance(update, str)
|
||||
and isinstance(context.update_queue, Queue)
|
||||
and isinstance(context.job_queue, JobQueue)
|
||||
and context.user_data is None
|
||||
and context.chat_data is None)
|
||||
|
||||
def callback_context_args(self, update, context):
|
||||
self.test_flag = context.args == ['one', 'two']
|
||||
|
|
|
@ -74,11 +74,11 @@ class TestStringRegexHandler(object):
|
|||
self.test_flag = groupdict == {'begin': 't', 'end': ' message'}
|
||||
|
||||
def callback_context(self, update, context):
|
||||
self.test_flag = (isinstance(context, CallbackContext) and
|
||||
isinstance(context.bot, Bot) and
|
||||
isinstance(update, str) and
|
||||
isinstance(context.update_queue, Queue) and
|
||||
isinstance(context.job_queue, JobQueue))
|
||||
self.test_flag = (isinstance(context, CallbackContext)
|
||||
and isinstance(context.bot, Bot)
|
||||
and isinstance(update, str)
|
||||
and isinstance(context.update_queue, Queue)
|
||||
and isinstance(context.job_queue, JobQueue))
|
||||
|
||||
def callback_context_pattern(self, update, context):
|
||||
if context.match.groups():
|
||||
|
|
|
@ -44,13 +44,13 @@ class TestTypeHandler(object):
|
|||
self.test_flag = (job_queue is not None) and (update_queue is not None)
|
||||
|
||||
def callback_context(self, update, context):
|
||||
self.test_flag = (isinstance(context, CallbackContext) and
|
||||
isinstance(context.bot, Bot) and
|
||||
isinstance(update, dict) and
|
||||
isinstance(context.update_queue, Queue) and
|
||||
isinstance(context.job_queue, JobQueue) and
|
||||
context.user_data is None and
|
||||
context.chat_data is None)
|
||||
self.test_flag = (isinstance(context, CallbackContext)
|
||||
and isinstance(context.bot, Bot)
|
||||
and isinstance(update, dict)
|
||||
and isinstance(context.update_queue, Queue)
|
||||
and isinstance(context.job_queue, JobQueue)
|
||||
and context.user_data is None
|
||||
and context.chat_data is None)
|
||||
|
||||
def test_basic(self, dp):
|
||||
handler = TypeHandler(dict, self.callback_basic)
|
||||
|
|
Loading…
Add table
Reference in a new issue