[0-9]{2,8})", "https://github.com/zulip/zulip/pull/%(id)s")
return {
- "filter_id": filter_id
+ "filter_id": filter_id,
}
@openapi_param_value_generator(["/realm/emoji/{emoji_name}:post", "/user_uploads:post"])
diff --git a/zerver/openapi/markdown_extension.py b/zerver/openapi/markdown_extension.py
index 4c692ee344..1a6c5d946b 100644
--- a/zerver/openapi/markdown_extension.py
+++ b/zerver/openapi/markdown_extension.py
@@ -322,13 +322,13 @@ SUPPORTED_LANGUAGES: Dict[str, Any] = {
'render': render_python_code_example,
},
'curl': {
- 'render': render_curl_example
+ 'render': render_curl_example,
},
'javascript': {
'client_config': JS_CLIENT_CONFIG,
'admin_config': JS_CLIENT_ADMIN_CONFIG,
'render': render_javascript_code_example,
- }
+ },
}
class APIMarkdownExtension(Extension):
@@ -336,16 +336,16 @@ class APIMarkdownExtension(Extension):
self.config = {
'api_url': [
api_url,
- 'API URL to use when rendering curl examples'
- ]
+ 'API URL to use when rendering curl examples',
+ ],
}
def extendMarkdown(self, md: markdown.Markdown, md_globals: Dict[str, Any]) -> None:
md.preprocessors.add(
- 'generate_code_example', APICodeExamplesPreprocessor(md, self.getConfigs()), '_begin'
+ 'generate_code_example', APICodeExamplesPreprocessor(md, self.getConfigs()), '_begin',
)
md.preprocessors.add(
- 'generate_api_description', APIDescriptionPreprocessor(md, self.getConfigs()), '_begin'
+ 'generate_api_description', APIDescriptionPreprocessor(md, self.getConfigs()), '_begin',
)
class APICodeExamplesPreprocessor(Preprocessor):
diff --git a/zerver/openapi/openapi.py b/zerver/openapi/openapi.py
index 3a97440d88..c1c03152d8 100644
--- a/zerver/openapi/openapi.py
+++ b/zerver/openapi/openapi.py
@@ -13,14 +13,14 @@ OPENAPI_SPEC_PATH = os.path.abspath(os.path.join(
EXCLUDE_PROPERTIES = {
'/register': {
'post': {
- '200': ['max_message_id', 'realm_emoji']
- }
+ '200': ['max_message_id', 'realm_emoji'],
+ },
},
'/zulip-outgoing-webhook': {
'post': {
- '200': ['result', 'msg', 'message']
- }
- }
+ '200': ['result', 'msg', 'message'],
+ },
+ },
}
class OpenAPISpec():
@@ -221,7 +221,7 @@ def to_python_type(py_type: str) -> type:
'integer': int,
'boolean': bool,
'array': list,
- 'object': dict
+ 'object': dict,
}
return TYPES[py_type]
diff --git a/zerver/openapi/python_examples.py b/zerver/openapi/python_examples.py
index 5b0523dd1e..abcd4e864b 100644
--- a/zerver/openapi/python_examples.py
+++ b/zerver/openapi/python_examples.py
@@ -54,9 +54,9 @@ def add_subscriptions(client: Client) -> None:
streams=[
{
'name': 'new stream',
- 'description': 'New stream for testing'
- }
- ]
+ 'description': 'New stream for testing',
+ },
+ ],
)
# {code_example|end}
@@ -69,9 +69,9 @@ def add_subscriptions(client: Client) -> None:
user_id = 25
result = client.add_subscriptions(
streams=[
- {'name': 'new stream', 'description': 'New stream for testing'}
+ {'name': 'new stream', 'description': 'New stream for testing'},
],
- principals=[user_id]
+ principals=[user_id],
)
# {code_example|end}
assert result['result'] == 'success'
@@ -80,9 +80,9 @@ def add_subscriptions(client: Client) -> None:
def test_add_subscriptions_already_subscribed(client: Client) -> None:
result = client.add_subscriptions(
streams=[
- {'name': 'new stream', 'description': 'New stream for testing'}
+ {'name': 'new stream', 'description': 'New stream for testing'},
],
- principals=['newbie@zulip.com']
+ principals=['newbie@zulip.com'],
)
validate_against_openapi_schema(result, '/users/me/subscriptions', 'post',
@@ -91,7 +91,7 @@ def test_add_subscriptions_already_subscribed(client: Client) -> None:
def test_authorization_errors_fatal(client: Client, nonadmin_client: Client) -> None:
client.add_subscriptions(
streams=[
- {'name': 'private_stream'}
+ {'name': 'private_stream'},
],
)
@@ -99,12 +99,12 @@ def test_authorization_errors_fatal(client: Client, nonadmin_client: Client) ->
client.call_endpoint(
f'streams/{stream_id}',
method='PATCH',
- request={'is_private': True}
+ request={'is_private': True},
)
result = nonadmin_client.add_subscriptions(
streams=[
- {'name': 'private_stream'}
+ {'name': 'private_stream'},
],
authorization_errors_fatal=False,
)
@@ -114,7 +114,7 @@ def test_authorization_errors_fatal(client: Client, nonadmin_client: Client) ->
result = nonadmin_client.add_subscriptions(
streams=[
- {'name': 'private_stream'}
+ {'name': 'private_stream'},
],
authorization_errors_fatal=True,
)
@@ -137,7 +137,7 @@ def update_presence(client: Client) -> None:
request = {
'status': 'active',
'ping_only': False,
- 'new_user_input': False
+ 'new_user_input': False,
}
result = client.update_presence(request)
@@ -153,7 +153,7 @@ def create_user(client: Client) -> None:
'email': 'newbie@zulip.com',
'password': 'temp',
'full_name': 'New User',
- 'short_name': 'newbie'
+ 'short_name': 'newbie',
}
result = client.create_user(request)
# {code_example|end}
@@ -328,9 +328,9 @@ def delete_stream(client: Client, stream_id: int) -> None:
streams=[
{
'name': 'stream to be deleted',
- 'description': 'New stream for testing'
- }
- ]
+ 'description': 'New stream for testing',
+ },
+ ],
)
# {code_example|start}
@@ -431,7 +431,7 @@ def remove_subscriptions(client: Client) -> None:
# {code_example|start}
# Unsubscribe from the stream "new stream"
result = client.remove_subscriptions(
- ['new stream']
+ ['new stream'],
)
# {code_example|end}
@@ -448,7 +448,7 @@ def remove_subscriptions(client: Client) -> None:
# Unsubscribe another user from the stream "new stream"
result = client.remove_subscriptions(
['new stream'],
- principals=['newbie@zulip.com']
+ principals=['newbie@zulip.com'],
)
# {code_example|end}
@@ -462,12 +462,12 @@ def toggle_mute_topic(client: Client) -> None:
message = {
'type': 'stream',
'to': 'Denmark',
- 'topic': 'boat party'
+ 'topic': 'boat party',
}
client.call_endpoint(
url='messages',
method='POST',
- request=message
+ request=message,
)
# {code_example|start}
@@ -475,7 +475,7 @@ def toggle_mute_topic(client: Client) -> None:
request = {
'stream': 'Denmark',
'topic': 'boat party',
- 'op': 'add'
+ 'op': 'add',
}
result = client.mute_topic(request)
# {code_example|end}
@@ -489,7 +489,7 @@ def toggle_mute_topic(client: Client) -> None:
request = {
'stream': 'Denmark',
'topic': 'boat party',
- 'op': 'remove'
+ 'op': 'remove',
}
result = client.mute_topic(request)
@@ -541,11 +541,11 @@ def update_subscription_settings(client: Client) -> None:
request = [{
'stream_id': 1,
'property': 'pin_to_top',
- 'value': True
+ 'value': True,
}, {
'stream_id': 3,
'property': 'color',
- 'value': '#f00f00'
+ 'value': '#f00f00',
}]
result = client.update_subscription_settings(request)
# {code_example|end}
@@ -560,7 +560,7 @@ def render_message(client: Client) -> None:
# {code_example|start}
# Render a message
request = {
- 'content': '**foo**'
+ 'content': '**foo**',
}
result = client.render_message(request)
# {code_example|end}
@@ -609,7 +609,7 @@ def send_message(client: Client) -> int:
"type": "stream",
"to": "Denmark",
"topic": "Castle",
- "content": "I come not, friends, to steal away your hearts."
+ "content": "I come not, friends, to steal away your hearts.",
}
result = client.send_message(request)
# {code_example|end}
@@ -621,7 +621,7 @@ def send_message(client: Client) -> int:
url = 'messages/' + str(message_id)
result = client.call_endpoint(
url=url,
- method='GET'
+ method='GET',
)
assert result['result'] == 'success'
assert result['raw_content'] == request['content']
@@ -634,7 +634,7 @@ def send_message(client: Client) -> int:
request = {
"type": "private",
"to": [user_id],
- "content": "With mirth and laughter let old wrinkles come."
+ "content": "With mirth and laughter let old wrinkles come.",
}
result = client.send_message(request)
# {code_example|end}
@@ -646,7 +646,7 @@ def send_message(client: Client) -> int:
url = 'messages/' + str(message_id)
result = client.call_endpoint(
url=url,
- method='GET'
+ method='GET',
)
assert result['result'] == 'success'
assert result['raw_content'] == request['content']
@@ -684,7 +684,7 @@ def test_nonexistent_stream_error(client: Client) -> None:
"type": "stream",
"to": "nonexistent_stream",
"topic": "Castle",
- "content": "I come not, friends, to steal away your hearts."
+ "content": "I come not, friends, to steal away your hearts.",
}
result = client.send_message(request)
@@ -695,7 +695,7 @@ def test_private_message_invalid_recipient(client: Client) -> None:
request = {
"type": "private",
"to": "eeshan@zulip.com",
- "content": "With mirth and laughter let old wrinkles come."
+ "content": "With mirth and laughter let old wrinkles come.",
}
result = client.send_message(request)
@@ -713,7 +713,7 @@ def update_message(client: Client, message_id: int) -> None:
# message you wish to update)
request = {
"message_id": message_id,
- "content": "New content"
+ "content": "New content",
}
result = client.update_message(request)
# {code_example|end}
@@ -725,7 +725,7 @@ def update_message(client: Client, message_id: int) -> None:
url = 'messages/' + str(message_id)
result = client.call_endpoint(
url=url,
- method='GET'
+ method='GET',
)
assert result['result'] == 'success'
assert result['raw_content'] == request['content']
@@ -735,13 +735,13 @@ def test_update_message_edit_permission_error(client: Client, nonadmin_client: C
"type": "stream",
"to": "Denmark",
"topic": "Castle",
- "content": "I come not, friends, to steal away your hearts."
+ "content": "I come not, friends, to steal away your hearts.",
}
result = client.send_message(request)
request = {
"message_id": result["id"],
- "content": "New content"
+ "content": "New content",
}
result = nonadmin_client.update_message(request)
@@ -763,7 +763,7 @@ def test_delete_message_edit_permission_error(client: Client, nonadmin_client: C
"type": "stream",
"to": "Denmark",
"topic": "Castle",
- "content": "I come not, friends, to steal away your hearts."
+ "content": "I come not, friends, to steal away your hearts.",
}
result = client.send_message(request)
@@ -800,7 +800,7 @@ def update_message_flags(client: Client) -> None:
"type": "stream",
"to": "Denmark",
"topic": "Castle",
- "content": "I come not, friends, to steal away your hearts."
+ "content": "I come not, friends, to steal away your hearts.",
}
message_ids = []
for i in range(0, 3):
@@ -811,7 +811,7 @@ def update_message_flags(client: Client) -> None:
request = {
'messages': message_ids,
'op': 'add',
- 'flag': 'read'
+ 'flag': 'read',
}
result = client.update_message_flags(request)
# {code_example|end}
@@ -824,7 +824,7 @@ def update_message_flags(client: Client) -> None:
request = {
'messages': message_ids,
'op': 'remove',
- 'flag': 'starred'
+ 'flag': 'starred',
}
result = client.update_message_flags(request)
# {code_example|end}
@@ -838,7 +838,7 @@ def register_queue(client: Client) -> str:
# {code_example|start}
# Register the queue
result = client.register(
- event_types=['message', 'realm_emoji']
+ event_types=['message', 'realm_emoji'],
)
# {code_example|end}
@@ -894,14 +894,14 @@ def upload_file(client: Client) -> None:
result = client.call_endpoint(
'user_uploads',
method='POST',
- files=[fp]
+ files=[fp],
)
client.send_message({
"type": "stream",
"to": "Denmark",
"topic": "Castle",
- "content": "Check out [this picture]({}) of my castle!".format(result['uri'])
+ "content": "Check out [this picture]({}) of my castle!".format(result['uri']),
})
# {code_example|end}
@@ -960,7 +960,7 @@ def upload_custom_emoji(client: Client) -> None:
result = client.call_endpoint(
f'realm/emoji/{emoji_name}',
method='POST',
- files=[fp]
+ files=[fp],
)
# {code_example|end}
@@ -1036,7 +1036,7 @@ def update_user_group_members(client: Client, group_id: int) -> None:
request = {
'group_id': group_id,
'delete': [8, 10],
- 'add': [11]
+ 'add': [11],
}
result = client.update_user_group_members(request)
@@ -1096,7 +1096,7 @@ def assertLength(result: Dict[str, Any], fixture: Dict[str, Any]) -> None:
def assertIn(key: str, result: Dict[str, Any]) -> None:
if key not in result.keys():
raise AssertionError(
- f"The actual output does not contain the the key `{key}`."
+ f"The actual output does not contain the the key `{key}`.",
)
else:
assert key in result
diff --git a/zerver/templatetags/app_filters.py b/zerver/templatetags/app_filters.py
index 094c98c9ee..ad5437159c 100644
--- a/zerver/templatetags/app_filters.py
+++ b/zerver/templatetags/app_filters.py
@@ -101,10 +101,10 @@ def render_markdown_path(markdown_file_path: str,
markdown.extensions.admonition.makeExtension(),
markdown.extensions.codehilite.makeExtension(
linenums=False,
- guess_lang=False
+ guess_lang=False,
),
zerver.lib.bugdown.fenced_code.makeExtension(
- run_content_validators=context.get('run_content_validators', False)
+ run_content_validators=context.get('run_content_validators', False),
),
zerver.lib.bugdown.api_arguments_table_generator.makeExtension(
base_path='templates/zerver/api/'),
diff --git a/zerver/tests/test_alert_words.py b/zerver/tests/test_alert_words.py
index 3b19e4abae..1ca4d37534 100644
--- a/zerver/tests/test_alert_words.py
+++ b/zerver/tests/test_alert_words.py
@@ -31,7 +31,7 @@ class AlertWordTests(ZulipTestCase):
self.login(user_name)
params = {
- 'alert_words': ujson.dumps(['milk', 'cookies'])
+ 'alert_words': ujson.dumps(['milk', 'cookies']),
}
result = self.client_post('/json/users/me/alert_words', params)
self.assert_json_success(result)
diff --git a/zerver/tests/test_archive.py b/zerver/tests/test_archive.py
index 6336c14720..c42ecbe322 100644
--- a/zerver/tests/test_archive.py
+++ b/zerver/tests/test_archive.py
@@ -15,7 +15,7 @@ class GlobalPublicStreamTest(ZulipTestCase):
def test_non_web_public_stream(self) -> None:
test_stream = self.make_stream('Test Public Archives')
result = self.client_get(
- "/archive/streams/" + str(test_stream.id) + "/topics/notpublicglobalstream"
+ "/archive/streams/" + str(test_stream.id) + "/topics/notpublicglobalstream",
)
self.assert_in_success_response(["This stream does not exist."], result)
@@ -23,7 +23,7 @@ class GlobalPublicStreamTest(ZulipTestCase):
test_stream = self.make_stream('Test Public Archives')
do_change_stream_web_public(test_stream, True)
result = self.client_get(
- "/archive/streams/" + str(test_stream.id) + "/topics/nonexistenttopic"
+ "/archive/streams/" + str(test_stream.id) + "/topics/nonexistenttopic",
)
self.assert_in_success_response(["This topic does not exist."], result)
@@ -36,10 +36,10 @@ class GlobalPublicStreamTest(ZulipTestCase):
self.example_user("iago"),
"Test Public Archives",
msg,
- 'TopicGlobal'
+ 'TopicGlobal',
)
return self.client_get(
- "/archive/streams/" + str(test_stream.id) + "/topics/TopicGlobal"
+ "/archive/streams/" + str(test_stream.id) + "/topics/TopicGlobal",
)
result = send_msg_and_get_result('Test Message 1')
@@ -94,11 +94,11 @@ class WebPublicTopicHistoryTest(ZulipTestCase):
self.example_user("iago"),
"Test Public Archives",
'Test Message',
- 'TopicGlobal'
+ 'TopicGlobal',
)
result = self.client_get(
- "/archive/streams/" + str(test_stream.id) + "/topics"
+ "/archive/streams/" + str(test_stream.id) + "/topics",
)
self.assert_json_success(result)
history = result.json()['topics']
@@ -112,35 +112,35 @@ class WebPublicTopicHistoryTest(ZulipTestCase):
self.example_user("iago"),
"Test Public Archives",
'Test Message 3',
- topic_name='first_topic'
+ topic_name='first_topic',
)
self.send_stream_message(
self.example_user("iago"),
"Test Public Archives",
'Test Message',
- topic_name='TopicGlobal'
+ topic_name='TopicGlobal',
)
self.send_stream_message(
self.example_user("iago"),
"Test Public Archives",
'Test Message 2',
- topic_name='topicglobal'
+ topic_name='topicglobal',
)
self.send_stream_message(
self.example_user("iago"),
"Test Public Archives",
'Test Message 3',
- topic_name='second_topic'
+ topic_name='second_topic',
)
self.send_stream_message(
self.example_user("iago"),
"Test Public Archives",
'Test Message 4',
- topic_name='TopicGlobal'
+ topic_name='TopicGlobal',
)
result = self.client_get(
- "/archive/streams/" + str(test_stream.id) + "/topics"
+ "/archive/streams/" + str(test_stream.id) + "/topics",
)
self.assert_json_success(result)
history = result.json()['topics']
diff --git a/zerver/tests/test_auth_backends.py b/zerver/tests/test_auth_backends.py
index aeffd24eb7..992cbc27e7 100644
--- a/zerver/tests/test_auth_backends.py
+++ b/zerver/tests/test_auth_backends.py
@@ -385,7 +385,7 @@ class AuthBackendTest(ZulipTestCase):
user = self.example_user('hamlet')
token_data_dict = {
'access_token': 'foobar',
- 'token_type': 'bearer'
+ 'token_type': 'bearer',
}
github_email_data = [
dict(email=user.delivery_email,
@@ -416,7 +416,7 @@ class AuthBackendTest(ZulipTestCase):
},
],
'backend': GitHubAuthBackend,
- }
+ },
}
def patched_authenticate(**kwargs: Any) -> Any:
@@ -776,7 +776,7 @@ class SocialAuthBase(DesktopFlowTestingLib, ZulipTestCase):
expected_result_url_prefix = f'http://testserver/login/{self.backend.name}/'
if settings.SOCIAL_AUTH_SUBDOMAIN is not None:
expected_result_url_prefix = ('http://%s.testserver/login/%s/' %
- (settings.SOCIAL_AUTH_SUBDOMAIN, self.backend.name,))
+ (settings.SOCIAL_AUTH_SUBDOMAIN, self.backend.name))
if result.status_code != 302 or not result.url.startswith(expected_result_url_prefix):
return result
@@ -803,7 +803,7 @@ class SocialAuthBase(DesktopFlowTestingLib, ZulipTestCase):
requests_mock.GET,
self.USER_INFO_URL,
status=200,
- body=json.dumps(account_data_dict)
+ body=json.dumps(account_data_dict),
)
self.register_extra_endpoints(requests_mock, account_data_dict, **extra_data)
@@ -1298,7 +1298,7 @@ class SocialAuthBase(DesktopFlowTestingLib, ZulipTestCase):
AUTH_LDAP_USER_ATTR_MAP=ldap_user_attr_map,
AUTHENTICATION_BACKENDS=(backend_path,
'zproject.backends.ZulipLDAPUserPopulator',
- 'zproject.backends.ZulipDummyBackend')
+ 'zproject.backends.ZulipDummyBackend'),
):
result = self.social_auth_test(account_data_dict,
expect_choose_email_screen=True,
@@ -1340,7 +1340,7 @@ class SocialAuthBase(DesktopFlowTestingLib, ZulipTestCase):
AUTH_LDAP_USER_ATTR_MAP=ldap_user_attr_map,
AUTHENTICATION_BACKENDS=(backend_path,
'zproject.backends.ZulipLDAPAuthBackend',
- 'zproject.backends.ZulipDummyBackend')
+ 'zproject.backends.ZulipDummyBackend'),
):
account_data_dict = self.get_account_data_dict(email=email, name=name)
result = self.social_auth_test(account_data_dict,
@@ -1458,7 +1458,7 @@ class SAMLAuthBackendTest(SocialAuthBase):
unencoded_saml_response = self.fixture_data("samlresponse.txt", type="saml").format(
email=email,
first_name=first_name,
- last_name=last_name
+ last_name=last_name,
)
# SAMLResponse needs to be base64-encoded.
saml_response: str = base64.b64encode(unencoded_saml_response.encode()).decode()
@@ -1503,7 +1503,7 @@ class SAMLAuthBackendTest(SocialAuthBase):
self.assertTrue(saml_auth_enabled())
result = self.client_get("/saml/metadata.xml")
self.assert_in_success_response(
- [f'entityID="{settings.SOCIAL_AUTH_SAML_SP_ENTITY_ID}"'], result
+ [f'entityID="{settings.SOCIAL_AUTH_SAML_SP_ENTITY_ID}"'], result,
)
def test_social_auth_complete(self) -> None:
@@ -1513,7 +1513,7 @@ class SAMLAuthBackendTest(SocialAuthBase):
# This mock causes AuthFailed to be raised.
saml_response = self.generate_saml_response(self.email, self.name)
relay_state = ujson.dumps(dict(
- state_token=SAMLAuthBackend.put_data_in_redis({"subdomain": "zulip"})
+ state_token=SAMLAuthBackend.put_data_in_redis({"subdomain": "zulip"}),
))
post_params = {"SAMLResponse": saml_response, "RelayState": relay_state}
result = self.client_post('/complete/saml/', post_params)
@@ -1529,7 +1529,7 @@ class SAMLAuthBackendTest(SocialAuthBase):
self.assertLogs(self.logger_string, level='WARNING') as m:
saml_response = self.generate_saml_response(self.email, self.name)
relay_state = ujson.dumps(dict(
- state_token=SAMLAuthBackend.put_data_in_redis({"subdomain": "zulip"})
+ state_token=SAMLAuthBackend.put_data_in_redis({"subdomain": "zulip"}),
))
post_params = {"SAMLResponse": saml_response, "RelayState": relay_state}
result = self.client_post('/complete/saml/', post_params)
@@ -1551,7 +1551,7 @@ class SAMLAuthBackendTest(SocialAuthBase):
# doesn't cause errors either:
with self.assertLogs(self.logger_string, level='INFO') as m:
relay_state = ujson.dumps(dict(
- state_token=SAMLAuthBackend.put_data_in_redis({"subdomain": "zulip"})
+ state_token=SAMLAuthBackend.put_data_in_redis({"subdomain": "zulip"}),
))
post_params = {"RelayState": relay_state}
result = self.client_post('/complete/saml/', post_params)
@@ -1562,7 +1562,7 @@ class SAMLAuthBackendTest(SocialAuthBase):
# Now test bad SAMLResponses.
with self.assertLogs(self.logger_string, level='INFO') as m:
relay_state = ujson.dumps(dict(
- state_token=SAMLAuthBackend.put_data_in_redis({"subdomain": "zulip"})
+ state_token=SAMLAuthBackend.put_data_in_redis({"subdomain": "zulip"}),
))
post_params = {"RelayState": relay_state, 'SAMLResponse': ''}
result = self.client_post('/complete/saml/', post_params)
@@ -1572,7 +1572,7 @@ class SAMLAuthBackendTest(SocialAuthBase):
with self.assertLogs(self.logger_string, level='INFO') as m:
relay_state = ujson.dumps(dict(
- state_token=SAMLAuthBackend.put_data_in_redis({"subdomain": "zulip"})
+ state_token=SAMLAuthBackend.put_data_in_redis({"subdomain": "zulip"}),
))
post_params = {"RelayState": relay_state, 'SAMLResponse': 'b'}
result = self.client_post('/complete/saml/', post_params)
@@ -1582,7 +1582,7 @@ class SAMLAuthBackendTest(SocialAuthBase):
with self.assertLogs(self.logger_string, level='INFO') as m:
relay_state = ujson.dumps(dict(
- state_token=SAMLAuthBackend.put_data_in_redis({"subdomain": "zulip"})
+ state_token=SAMLAuthBackend.put_data_in_redis({"subdomain": "zulip"}),
))
post_params = {"RelayState": relay_state, 'SAMLResponse': 'dGVzdA=='} # base64 encoded 'test'
result = self.client_post('/complete/saml/', post_params)
@@ -1601,12 +1601,12 @@ class SAMLAuthBackendTest(SocialAuthBase):
self.assertEqual('/login/', result.url)
self.assertEqual(m.output, [self.logger_output(
"/complete/saml/: Can't figure out subdomain for this authentication request. relayed_params: {}".format("{}"),
- 'info'
+ 'info',
)])
def test_social_auth_complete_wrong_issuing_idp(self) -> None:
relay_state = ujson.dumps(dict(
- state_token=SAMLAuthBackend.put_data_in_redis({"subdomain": "zulip"})
+ state_token=SAMLAuthBackend.put_data_in_redis({"subdomain": "zulip"}),
))
saml_response = self.generate_saml_response(email=self.example_email("hamlet"),
name="King Hamlet")
@@ -1634,7 +1634,7 @@ class SAMLAuthBackendTest(SocialAuthBase):
with self.assertLogs(self.logger_string, level='INFO') as m, \
mock.patch.object(SAMLAuthBackend, 'get_issuing_idp', return_value='test_idp'):
relay_state = ujson.dumps(dict(
- state_token=SAMLAuthBackend.put_data_in_redis({"subdomain": "zulip"})
+ state_token=SAMLAuthBackend.put_data_in_redis({"subdomain": "zulip"}),
))
post_params = {"RelayState": relay_state, 'SAMLResponse': 'dGVzdA=='}
result = self.client_post('/complete/saml/', post_params)
@@ -1681,7 +1681,7 @@ class SAMLAuthBackendTest(SocialAuthBase):
idps_dict['test_idp2'] = copy.deepcopy(idps_dict['test_idp'])
idps_dict['test_idp2']['url'] = 'https://idp2.example.com/idp/profile/SAML2/Redirect/SSO'
idps_dict['test_idp2']['display_name'] = 'Second Test IdP'
- idps_dict['test_idp2']['limit_to_subdomains'] = ['zulip', ]
+ idps_dict['test_idp2']['limit_to_subdomains'] = ['zulip']
# Run tests with multiple idps configured:
with self.settings(SOCIAL_AUTH_SAML_ENABLED_IDPS=idps_dict):
@@ -1715,13 +1715,13 @@ class SAMLAuthBackendTest(SocialAuthBase):
def test_social_auth_saml_idp_limited_to_subdomains_success(self) -> None:
idps_dict = copy.deepcopy(settings.SOCIAL_AUTH_SAML_ENABLED_IDPS)
- idps_dict['test_idp']['limit_to_subdomains'] = ['zulip', ]
+ idps_dict['test_idp']['limit_to_subdomains'] = ['zulip']
with self.settings(SOCIAL_AUTH_SAML_ENABLED_IDPS=idps_dict):
self.test_social_auth_success()
def test_social_auth_saml_idp_limited_to_subdomains_attempt_wrong_realm(self) -> None:
idps_dict = copy.deepcopy(settings.SOCIAL_AUTH_SAML_ENABLED_IDPS)
- idps_dict['test_idp']['limit_to_subdomains'] = ['zulip', ]
+ idps_dict['test_idp']['limit_to_subdomains'] = ['zulip']
with self.settings(SOCIAL_AUTH_SAML_ENABLED_IDPS=idps_dict):
account_data_dict = self.get_account_data_dict(email=self.email, name=self.name)
with self.assertLogs(self.logger_string, level='INFO') as m:
@@ -1730,7 +1730,7 @@ class SAMLAuthBackendTest(SocialAuthBase):
self.assertEqual('/login/', result.url)
self.assertEqual(m.output, [self.logger_output(
'/complete/saml/: Authentication request with IdP %s but this provider is not enabled '
- 'for this subdomain %s.' % ("test_idp", "zephyr"), 'info'
+ 'for this subdomain %s.' % ("test_idp", "zephyr"), 'info',
)])
def test_social_auth_saml_login_bad_idp_arg(self) -> None:
@@ -1754,7 +1754,7 @@ class SAMLAuthBackendTest(SocialAuthBase):
idps_dict['test_idp2'] = copy.deepcopy(idps_dict['test_idp'])
idps_dict['test_idp2']['url'] = 'https://idp2.example.com/idp/profile/SAML2/Redirect/SSO'
idps_dict['test_idp2']['display_name'] = 'Second Test IdP'
- idps_dict['test_idp2']['limit_to_subdomains'] = ['zulip', ]
+ idps_dict['test_idp2']['limit_to_subdomains'] = ['zulip']
with self.settings(SOCIAL_AUTH_SAML_ENABLED_IDPS=idps_dict,
SAML_REQUIRE_LIMIT_TO_SUBDOMAINS=True):
@@ -1764,17 +1764,17 @@ class SAMLAuthBackendTest(SocialAuthBase):
# the non-compliant ones.
SAMLAuthBackend()
self.assertEqual(list(settings.SOCIAL_AUTH_SAML_ENABLED_IDPS.keys()),
- ['test_idp2', ])
+ ['test_idp2'])
self.assertEqual(m.output, [self.logger_output(
"SAML_REQUIRE_LIMIT_TO_SUBDOMAINS is enabled and the following "
"IdPs don't have limit_to_subdomains specified and will be ignored: "
- "['test_idp']", 'error'
+ "['test_idp']", 'error',
)])
def test_idp_initiated_signin_subdomain_specified(self) -> None:
post_params = {
"RelayState": '{"subdomain": "zulip"}',
- "SAMLResponse": self.generate_saml_response(email=self.email, name=self.name)
+ "SAMLResponse": self.generate_saml_response(email=self.email, name=self.name),
}
with mock.patch.object(OneLogin_Saml2_Response, 'is_valid', return_value=True):
@@ -1796,7 +1796,7 @@ class SAMLAuthBackendTest(SocialAuthBase):
def test_choose_subdomain_invalid_subdomain_specified(self) -> None:
post_params = {
"RelayState": '{"subdomain": "invalid"}',
- "SAMLResponse": self.generate_saml_response(email=self.email, name=self.name)
+ "SAMLResponse": self.generate_saml_response(email=self.email, name=self.name),
}
with mock.patch.object(OneLogin_Saml2_Response, 'is_valid', return_value=True):
@@ -1809,7 +1809,7 @@ class SAMLAuthBackendTest(SocialAuthBase):
def test_idp_initiated_signin_subdomain_implicit(self) -> None:
post_params = {
"RelayState": '',
- "SAMLResponse": self.generate_saml_response(email=self.email, name=self.name)
+ "SAMLResponse": self.generate_saml_response(email=self.email, name=self.name),
}
with mock.patch.object(OneLogin_Saml2_Response, 'is_valid', return_value=True):
@@ -1830,7 +1830,7 @@ class SAMLAuthBackendTest(SocialAuthBase):
def test_idp_initiated_signin_subdomain_implicit_no_relaystate_param(self) -> None:
post_params = {
- "SAMLResponse": self.generate_saml_response(email=self.email, name=self.name)
+ "SAMLResponse": self.generate_saml_response(email=self.email, name=self.name),
}
with mock.patch.object(OneLogin_Saml2_Response, 'is_valid', return_value=True):
@@ -1852,7 +1852,7 @@ class SAMLAuthBackendTest(SocialAuthBase):
def test_idp_initiated_signin_subdomain_implicit_invalid(self) -> None:
post_params = {
"RelayState": '',
- "SAMLResponse": self.generate_saml_response(email=self.email, name=self.name)
+ "SAMLResponse": self.generate_saml_response(email=self.email, name=self.name),
}
with self.assertLogs(self.logger_string, level='INFO') as m:
@@ -1865,7 +1865,7 @@ class SAMLAuthBackendTest(SocialAuthBase):
self.assertEqual('/login/', result.url)
self.assertEqual(m.output, [self.logger_output(
"/complete/saml/: Can't figure out subdomain for this authentication request. relayed_params: %s" % {},
- "info"
+ "info",
)])
class AppleAuthMixin:
@@ -1940,7 +1940,7 @@ class AppleIdAuthBackendTest(AppleAuthMixin, SocialAuthBase):
'access_token': 'foobar',
'expires_in': time.time() + 60*5,
'id_token': self.generate_id_token(account_data_dict),
- 'token_type': 'bearer'
+ 'token_type': 'bearer',
})
def test_apple_auth_enabled(self) -> None:
@@ -2096,14 +2096,14 @@ class GitHubAuthBackendTest(SocialAuthBase):
requests_mock.GET,
"https://api.github.com/user/emails",
status=200,
- body=json.dumps(email_data)
+ body=json.dumps(email_data),
)
requests_mock.add(
requests_mock.GET,
"https://api.github.com/teams/zulip-webapp/members/None",
status=200,
- body=json.dumps(email_data)
+ body=json.dumps(email_data),
)
self.email_data = email_data
@@ -2126,7 +2126,7 @@ class GitHubAuthBackendTest(SocialAuthBase):
self.assertEqual(result.url, "/login/")
self.assertEqual(m.output, [self.logger_output(
"Social auth ({}) failed because user has no verified emails".format('GitHub'),
- "warning"
+ "warning",
)])
@override_settings(SOCIAL_AUTH_GITHUB_TEAM_ID='zulip-webapp')
@@ -2140,7 +2140,7 @@ class GitHubAuthBackendTest(SocialAuthBase):
self.assertEqual(result.status_code, 302)
self.assertEqual(result.url, "/login/")
self.assertEqual(mock_info.output, [self.logger_output(
- "GitHub user is not member of required team", 'info'
+ "GitHub user is not member of required team", 'info',
)])
@override_settings(SOCIAL_AUTH_GITHUB_TEAM_ID='zulip-webapp')
@@ -2167,7 +2167,7 @@ class GitHubAuthBackendTest(SocialAuthBase):
self.assertEqual(result.status_code, 302)
self.assertEqual(result.url, "/login/")
self.assertEqual(mock_info.output, [self.logger_output(
- "GitHub user is not member of required organization", "info"
+ "GitHub user is not member of required organization", "info",
)])
@override_settings(SOCIAL_AUTH_GITHUB_ORG_NAME='Zulip')
@@ -2405,14 +2405,14 @@ class GitHubAuthBackendTest(SocialAuthBase):
self.assertEqual(m.output, [self.logger_output(
"Social auth (%s) failed because user has no verified"
" emails associated with the account" % ("GitHub",),
- "warning"
+ "warning",
)])
def test_github_oauth2_email_not_associated(self) -> None:
account_data_dict = dict(email='not-associated@zulip.com', name=self.name)
email_data = [
dict(email='nonprimary@zulip.com',
- verified=True,),
+ verified=True),
dict(email='hamlet@zulip.com',
verified=True,
primary=True),
@@ -2429,7 +2429,7 @@ class GitHubAuthBackendTest(SocialAuthBase):
self.assertEqual(m.output, [self.logger_output(
"Social auth (%s) failed because user has no verified"
" emails associated with the account" % ("GitHub",),
- "warning"
+ "warning",
)])
def test_github_unverified_email_with_existing_account(self) -> None:
@@ -2439,12 +2439,12 @@ class GitHubAuthBackendTest(SocialAuthBase):
account_data_dict = dict(email='hamlet@zulip.com', name=self.name)
email_data = [
dict(email='iago@zulip.com',
- verified=True,),
+ verified=True),
dict(email='hamlet@zulip.com',
verified=False),
dict(email="aaron@zulip.com",
verified=True,
- primary=True)
+ primary=True),
]
with self.assertLogs(self.logger_string, level='WARNING') as m:
result = self.social_auth_test(account_data_dict,
@@ -2455,7 +2455,7 @@ class GitHubAuthBackendTest(SocialAuthBase):
self.assertEqual(result.url, "/login/")
self.assertEqual(m.output, [self.logger_output(
"Social auth ({}) failed because user has no verified emails associated with the account".format("GitHub"),
- "warning"
+ "warning",
)])
class GitLabAuthBackendTest(SocialAuthBase):
@@ -2505,7 +2505,7 @@ class GoogleAuthBackendTest(SocialAuthBase):
self.assertEqual(result.url, "/login/")
self.assertEqual(m.output, [self.logger_output(
"Social auth ({}) failed because user has no verified emails".format("Google"),
- "warning"
+ "warning",
)])
def test_social_auth_mobile_success_legacy_url(self) -> None:
@@ -2919,7 +2919,7 @@ class ExternalMethodDictsTests(ZulipTestCase):
'zproject.backends.GoogleAuthBackend',
'zproject.backends.ZulipRemoteUserBackend',
'zproject.backends.SAMLAuthBackend',
- 'zproject.backends.AzureADAuthBackend')
+ 'zproject.backends.AzureADAuthBackend'),
):
external_auth_methods = get_external_method_dicts()
# First backends in the list should be SAML:
@@ -2929,8 +2929,8 @@ class ExternalMethodDictsTests(ZulipTestCase):
[social_backend.name for social_backend in sorted(
[ZulipRemoteUserBackend, GitHubAuthBackend, AzureADAuthBackend, GoogleAuthBackend],
key=lambda x: x.sort_order,
- reverse=True
- )]
+ reverse=True,
+ )],
)
def test_get_external_method_buttons(self) -> None:
@@ -2938,12 +2938,12 @@ class ExternalMethodDictsTests(ZulipTestCase):
AUTHENTICATION_BACKENDS=('zproject.backends.EmailAuthBackend',
'zproject.backends.GitHubAuthBackend',
'zproject.backends.GoogleAuthBackend',
- 'zproject.backends.SAMLAuthBackend')
+ 'zproject.backends.SAMLAuthBackend'),
):
saml_idp_names = self.get_configured_saml_backend_idp_names()
expected_button_id_strings = [
'id="{}_auth_button_github"',
- 'id="{}_auth_button_google"'
+ 'id="{}_auth_button_google"',
]
for name in saml_idp_names:
expected_button_id_strings.append(f'id="{{}}_auth_button_saml:{name}"')
@@ -2962,12 +2962,12 @@ class ExternalMethodDictsTests(ZulipTestCase):
idps_dict['test_idp2'] = copy.deepcopy(idps_dict['test_idp'])
idps_dict['test_idp2']['url'] = 'https://idp2.example.com/idp/profile/SAML2/Redirect/SSO'
idps_dict['test_idp2']['display_name'] = 'Second Test IdP'
- idps_dict['test_idp2']['limit_to_subdomains'] = ['zephyr', ]
+ idps_dict['test_idp2']['limit_to_subdomains'] = ['zephyr']
with self.settings(
SOCIAL_AUTH_SAML_ENABLED_IDPS=idps_dict,
AUTHENTICATION_BACKENDS=('zproject.backends.EmailAuthBackend',
'zproject.backends.GitHubAuthBackend',
- 'zproject.backends.SAMLAuthBackend')
+ 'zproject.backends.SAMLAuthBackend'),
):
# Calling get_external_method_dicts without a realm returns all methods configured on the server:
external_auth_methods = get_external_method_dicts()
@@ -3654,7 +3654,7 @@ class DjangoToLDAPUsernameTests(ZulipTestCase):
self.mock_ldap.directory['uid=some_user@organization_a.com,ou=users,dc=zulip,dc=com'] = {
"cn": ["Some User"],
"uid": ['some_user@organization_a.com'],
- "mail": ["some_user@contactaddress.com"]
+ "mail": ["some_user@contactaddress.com"],
}
self.assertEqual(self.backend.django_to_ldap_username("some_user@contactaddress.com"),
"some_user@organization_a.com")
@@ -3676,7 +3676,7 @@ class DjangoToLDAPUsernameTests(ZulipTestCase):
self.assertEqual(username, '"hamlet@test"@zulip.com')
@override_settings(AUTHENTICATION_BACKENDS=('zproject.backends.EmailAuthBackend',
- 'zproject.backends.ZulipLDAPAuthBackend',))
+ 'zproject.backends.ZulipLDAPAuthBackend'))
def test_authenticate_to_ldap_via_email(self) -> None:
"""
With AUTH_LDAP_REVERSE_EMAIL_SEARCH configured, django_to_ldap_username
@@ -3769,7 +3769,7 @@ class TestLDAP(ZulipLDAPTestCase):
ldap.SCOPE_ONELEVEL, "(uid=%(user)s)"),
AUTH_LDAP_REVERSE_EMAIL_SEARCH = LDAPSearch("ou=users,dc=zulip,dc=com",
ldap.SCOPE_ONELEVEL, "(email=%(email)s)"),
- LDAP_APPEND_DOMAIN='zulip.com'
+ LDAP_APPEND_DOMAIN='zulip.com',
):
user_profile = self.backend.authenticate(request=mock.MagicMock(),
username='ldapuser1', password='dapu',
@@ -3811,14 +3811,14 @@ class TestLDAP(ZulipLDAPTestCase):
self.assertEqual(user_profile, self.example_user("aaron"))
@override_settings(AUTHENTICATION_BACKENDS=('zproject.backends.EmailAuthBackend',
- 'zproject.backends.ZulipLDAPAuthBackend',))
+ 'zproject.backends.ZulipLDAPAuthBackend'))
def test_email_and_ldap_backends_together(self) -> None:
with self.settings(
LDAP_EMAIL_ATTR='mail',
AUTH_LDAP_REVERSE_EMAIL_SEARCH = LDAPSearch("ou=users,dc=zulip,dc=com",
ldap.SCOPE_ONELEVEL,
"(mail=%(email)s)"),
- AUTH_LDAP_USERNAME_ATTR = "uid"
+ AUTH_LDAP_USERNAME_ATTR = "uid",
):
realm = get_realm('zulip')
self.assertEqual(email_belongs_to_ldap(realm, self.example_email("aaron")), True)
@@ -4382,7 +4382,7 @@ class TestQueryLDAP(ZulipLDAPTestCase):
'short_name': 'sn',
'avatar': 'jpegPhoto',
'custom_profile_field__birthday': 'birthDate',
- 'custom_profile_field__phone_number': 'nonExistentAttr'
+ 'custom_profile_field__phone_number': 'nonExistentAttr',
}):
values = query_ldap(self.example_email('hamlet'))
self.assertEqual(len(values), 5)
@@ -4589,7 +4589,7 @@ class LDAPBackendTest(ZulipTestCase):
data = dict(
username=user.delivery_email,
- password=initial_password(user.delivery_email)
+ password=initial_password(user.delivery_email),
)
error_type = ZulipLDAPAuthBackend.REALM_IS_NONE_ERROR
error = ZulipLDAPConfigurationError('Realm is None', error_type)
diff --git a/zerver/tests/test_bots.py b/zerver/tests/test_bots.py
index 9c31e1cdec..a1e1069456 100644
--- a/zerver/tests/test_bots.py
+++ b/zerver/tests/test_bots.py
@@ -33,7 +33,7 @@ def _check_string(var_name: str, val: object) -> Optional[str]:
stripe_sample_config_options = [
WebhookIntegration('stripe', ['financial'], display_name='Stripe',
- config_options=[("Stripe API Key", "stripe_api_key", _check_string)])
+ config_options=[("Stripe API Key", "stripe_api_key", _check_string)]),
]
class BotTest(ZulipTestCase, UploadSerializeMixin):
@@ -134,7 +134,7 @@ class BotTest(ZulipTestCase, UploadSerializeMixin):
bot_info = dict(
full_name=full_name,
short_name=short_name,
- bot_type=1
+ bot_type=1,
)
result = self.client_post("/json/bots", bot_info)
self.assert_json_success(result)
@@ -184,7 +184,7 @@ class BotTest(ZulipTestCase, UploadSerializeMixin):
owner_id=hamlet.id,
),
),
- event['event']
+ event['event'],
)
users_result = self.client_get('/json/users')
@@ -314,9 +314,9 @@ class BotTest(ZulipTestCase, UploadSerializeMixin):
default_events_register_stream=None,
default_all_public_streams=False,
services=[],
- owner_id=user.id)
+ owner_id=user.id),
),
- event['event']
+ event['event'],
)
users_result = self.client_get('/json/users')
@@ -342,7 +342,7 @@ class BotTest(ZulipTestCase, UploadSerializeMixin):
# Normal user i.e. not a bot.
request_data = {
- 'principals': '["' + iago.email + '"]'
+ 'principals': '["' + iago.email + '"]',
}
events: List[Mapping[str, Any]] = []
with tornado_redirected_to_list(events):
@@ -359,7 +359,7 @@ class BotTest(ZulipTestCase, UploadSerializeMixin):
# A bot
bot_request_data = {
- 'principals': '["hambot-bot@zulip.testserver"]'
+ 'principals': '["hambot-bot@zulip.testserver"]',
}
events_bot: List[Mapping[str, Any]] = []
with tornado_redirected_to_list(events_bot):
@@ -417,9 +417,9 @@ class BotTest(ZulipTestCase, UploadSerializeMixin):
owner_id=user_profile.id,
),
),
- event['event']
+ event['event'],
)
- self.assertEqual(event['users'], {user_profile.id, })
+ self.assertEqual(event['users'], {user_profile.id})
def test_add_bot_with_default_sending_stream_private_denied(self) -> None:
self.login('hamlet')
@@ -492,9 +492,9 @@ class BotTest(ZulipTestCase, UploadSerializeMixin):
owner_id=user_profile.id,
),
),
- event['event']
+ event['event'],
)
- self.assertEqual(event['users'], {user_profile.id, })
+ self.assertEqual(event['users'], {user_profile.id})
def test_add_bot_with_default_events_register_stream_private_denied(self) -> None:
self.login('hamlet')
@@ -1333,7 +1333,7 @@ class BotTest(ZulipTestCase, UploadSerializeMixin):
self.assert_json_success(result)
bot_info = {
'full_name': 'Fred',
- 'method': 'PATCH'
+ 'method': 'PATCH',
}
email = 'hambot-bot@zulip.testserver'
# Important: We intentionally use the wrong method, post, here.
@@ -1524,7 +1524,7 @@ class BotTest(ZulipTestCase, UploadSerializeMixin):
'short_name': 'embeddedservicebot3',
'bot_type': UserProfile.EMBEDDED_BOT,
'service_name': 'giphy',
- 'config_data': ujson.dumps(incorrect_bot_config_info)
+ 'config_data': ujson.dumps(incorrect_bot_config_info),
}
bot_info.update(extras)
with patch('zulip_bots.bots.giphy.giphy.GiphyHandler.validate_config', side_effect=ConfigValidationError):
@@ -1548,7 +1548,7 @@ class BotTest(ZulipTestCase, UploadSerializeMixin):
"short_name": "my-stripe",
"bot_type": UserProfile.INCOMING_WEBHOOK_BOT,
"service_name": "stripe",
- "config_data": ujson.dumps({"stripe_api_key": "sample-api-key"})
+ "config_data": ujson.dumps({"stripe_api_key": "sample-api-key"}),
}
self.create_bot(**bot_metadata)
new_bot = UserProfile.objects.get(full_name="My Stripe Bot")
@@ -1564,7 +1564,7 @@ class BotTest(ZulipTestCase, UploadSerializeMixin):
"short_name": "my-stripe",
"bot_type": UserProfile.INCOMING_WEBHOOK_BOT,
"service_name": "stripe",
- "config_data": ujson.dumps({"stripe_api_key": "_invalid_key"})
+ "config_data": ujson.dumps({"stripe_api_key": "_invalid_key"}),
}
response = self.client_post("/json/bots", bot_metadata)
self.assertEqual(response.status_code, 400)
diff --git a/zerver/tests/test_bugdown.py b/zerver/tests/test_bugdown.py
index 1b6d68ae0f..f3e7efb2b9 100644
--- a/zerver/tests/test_bugdown.py
+++ b/zerver/tests/test_bugdown.py
@@ -62,7 +62,7 @@ class FencedBlockPreprocessorTest(TestCase):
'hi',
'bye',
'',
- ''
+ '',
]
expected = [
'',
@@ -70,7 +70,7 @@ class FencedBlockPreprocessorTest(TestCase):
'> bye',
'',
'',
- ''
+ '',
]
lines = processor.run(markdown)
self.assertEqual(lines, expected)
@@ -85,7 +85,7 @@ class FencedBlockPreprocessorTest(TestCase):
'~~~ quote',
'bye',
'',
- ''
+ '',
]
expected = [
'',
@@ -96,7 +96,7 @@ class FencedBlockPreprocessorTest(TestCase):
'> bye',
'',
'',
- ''
+ '',
]
lines = processor.run(markdown)
self.assertEqual(lines, expected)
@@ -124,7 +124,7 @@ class FencedBlockPreprocessorTest(TestCase):
'```',
'no-highlight()',
'```',
- ''
+ '',
]
expected = [
'',
@@ -142,7 +142,7 @@ class FencedBlockPreprocessorTest(TestCase):
'',
'**:no-highlight()**',
'',
- ''
+ '',
]
lines = processor.run(markdown)
self.assertEqual(lines, expected)
@@ -161,7 +161,7 @@ class FencedBlockPreprocessorTest(TestCase):
'hello()',
'```',
'',
- ''
+ '',
]
expected = [
'',
@@ -170,7 +170,7 @@ class FencedBlockPreprocessorTest(TestCase):
'> **py:hello()**',
'',
'',
- ''
+ '',
]
lines = processor.run(markdown)
self.assertEqual(lines, expected)
@@ -182,7 +182,7 @@ def bugdown_convert(content: str) -> str:
return bugdown.convert(
content=content,
message_realm=get_realm('zulip'),
- message=message
+ message=message,
)
class BugdownMiscTest(ZulipTestCase):
@@ -227,12 +227,12 @@ class BugdownMiscTest(ZulipTestCase):
self.assertEqual(by_id.get(fred2.id), dict(
email=fred2.email,
full_name='Fred Flintstone',
- id=fred2.id
+ id=fred2.id,
))
self.assertEqual(by_id.get(fred4.id), dict(
email=fred4.email,
full_name='Fred Flintstone',
- id=fred4.id
+ id=fred4.id,
))
def test_mention_data(self) -> None:
@@ -245,7 +245,7 @@ class BugdownMiscTest(ZulipTestCase):
self.assertEqual(mention_data.get_user_by_id(hamlet.id), dict(
email=hamlet.email,
full_name=hamlet.full_name,
- id=hamlet.id
+ id=hamlet.id,
))
user = mention_data.get_user_by_name('king hamLET')
@@ -1094,7 +1094,7 @@ class BugdownTest(ZulipTestCase):
rendered_content = render_markdown(msg, content)
self.assertEqual(
rendered_content,
- '/me makes a list
\n'
+ '/me makes a list
\n',
)
self.assertTrue(Message.is_status_message(content, rendered_content))
@@ -1102,7 +1102,7 @@ class BugdownTest(ZulipTestCase):
rendered_content = render_markdown(msg, content)
self.assertEqual(
rendered_content,
- '/me takes a walk
'
+ '/me takes a walk
',
)
self.assertTrue(Message.is_status_message(content, rendered_content))
@@ -1110,7 +1110,7 @@ class BugdownTest(ZulipTestCase):
rendered_content = render_markdown(msg, content)
self.assertEqual(
rendered_content,
- '/me writes a second line
\nline
'
+ '/me writes a second line
\nline
',
)
self.assertTrue(Message.is_status_message(content, rendered_content))
@@ -1139,7 +1139,7 @@ class BugdownTest(ZulipTestCase):
alert_words_for_users: Dict[str, List[str]] = {
'hamlet': ['how'], 'cordelia': ['this possible'],
'iago': ['hello'], 'prospero': ['hello'],
- 'othello': ['how are you'], 'aaron': ['hey']
+ 'othello': ['how are you'], 'aaron': ['hey'],
}
user_profiles: Dict[str, UserProfile] = {}
user_ids: Set[int] = set()
@@ -1163,7 +1163,7 @@ class BugdownTest(ZulipTestCase):
render(msg, content)
expected_user_ids: Set[int] = {
user_profiles['hamlet'].id, user_profiles['cordelia'].id, user_profiles['iago'].id,
- user_profiles['prospero'].id, user_profiles['othello'].id
+ user_profiles['prospero'].id, user_profiles['othello'].id,
}
# All users except aaron have their alert word appear in the message content
self.assertEqual(msg.user_ids_with_alert_words, expected_user_ids)
@@ -1173,7 +1173,7 @@ class BugdownTest(ZulipTestCase):
'hamlet': ['provisioning', 'Prod deployment'],
'cordelia': ['test', 'Prod'],
'iago': ['prod'], 'prospero': ['deployment'],
- 'othello': ['last']
+ 'othello': ['last'],
}
user_profiles: Dict[str, UserProfile] = {}
user_ids: Set[int] = set()
@@ -1204,7 +1204,7 @@ class BugdownTest(ZulipTestCase):
user_profiles['cordelia'].id,
user_profiles['iago'].id,
user_profiles['prospero'].id,
- user_profiles['othello'].id
+ user_profiles['othello'].id,
}
# All users have their alert word appear in the message content
self.assertEqual(msg.user_ids_with_alert_words, expected_user_ids)
@@ -1214,7 +1214,7 @@ class BugdownTest(ZulipTestCase):
'hamlet': ['réglementaire', 'une politique', 'une merveille'],
'cordelia': ['énormément', 'Prod'],
'iago': ['prod'], 'prospero': ['deployment'],
- 'othello': ['last']
+ 'othello': ['last'],
}
user_profiles: Dict[str, UserProfile] = {}
user_ids: Set[int] = set()
@@ -1246,7 +1246,7 @@ class BugdownTest(ZulipTestCase):
def test_alert_words_returns_empty_user_ids_with_alert_words(self) -> None:
alert_words_for_users: Dict[str, List[str]] = {
'hamlet': [], 'cordelia': [], 'iago': [], 'prospero': [],
- 'othello': [], 'aaron': []
+ 'othello': [], 'aaron': [],
}
user_profiles: Dict[str, UserProfile] = {}
user_ids: Set[int] = set()
@@ -1282,7 +1282,7 @@ class BugdownTest(ZulipTestCase):
'hamlet': [],
'cordelia': [],
'iago': [],
- 'othello': []
+ 'othello': [],
}
user_profiles: Dict[str, UserProfile] = {}
user_ids: Set[int] = set()
@@ -1312,7 +1312,7 @@ class BugdownTest(ZulipTestCase):
'hamlet': ['issue124'],
'cordelia': self.get_mock_alert_words(500, 10),
'iago': self.get_mock_alert_words(500, 10),
- 'othello': self.get_mock_alert_words(500, 10)
+ 'othello': self.get_mock_alert_words(500, 10),
}
user_profiles: Dict[str, UserProfile] = {}
user_ids: Set[int] = set()
@@ -1505,7 +1505,7 @@ class BugdownTest(ZulipTestCase):
assert_mentions(
'Hello @**King Hamlet** and @**Cordelia Lear**\n@**Foo van Barson|1234** @**all**',
- {'King Hamlet', 'Cordelia Lear', 'Foo van Barson|1234'}, True
+ {'King Hamlet', 'Cordelia Lear', 'Foo van Barson|1234'}, True,
)
def test_mention_multiple(self) -> None:
@@ -1700,12 +1700,12 @@ class BugdownTest(ZulipTestCase):
assert_mentions(
'@*support* Hello @**King Hamlet** and @**Cordelia Lear**\n'
- '@**Foo van Barson** @**all**', {'support'}
+ '@**Foo van Barson** @**all**', {'support'},
)
assert_mentions(
'Attention @*support*, @*frontend* and @*backend*\ngroups.',
- {'support', 'frontend', 'backend'}
+ {'support', 'frontend', 'backend'},
)
def test_user_group_mention_multiple(self) -> None:
@@ -1742,7 +1742,7 @@ class BugdownTest(ZulipTestCase):
def update_message_and_check_flag(content: str, mentioned: bool) -> None:
result = self.client_patch("/json/messages/" + str(msg_id), {
- 'message_id': msg_id, 'content': content
+ 'message_id': msg_id, 'content': content,
})
self.assert_json_success(result)
um = UserMessage.objects.get(
@@ -1777,7 +1777,7 @@ class BugdownTest(ZulipTestCase):
self.assertEqual(
render_markdown(msg, content),
'#{d.name}
'.format(
- d=denmark
+ d=denmark,
))
def test_stream_multiple(self) -> None:
@@ -1806,7 +1806,7 @@ class BugdownTest(ZulipTestCase):
self.assertEqual(
render_markdown(msg, content),
'#{s.name}
'.format(
- s=case_sens
+ s=case_sens,
))
def test_stream_case_sensitivity_nonmatching(self) -> None:
@@ -1830,7 +1830,7 @@ class BugdownTest(ZulipTestCase):
self.assertEqual(
render_markdown(msg, content),
'#{d.name} > some topic
'.format(
- d=denmark
+ d=denmark,
))
def test_topic_atomic_string(self) -> None:
@@ -1853,7 +1853,7 @@ class BugdownTest(ZulipTestCase):
self.assertEqual(
render_markdown(msg, content),
'#{d.name} > #1234
'.format(
- d=denmark
+ d=denmark,
))
def test_topic_multiple(self) -> None:
@@ -1881,7 +1881,7 @@ class BugdownTest(ZulipTestCase):
'''
self.assertEqual(
bugdown.possible_linked_stream_names(content),
- {'test here', 'Denmark', 'garçon', '천êµ'}
+ {'test here', 'Denmark', 'garçon', '천êµ'},
)
def test_stream_unicode(self) -> None:
@@ -1945,7 +1945,7 @@ class BugdownTest(ZulipTestCase):
''
'
'
''
- ''
+ '',
)
def test_mit_rendering(self) -> None:
@@ -2007,7 +2007,7 @@ class BugdownTest(ZulipTestCase):
self.assertEqual(
bugdown.convert(msg, message_realm=realm, message=message),
- 'http://example.com/#settings/
'
+ 'http://example.com/#settings/
',
)
def test_relative_link(self) -> None:
@@ -2018,7 +2018,7 @@ class BugdownTest(ZulipTestCase):
self.assertEqual(
bugdown.convert(msg, message_realm=realm, message=message),
- 'http://zulip.testserver/#narrow/stream/999-hello
'
+ 'http://zulip.testserver/#narrow/stream/999-hello
',
)
def test_relative_link_streams_page(self) -> None:
@@ -2029,7 +2029,7 @@ class BugdownTest(ZulipTestCase):
self.assertEqual(
bugdown.convert(msg, message_realm=realm, message=message),
- 'http://zulip.testserver/#streams/all
'
+ 'http://zulip.testserver/#streams/all
',
)
def test_md_relative_link(self) -> None:
@@ -2040,7 +2040,7 @@ class BugdownTest(ZulipTestCase):
self.assertEqual(
bugdown.convert(msg, message_realm=realm, message=message),
- 'hello
'
+ 'hello
',
)
class BugdownApiTests(ZulipTestCase):
@@ -2049,7 +2049,7 @@ class BugdownApiTests(ZulipTestCase):
result = self.api_post(
self.example_user("othello"),
'/api/v1/messages/render',
- dict(content=content)
+ dict(content=content),
)
self.assert_json_success(result)
self.assertEqual(result.json()['rendered'],
@@ -2061,7 +2061,7 @@ class BugdownApiTests(ZulipTestCase):
result = self.api_post(
self.example_user("othello"),
'/api/v1/messages/render',
- dict(content=content)
+ dict(content=content),
)
self.assert_json_success(result)
user_id = self.example_user('hamlet').id
@@ -2133,7 +2133,7 @@ class BugdownErrorTests(ZulipTestCase):
' -u BOT_EMAIL_ADDRESS:BOT_API_KEY',
' -d "queue_id=1375801870:2942"**',
'',
- ''
+ '',
]
result = processor.run(markdown)
diff --git a/zerver/tests/test_cache.py b/zerver/tests/test_cache.py
index 50a58fb843..d9c1a32482 100644
--- a/zerver/tests/test_cache.py
+++ b/zerver/tests/test_cache.py
@@ -273,7 +273,7 @@ class GenericBulkCachedFetchTest(ZulipTestCase):
result: Dict[str, UserProfile] = generic_bulk_cached_fetch(
cache_key_function=user_profile_by_email_cache_key,
query_function=query_function,
- object_ids=[self.example_email("hamlet")]
+ object_ids=[self.example_email("hamlet")],
)
self.assertEqual(result, {hamlet.delivery_email: hamlet})
@@ -283,7 +283,7 @@ class GenericBulkCachedFetchTest(ZulipTestCase):
generic_bulk_cached_fetch(
cache_key_function=user_profile_by_email_cache_key,
query_function=query_function,
- object_ids=[self.example_email("hamlet")]
+ object_ids=[self.example_email("hamlet")],
)
def test_empty_object_ids_list(self) -> None:
@@ -301,6 +301,6 @@ class GenericBulkCachedFetchTest(ZulipTestCase):
result: Dict[str, UserProfile] = generic_bulk_cached_fetch(
cache_key_function=cache_key_function,
query_function=query_function,
- object_ids=[]
+ object_ids=[],
)
self.assertEqual(result, {})
diff --git a/zerver/tests/test_create_video_call.py b/zerver/tests/test_create_video_call.py
index a3a0a9e162..f4c1bbb238 100644
--- a/zerver/tests/test_create_video_call.py
+++ b/zerver/tests/test_create_video_call.py
@@ -12,7 +12,7 @@ class TestVideoCall(ZulipTestCase):
with self.settings(VIDEO_ZOOM_CLIENT_ID=None):
response = self.client_get("/calls/zoom/register")
self.assert_json_error(
- response, "Zoom credentials have not been configured"
+ response, "Zoom credentials have not been configured",
)
def test_register_video_request(self) -> None:
@@ -47,10 +47,10 @@ class TestVideoCall(ZulipTestCase):
response = self.client_post("/json/calls/zoom/create")
self.assertEqual(
- responses.calls[-1].request.url, "https://api.zoom.us/v2/users/me/meetings"
+ responses.calls[-1].request.url, "https://api.zoom.us/v2/users/me/meetings",
)
self.assertEqual(
- responses.calls[-1].request.headers["Authorization"], "Bearer newtoken"
+ responses.calls[-1].request.headers["Authorization"], "Bearer newtoken",
)
json = self.assert_json_success(response)
self.assertEqual(json["url"], "example.com")
@@ -115,7 +115,7 @@ class TestVideoCall(ZulipTestCase):
)
responses.add(
- responses.POST, "https://api.zoom.us/v2/users/me/meetings", status=400
+ responses.POST, "https://api.zoom.us/v2/users/me/meetings", status=400,
)
response = self.client_get(
@@ -128,7 +128,7 @@ class TestVideoCall(ZulipTestCase):
self.assert_json_error(response, "Failed to create Zoom call")
responses.replace(
- responses.POST, "https://api.zoom.us/v2/users/me/meetings", status=401
+ responses.POST, "https://api.zoom.us/v2/users/me/meetings", status=401,
)
response = self.client_post("/json/calls/zoom/create")
diff --git a/zerver/tests/test_custom_profile_data.py b/zerver/tests/test_custom_profile_data.py
index f33760db4a..6f2cf7d6b8 100644
--- a/zerver/tests/test_custom_profile_data.py
+++ b/zerver/tests/test_custom_profile_data.py
@@ -128,7 +128,7 @@ class CreateCustomProfileFieldTest(CustomProfileFieldTestCase):
realm = get_realm("zulip")
field_type: int = CustomProfileField.EXTERNAL_ACCOUNT
field_data: str = ujson.dumps({
- 'subtype': 'twitter'
+ 'subtype': 'twitter',
})
invalid_field_name: str = "Not required field name"
invalid_field_hint: str = "Not required field hint"
@@ -163,7 +163,7 @@ class CreateCustomProfileFieldTest(CustomProfileFieldTestCase):
result = self.client_patch(
f"/json/realm/profile_fields/{field.id}",
info={'name': 'Twitter username',
- 'field_type': CustomProfileField.EXTERNAL_ACCOUNT}
+ 'field_type': CustomProfileField.EXTERNAL_ACCOUNT},
)
self.assert_json_error(result, 'Default custom field cannot be updated.')
@@ -186,26 +186,26 @@ class CreateCustomProfileFieldTest(CustomProfileFieldTestCase):
self.assert_json_error(result, "subtype key is missing from field_data")
data["field_data"] = ujson.dumps({
- 'subtype': ''
+ 'subtype': '',
})
result = self.client_post("/json/realm/profile_fields", info=data)
self.assert_json_error(result, 'field_data["subtype"] cannot be blank.')
data["field_data"] = ujson.dumps({
- 'subtype': '123'
+ 'subtype': '123',
})
result = self.client_post("/json/realm/profile_fields", info=data)
self.assert_json_error(result, 'Invalid external account type')
non_default_external_account = 'linkedin'
data["field_data"] = ujson.dumps({
- 'subtype': non_default_external_account
+ 'subtype': non_default_external_account,
})
result = self.client_post("/json/realm/profile_fields", info=data)
self.assert_json_error(result, 'Invalid external account type')
data["field_data"] = ujson.dumps({
- 'subtype': 'twitter'
+ 'subtype': 'twitter',
})
result = self.client_post("/json/realm/profile_fields", info=data)
self.assert_json_success(result)
@@ -217,7 +217,7 @@ class CreateCustomProfileFieldTest(CustomProfileFieldTestCase):
data['name'] = 'Reddit'
data["field_data"] = ujson.dumps({
- 'subtype': 'custom'
+ 'subtype': 'custom',
})
result = self.client_post("/json/realm/profile_fields", info=data)
self.assert_json_error(result, 'Custom external account must define url pattern')
@@ -303,7 +303,7 @@ class DeleteCustomProfileFieldTest(CustomProfileFieldTestCase):
invalid_field_id = 1234
result = self.client_delete("/json/users/me/profile_data", {
- 'data': ujson.dumps([invalid_field_id])
+ 'data': ujson.dumps([invalid_field_id]),
})
self.assert_json_error(result,
'Field id %d not found.' % (invalid_field_id,))
@@ -319,13 +319,13 @@ class DeleteCustomProfileFieldTest(CustomProfileFieldTestCase):
self.assertEqual([self.example_user("aaron").id], converter(iago_value.value))
result = self.client_delete("/json/users/me/profile_data", {
- 'data': ujson.dumps([field.id])
+ 'data': ujson.dumps([field.id]),
})
self.assert_json_success(result)
# Don't throw an exception here
result = self.client_delete("/json/users/me/profile_data", {
- 'data': ujson.dumps([field.id])
+ 'data': ujson.dumps([field.id]),
})
self.assert_json_success(result)
@@ -353,7 +353,7 @@ class UpdateCustomProfileFieldTest(CustomProfileFieldTestCase):
result = self.client_patch(
"/json/realm/profile_fields/100",
info={'name': 'Phone Number',
- 'field_type': CustomProfileField.SHORT_TEXT}
+ 'field_type': CustomProfileField.SHORT_TEXT},
)
self.assert_json_error(result, 'Field id 100 not found.')
@@ -361,7 +361,7 @@ class UpdateCustomProfileFieldTest(CustomProfileFieldTestCase):
result = self.client_patch(
f"/json/realm/profile_fields/{field.id}",
info={'name': '',
- 'field_type': CustomProfileField.SHORT_TEXT}
+ 'field_type': CustomProfileField.SHORT_TEXT},
)
self.assert_json_error(result, 'Label cannot be blank.')
@@ -464,7 +464,7 @@ class UpdateCustomProfileFieldTest(CustomProfileFieldTestCase):
self.login('iago')
data = [{'id': 1234, 'value': '12'}]
result = self.client_patch("/json/users/me/profile_data", {
- 'data': ujson.dumps(data)
+ 'data': ujson.dumps(data),
})
self.assert_json_error(result,
"Field id 1234 not found.")
@@ -504,7 +504,7 @@ class UpdateCustomProfileFieldTest(CustomProfileFieldTestCase):
('Birthday', '1909-3-5'),
('Favorite website', 'https://zulip.com'),
('Mentor', [self.example_user("cordelia").id]),
- ('GitHub', 'zulip-mobile')
+ ('GitHub', 'zulip-mobile'),
]
data = []
@@ -577,7 +577,7 @@ class UpdateCustomProfileFieldTest(CustomProfileFieldTestCase):
realm=realm,
name="Quote",
hint="Saying or phrase which you known for.",
- field_type=CustomProfileField.SHORT_TEXT
+ field_type=CustomProfileField.SHORT_TEXT,
)
iago = self.example_user("iago")
@@ -589,7 +589,7 @@ class UpdateCustomProfileFieldTest(CustomProfileFieldTestCase):
update_dict = {
"id": quote.id,
- "value": "***beware*** of jealousy..."
+ "value": "***beware*** of jealousy...",
}
do_update_user_custom_profile_data_if_changed(iago, [update_dict])
@@ -608,7 +608,7 @@ class UpdateCustomProfileFieldTest(CustomProfileFieldTestCase):
# Set field value:
field = CustomProfileField.objects.get(name="Mentor", realm=realm)
data: List[Dict[str, Union[int, str, List[int]]]] = [
- {'id': field.id, 'value': [self.example_user("aaron").id]}
+ {'id': field.id, 'value': [self.example_user("aaron").id]},
]
do_update_user_custom_profile_data_if_changed(iago, data)
diff --git a/zerver/tests/test_decorators.py b/zerver/tests/test_decorators.py
index 45cd481cc0..f20da1ea75 100644
--- a/zerver/tests/test_decorators.py
+++ b/zerver/tests/test_decorators.py
@@ -38,7 +38,7 @@ from zerver.decorator import (
get_client_name, internal_notify_view, is_local_addr,
rate_limit, validate_api_key,
return_success_on_head_request,
- zulip_login_required
+ zulip_login_required,
)
from zerver.lib.cache import ignore_unhashable_lru_cache, dict_to_items_tuple, items_tuple_to_dict
from zerver.lib.validator import (
@@ -46,7 +46,7 @@ from zerver.lib.validator import (
check_variable_type, equals, check_none_or, check_url, check_short_string,
check_string_fixed_length, check_capped_string, check_color, to_non_negative_int,
check_string_or_int_list, check_string_or_int, check_int_in, check_string_in,
- to_positive_or_allowed_int
+ to_positive_or_allowed_int,
)
from zerver.models import \
get_realm, get_user, UserProfile, Realm
@@ -847,27 +847,27 @@ class ValidatorTestCase(TestCase):
self.assertEqual(error, 'names key is missing from x')
x = {
- 'names': ['alice', 'bob', {}]
+ 'names': ['alice', 'bob', {}],
}
error = check_dict(keys)('x', x)
self.assertEqual(error, 'x["names"][2] is not a string')
x = {
'names': ['alice', 'bob'],
- 'city': 5
+ 'city': 5,
}
error = check_dict(keys)('x', x)
self.assertEqual(error, 'x["city"] is not a string')
x = {
'names': ['alice', 'bob'],
- 'city': 'Boston'
+ 'city': 'Boston',
}
error = check_dict(value_validator=check_string)('x', x)
self.assertEqual(error, 'x contains a value that is not a string')
x = {
- 'city': 'Boston'
+ 'city': 'Boston',
}
error = check_dict(value_validator=check_string)('x', x)
self.assertEqual(error, None)
@@ -891,13 +891,13 @@ class ValidatorTestCase(TestCase):
# Test optional keys
optional_keys = [
('food', check_list(check_string)),
- ('year', check_int)
+ ('year', check_int),
]
x = {
'names': ['alice', 'bob'],
'city': 'Boston',
- 'food': ['Lobster Spaghetti']
+ 'food': ['Lobster Spaghetti'],
}
error = check_dict(keys)('x', x)
@@ -912,7 +912,7 @@ class ValidatorTestCase(TestCase):
x = {
'names': ['alice', 'bob'],
'city': 'Boston',
- 'food': 'Lobster Spaghetti'
+ 'food': 'Lobster Spaghetti',
}
error = check_dict_only(keys, optional_keys)('x', x)
self.assertEqual(error, 'x["food"] is not a list')
@@ -1432,7 +1432,7 @@ class TestHumanUsersOnlyDecorator(ZulipTestCase):
"/api/v1/settings",
"/api/v1/settings/display",
"/api/v1/settings/notifications",
- "/api/v1/users/me/profile_data"
+ "/api/v1/users/me/profile_data",
]
for endpoint in patch_endpoints:
result = self.api_patch(default_bot, endpoint)
diff --git a/zerver/tests/test_docs.py b/zerver/tests/test_docs.py
index e664a75f97..ee86e4041f 100644
--- a/zerver/tests/test_docs.py
+++ b/zerver/tests/test_docs.py
@@ -176,7 +176,7 @@ class DocPageTest(ZulipTestCase):
'And hundreds more through',
'Hubot',
'Zapier',
- 'IFTTT'
+ 'IFTTT',
])
for integration in INTEGRATIONS.keys():
diff --git a/zerver/tests/test_email_change.py b/zerver/tests/test_email_change.py
index 1e64c43742..6b8685774c 100644
--- a/zerver/tests/test_email_change.py
+++ b/zerver/tests/test_email_change.py
@@ -96,7 +96,7 @@ class EmailChangeTestCase(ZulipTestCase):
email_message = mail.outbox[0]
self.assertEqual(
email_message.subject,
- 'Verify your new email address'
+ 'Verify your new email address',
)
body = email_message.body
from_email = email_message.from_email
@@ -157,7 +157,7 @@ class EmailChangeTestCase(ZulipTestCase):
email_message = mail.outbox[0]
self.assertEqual(
email_message.subject,
- 'Verify your new email address'
+ 'Verify your new email address',
)
body = email_message.body
self.assertIn('We received a request to change the email', body)
diff --git a/zerver/tests/test_email_mirror.py b/zerver/tests/test_email_mirror.py
index d4b8023f8d..c4205ff9bb 100644
--- a/zerver/tests/test_email_mirror.py
+++ b/zerver/tests/test_email_mirror.py
@@ -77,7 +77,7 @@ class TestEncodeDecode(ZulipTestCase):
# The default form of the email address (with an option - "include-footer"):
token, options = decode_email_address(
- f"dev-help.{stream.email_token}.include-footer@testserver"
+ f"dev-help.{stream.email_token}.include-footer@testserver",
)
self._assert_options(options, include_footer=True)
self.assertEqual(token, stream.email_token)
@@ -85,7 +85,7 @@ class TestEncodeDecode(ZulipTestCase):
# Using + instead of . as the separator is also supported for backwards compatibility,
# since that was the original form of addresses that we used:
token, options = decode_email_address(
- f"dev-help+{stream.email_token}+include-footer@testserver"
+ f"dev-help+{stream.email_token}+include-footer@testserver",
)
self._assert_options(options, include_footer=True)
self.assertEqual(token, stream.email_token)
@@ -1108,7 +1108,7 @@ class TestScriptMTA(ZulipTestCase):
except subprocess.CalledProcessError as e:
self.assertEqual(
e.output,
- b'5.1.1 Bad destination mailbox address: No missed message email address.\n'
+ b'5.1.1 Bad destination mailbox address: No missed message email address.\n',
)
self.assertEqual(e.returncode, 67)
success_call = False
@@ -1127,7 +1127,7 @@ class TestEmailMirrorTornadoView(ZulipTestCase):
"type": "private",
"content": "test_receive_missed_message_email_messages",
"client": "test suite",
- "to": ujson.dumps([cordelia.id, iago.id])
+ "to": ujson.dumps([cordelia.id, iago.id]),
})
self.assert_json_success(result)
@@ -1154,11 +1154,11 @@ class TestEmailMirrorTornadoView(ZulipTestCase):
mock_queue_json_publish.side_effect = check_queue_json_publish
request_data = {
"recipient": to_address,
- "msg_text": mail
+ "msg_text": mail,
}
post_data = dict(
data=ujson.dumps(request_data),
- secret=settings.SHARED_SECRET
+ secret=settings.SHARED_SECRET,
)
return self.client_post('/email_mirror_message', post_data)
@@ -1364,7 +1364,7 @@ class TestEmailMirrorLogAndReport(ZulipTestCase):
"type": "private",
"content": "test_redact_email_message",
"client": "test suite",
- "to": ujson.dumps([cordelia.email, iago.email])
+ "to": ujson.dumps([cordelia.email, iago.email]),
})
self.assert_json_success(result)
diff --git a/zerver/tests/test_email_notifications.py b/zerver/tests/test_email_notifications.py
index 281fad1835..b8720dd380 100644
--- a/zerver/tests/test_email_notifications.py
+++ b/zerver/tests/test_email_notifications.py
@@ -20,7 +20,7 @@ from zerver.models import (
get_realm,
get_stream,
UserProfile,
- ScheduledEmail
+ ScheduledEmail,
)
class TestCustomEmails(ZulipTestCase):
@@ -34,7 +34,7 @@ class TestCustomEmails(ZulipTestCase):
"markdown_template_path": markdown_template_path,
"reply_to": reply_to,
"subject": email_subject,
- "from_name": from_name
+ "from_name": from_name,
})
self.assertEqual(len(mail.outbox), 1)
msg = mail.outbox[0]
@@ -64,12 +64,12 @@ class TestCustomEmails(ZulipTestCase):
from zerver.lib.send_email import NoEmailArgumentException
self.assertRaises(NoEmailArgumentException, send_custom_email, [hamlet], {
"markdown_template_path": markdown_template_path,
- "from_name": from_name
+ "from_name": from_name,
})
self.assertRaises(NoEmailArgumentException, send_custom_email, [hamlet], {
"markdown_template_path": markdown_template_path,
- "subject": email_subject
+ "subject": email_subject,
})
def test_send_custom_email_doubled_arguments(self) -> None:
@@ -98,7 +98,7 @@ class TestCustomEmails(ZulipTestCase):
markdown_template_path = "zerver/tests/fixtures/email/custom_emails/email_base_headers_test.source.html"
send_custom_email([admin_user, non_admin_user], {
"markdown_template_path": markdown_template_path,
- "admins_only": True
+ "admins_only": True,
})
self.assertEqual(len(mail.outbox), 1)
self.assertIn(admin_user.delivery_email, mail.outbox[0].to[0])
@@ -279,7 +279,7 @@ class TestMissedMessages(ZulipTestCase):
if show_message_content:
verify_body_include = [
"Othello, the Moor of Venice: 1 2 3 4 5 6 7 8 9 10 @**King Hamlet** -- ",
- "You are receiving this because you were mentioned in Zulip Dev."
+ "You are receiving this because you were mentioned in Zulip Dev.",
]
email_subject = '#Denmark > test'
verify_body_does_not_include: List[str] = []
@@ -289,7 +289,7 @@ class TestMissedMessages(ZulipTestCase):
"This email does not include message content because you have disabled message ",
"http://zulip.testserver/help/pm-mention-alert-notifications ",
"View or reply in Zulip",
- " Manage email preferences: http://zulip.testserver/#settings/notifications"
+ " Manage email preferences: http://zulip.testserver/#settings/notifications",
]
email_subject = 'New missed messages'
@@ -315,7 +315,7 @@ class TestMissedMessages(ZulipTestCase):
if show_message_content:
verify_body_include = [
"Othello, the Moor of Venice: 1 2 3 4 5 @**all** -- ",
- "You are receiving this because you were mentioned in Zulip Dev."
+ "You are receiving this because you were mentioned in Zulip Dev.",
]
email_subject = '#Denmark > test'
verify_body_does_not_include: List[str] = []
@@ -325,7 +325,7 @@ class TestMissedMessages(ZulipTestCase):
"This email does not include message content because you have disabled message ",
"http://zulip.testserver/help/pm-mention-alert-notifications ",
"View or reply in Zulip",
- " Manage email preferences: http://zulip.testserver/#settings/notifications"
+ " Manage email preferences: http://zulip.testserver/#settings/notifications",
]
email_subject = 'New missed messages'
verify_body_does_not_include = ['Denmark > test', 'Othello, the Moor of Venice',
@@ -347,7 +347,7 @@ class TestMissedMessages(ZulipTestCase):
'12')
verify_body_include = [
"Othello, the Moor of Venice: 1 2 3 4 5 6 7 8 9 10 12 -- ",
- "You are receiving this because you have email notifications enabled for this stream."
+ "You are receiving this because you have email notifications enabled for this stream.",
]
email_subject = '#Denmark > test'
self._test_cases(msg_id, verify_body_include, email_subject, send_as_user, trigger='stream_email_notify')
@@ -360,7 +360,7 @@ class TestMissedMessages(ZulipTestCase):
'@**King Hamlet**')
verify_body_include = [
"Cordelia Lear: 0 1 2 Othello, the Moor of Venice: @**King Hamlet** -- ",
- "You are receiving this because you were mentioned in Zulip Dev."
+ "You are receiving this because you were mentioned in Zulip Dev.",
]
email_subject = '#Denmark > test'
self._test_cases(msg_id, verify_body_include, email_subject, send_as_user, trigger='mentioned')
@@ -385,14 +385,14 @@ class TestMissedMessages(ZulipTestCase):
"This email does not include message content because your organization has disabled",
"http://zulip.testserver/help/hide-message-content-in-emails",
"View or reply in Zulip",
- " Manage email preferences: http://zulip.testserver/#settings/notifications"
+ " Manage email preferences: http://zulip.testserver/#settings/notifications",
]
elif message_content_disabled_by_user:
verify_body_include = [
"This email does not include message content because you have disabled message ",
"http://zulip.testserver/help/pm-mention-alert-notifications ",
"View or reply in Zulip",
- " Manage email preferences: http://zulip.testserver/#settings/notifications"
+ " Manage email preferences: http://zulip.testserver/#settings/notifications",
]
email_subject = 'New missed messages'
verify_body_does_not_include = ['Othello, the Moor of Venice', 'Extremely personal message!',
@@ -441,7 +441,7 @@ class TestMissedMessages(ZulipTestCase):
"This email does not include message content because you have disabled message ",
"http://zulip.testserver/help/pm-mention-alert-notifications ",
"View or reply in Zulip",
- " Manage email preferences: http://zulip.testserver/#settings/notifications"
+ " Manage email preferences: http://zulip.testserver/#settings/notifications",
]
email_subject = 'New missed messages'
verify_body_does_not_include = ['Iago', 'Othello, the Moor of Venice Othello, the Moor of Venice',
diff --git a/zerver/tests/test_embedded_bot_system.py b/zerver/tests/test_embedded_bot_system.py
index 10641f1bcb..f70fdb5f8d 100644
--- a/zerver/tests/test_embedded_bot_system.py
+++ b/zerver/tests/test_embedded_bot_system.py
@@ -4,7 +4,7 @@ from zerver.lib.bot_lib import EmbeddedBotQuitException
from zerver.lib.test_classes import ZulipTestCase
from zerver.models import (
UserProfile, get_display_recipient,
- get_service_profile, get_user, get_realm
+ get_service_profile, get_user, get_realm,
)
import ujson
diff --git a/zerver/tests/test_events.py b/zerver/tests/test_events.py
index d37eecfb16..85f36b5a9c 100644
--- a/zerver/tests/test_events.py
+++ b/zerver/tests/test_events.py
@@ -16,7 +16,7 @@ from zerver.models import (
Message, RealmDomain, Recipient, UserMessage, UserPresence, UserProfile,
Realm, Subscription, Stream, flush_per_request_caches, UserGroup, Service,
Attachment, PreregistrationUser, get_user_by_delivery_email, MultiuseInvite,
- RealmAuditLog
+ RealmAuditLog,
)
from zerver.lib.actions import (
@@ -134,7 +134,7 @@ from zerver.lib.topic_mutes import (
)
from zerver.lib.validator import (
check_bool, check_dict, check_dict_only, check_float, check_int, check_list, check_string,
- equals, check_none_or, Validator, check_url, check_int_in
+ equals, check_none_or, Validator, check_url, check_int_in,
)
from zerver.lib.users import get_api_key
@@ -210,7 +210,7 @@ class EventsEndpointTest(ZulipTestCase):
'id': 6,
'type': 'pointer',
'pointer': 15,
- }
+ },
]
with stub_event_queue_user_events(return_event_queue, return_user_events):
result = self.api_post(user, '/json/register', dict(event_types=ujson.dumps(['pointer'])))
@@ -262,7 +262,7 @@ class EventsEndpointTest(ZulipTestCase):
data=ujson.dumps(
dict(
event=dict(
- type='other'
+ type='other',
),
users=[self.example_user('hamlet').id],
),
@@ -410,7 +410,7 @@ class GetEventsTest(ZulipTestCase):
narrow=ujson.dumps([["stream", "denmark"]]),
user_client="website",
dont_block=ujson.dumps(True),
- )
+ ),
)
self.assert_json_success(result)
@@ -505,7 +505,7 @@ class EventsRegisterTest(ZulipTestCase):
all_public_streams = False,
queue_timeout = 600,
last_connection_time = time.time(),
- narrow = [])
+ narrow = []),
)
# hybrid_state = initial fetch state + re-applying events triggered by our action
# normal_state = do action then fetch at the end (the "normal" code path)
@@ -513,7 +513,7 @@ class EventsRegisterTest(ZulipTestCase):
self.user_profile, event_types, "",
client_gravatar=client_gravatar,
slim_presence=slim_presence,
- include_subscribers=include_subscribers
+ include_subscribers=include_subscribers,
)
action()
events = client.event_queue.contents()
@@ -622,7 +622,7 @@ class EventsRegisterTest(ZulipTestCase):
self.do_test(
lambda: self.send_stream_message(self.example_user('cordelia'),
"Verona",
- content)
+ content),
)
@@ -632,7 +632,7 @@ class EventsRegisterTest(ZulipTestCase):
self.do_test(
lambda: self.send_stream_message(self.example_user('cordelia'),
"Verona",
- content)
+ content),
)
@@ -640,7 +640,7 @@ class EventsRegisterTest(ZulipTestCase):
self.do_test(
lambda: self.send_personal_message(self.example_user('cordelia'),
self.example_user('hamlet'),
- 'hola')
+ 'hola'),
)
@@ -652,7 +652,7 @@ class EventsRegisterTest(ZulipTestCase):
self.do_test(
lambda: self.send_huddle_message(self.example_user('cordelia'),
huddle,
- 'hola')
+ 'hola'),
)
@@ -817,7 +817,7 @@ class EventsRegisterTest(ZulipTestCase):
message = self.send_stream_message(
self.example_user('cordelia'),
"Verona",
- content
+ content,
)
self.do_test(
@@ -830,7 +830,7 @@ class EventsRegisterTest(ZulipTestCase):
self.send_stream_message(
sender,
"Verona",
- "hello 1"
+ "hello 1",
)
self.do_test(
lambda: self.send_stream_message(sender, "Verona", "hello 2"),
@@ -849,7 +849,7 @@ class EventsRegisterTest(ZulipTestCase):
('user', check_dict_only([
('email', check_string),
('full_name', check_string),
- ('user_id', check_int)
+ ('user_id', check_int),
])),
])
@@ -875,7 +875,7 @@ class EventsRegisterTest(ZulipTestCase):
('user', check_dict_only([
('email', check_string),
('full_name', check_string),
- ('user_id', check_int)
+ ('user_id', check_int),
])),
])
@@ -902,7 +902,7 @@ class EventsRegisterTest(ZulipTestCase):
('user', check_dict_only([
('email', check_string),
('full_name', check_string),
- ('user_id', check_int)
+ ('user_id', check_int),
])),
])
@@ -957,7 +957,7 @@ class EventsRegisterTest(ZulipTestCase):
('user', check_dict_only([
('email', check_string),
('full_name', check_string),
- ('user_id', check_int)
+ ('user_id', check_int),
])),
])
@@ -1232,7 +1232,7 @@ class EventsRegisterTest(ZulipTestCase):
def test_pointer_events(self) -> None:
schema_checker = self.check_events_dict([
('type', equals('pointer')),
- ('pointer', check_int)
+ ('pointer', check_int),
])
events = self.do_test(lambda: do_update_pointer(self.user_profile, get_client("website"), 1500))
error = schema_checker('events[0]', events[0])
@@ -1626,7 +1626,7 @@ class EventsRegisterTest(ZulipTestCase):
bot_creation_policy=[Realm.BOT_CREATION_EVERYONE],
video_chat_provider=[
Realm.VIDEO_CHAT_PROVIDERS['jitsi_meet']['id'],
- Realm.VIDEO_CHAT_PROVIDERS['google_hangouts']['id']
+ Realm.VIDEO_CHAT_PROVIDERS['google_hangouts']['id'],
],
google_hangouts_domain=["zulip.com", "zulip.org"],
default_code_block_language=['python', 'javascript'],
@@ -1678,7 +1678,7 @@ class EventsRegisterTest(ZulipTestCase):
('op', equals('update_dict')),
('property', equals('default')),
('data', check_dict_only([
- ('authentication_methods', check_dict([]))
+ ('authentication_methods', check_dict([])),
])),
])
@@ -2039,7 +2039,7 @@ class EventsRegisterTest(ZulipTestCase):
('property', equals('plan_type')),
('value', equals(Realm.LIMITED)),
('extra_data', check_dict_only([
- ('upload_quota', check_int)
+ ('upload_quota', check_int),
])),
])
events = self.do_test(lambda: do_change_plan_type(realm, Realm.LIMITED))
@@ -2492,9 +2492,9 @@ class EventsRegisterTest(ZulipTestCase):
('reactions', check_list(None)),
('client', equals('Internal')),
(TOPIC_NAME, equals('stream events')),
- ('recipient_id', check_int)
+ ('recipient_id', check_int),
])),
- ('id', check_int)
+ ('id', check_int),
])
error = schema_checker('events[2]', events[2])
self.assert_on_error(error)
@@ -2965,7 +2965,7 @@ class EventsRegisterTest(ZulipTestCase):
('value', equals(True)),
])
events = self.do_test(
- lambda: do_set_zoom_token(self.user_profile, {'access_token': 'token'})
+ lambda: do_set_zoom_token(self.user_profile, {'access_token': 'token'}),
)
error = schema_checker('events[0]', events[0])
self.assert_on_error(error)
@@ -3043,7 +3043,7 @@ class GetUnreadMsgsTest(ZulipTestCase):
recipient = Recipient.objects.get(type_id=stream.id, type=Recipient.STREAM)
subscription = Subscription.objects.get(
user_profile=user_profile,
- recipient=recipient
+ recipient=recipient,
)
subscription.is_muted = True
subscription.save()
@@ -3125,7 +3125,7 @@ class GetUnreadMsgsTest(ZulipTestCase):
sender_id=cordelia.id,
stream_id=get_stream('social', realm).id,
topic='lunch',
- )
+ ),
)
def test_raw_unread_huddle(self) -> None:
@@ -3137,7 +3137,7 @@ class GetUnreadMsgsTest(ZulipTestCase):
huddle1_message_ids = [
self.send_huddle_message(
cordelia,
- [hamlet, othello]
+ [hamlet, othello],
)
for i in range(3)
]
@@ -3145,7 +3145,7 @@ class GetUnreadMsgsTest(ZulipTestCase):
huddle2_message_ids = [
self.send_huddle_message(
cordelia,
- [hamlet, prospero]
+ [hamlet, prospero],
)
for i in range(3)
]
@@ -3158,7 +3158,7 @@ class GetUnreadMsgsTest(ZulipTestCase):
self.assertEqual(
set(huddle_dict.keys()),
- set(huddle1_message_ids) | set(huddle2_message_ids)
+ set(huddle1_message_ids) | set(huddle2_message_ids),
)
huddle_string = ','.join(
@@ -3194,7 +3194,7 @@ class GetUnreadMsgsTest(ZulipTestCase):
self.assertEqual(
set(pm_dict.keys()),
- set(cordelia_pm_message_ids) | set(othello_pm_message_ids)
+ set(cordelia_pm_message_ids) | set(othello_pm_message_ids),
)
self.assertEqual(
@@ -3262,7 +3262,7 @@ class GetUnreadMsgsTest(ZulipTestCase):
)
self.assertEqual(
set(pm_dict.keys()),
- {othello_msg.id, cordelia_msg.id}
+ {othello_msg.id, cordelia_msg.id},
)
# Again, `sender_id` is misnamed here.
@@ -3281,7 +3281,7 @@ class GetUnreadMsgsTest(ZulipTestCase):
)
self.assertEqual(
set(pm_dict.keys()),
- {othello_msg.id, cordelia_msg.id, hamlet_msg.id}
+ {othello_msg.id, cordelia_msg.id, hamlet_msg.id},
)
# Again, `sender_id` is misnamed here.
@@ -3298,7 +3298,7 @@ class GetUnreadMsgsTest(ZulipTestCase):
self.assertEqual(
set(pm_dict.keys()),
- {othello_msg.id, cordelia_msg.id, hamlet_msg.id}
+ {othello_msg.id, cordelia_msg.id, hamlet_msg.id},
)
# Again, `sender_id` is misnamed here.
@@ -3381,7 +3381,7 @@ class GetUnreadMsgsTest(ZulipTestCase):
um = UserMessage.objects.get(
user_profile_id=user_profile.id,
- message_id=stream_message_id
+ message_id=stream_message_id,
)
um.flags |= UserMessage.flags.mentioned
um.save()
@@ -3407,7 +3407,7 @@ class GetUnreadMsgsTest(ZulipTestCase):
# Test with a muted stream
um = UserMessage.objects.get(
user_profile_id=user_profile.id,
- message_id=muted_stream_message_id
+ message_id=muted_stream_message_id,
)
um.flags = UserMessage.flags.mentioned
um.save()
@@ -3432,7 +3432,7 @@ class GetUnreadMsgsTest(ZulipTestCase):
# Test with a muted topic
um = UserMessage.objects.get(
user_profile_id=user_profile.id,
- message_id=muted_topic_message_id
+ message_id=muted_topic_message_id,
)
um.flags = UserMessage.flags.mentioned
um.save()
diff --git a/zerver/tests/test_hipchat_importer.py b/zerver/tests/test_hipchat_importer.py
index b8ef0b585a..709e2a2191 100644
--- a/zerver/tests/test_hipchat_importer.py
+++ b/zerver/tests/test_hipchat_importer.py
@@ -32,7 +32,7 @@ class HipChatImporter(ZulipTestCase):
normal_message: Dict[str, Any] = dict(
sender=dict(
id=1,
- )
+ ),
)
sender_id = get_hipchat_sender_id(
diff --git a/zerver/tests/test_home.py b/zerver/tests/test_home.py
index e5232cb5a7..b1fc3b62b5 100644
--- a/zerver/tests/test_home.py
+++ b/zerver/tests/test_home.py
@@ -10,12 +10,12 @@ from unittest.mock import patch
import urllib
from typing import Any, Dict
from zerver.lib.actions import (
- do_create_user, do_change_logo_source
+ do_create_user, do_change_logo_source,
)
from zerver.lib.events import add_realm_logo_fields
from zerver.lib.test_classes import ZulipTestCase
from zerver.lib.test_helpers import (
- queries_captured, get_user_messages
+ queries_captured, get_user_messages,
)
from zerver.lib.soft_deactivation import do_soft_deactivate_users
from zerver.lib.test_runner import slow
@@ -23,7 +23,7 @@ from zerver.lib.users import compute_show_invites_and_add_streams
from zerver.models import (
get_realm, get_stream, get_user, UserProfile,
flush_per_request_caches, DefaultStream, Realm,
- get_system_bot, UserActivity
+ get_system_bot, UserActivity,
)
from zerver.views.home import compute_navbar_logo_url, get_furthest_read_time
from corporate.models import Customer, CustomerPlan
@@ -334,7 +334,7 @@ class HomeTest(ZulipTestCase):
stream = self.make_stream(stream_name)
DefaultStream.objects.create(
realm_id=realm_id,
- stream_id=stream.id
+ stream_id=stream.id,
)
for user in [main_user, other_user]:
self.subscribe(user, stream_name)
@@ -411,7 +411,7 @@ class HomeTest(ZulipTestCase):
unsupported_user_agents = [
"Mozilla/5.0 (compatible; MSIE 10.0; Windows NT 6.2)",
"Mozilla/5.0 (Windows NT 10.0; Trident/7.0; rv:11.0) like Gecko",
- "Mozilla/4.0 (compatible; MSIE 8.0; Windows NT 6.1; Trident/4.0)"
+ "Mozilla/4.0 (compatible; MSIE 8.0; Windows NT 6.1; Trident/4.0)",
]
for user_agent in unsupported_user_agents:
result = self.client_get('/',
@@ -488,7 +488,7 @@ class HomeTest(ZulipTestCase):
full_name=bot_name,
short_name=bot_name,
bot_type=UserProfile.DEFAULT_BOT,
- bot_owner=owner
+ bot_owner=owner,
)
return user
@@ -614,7 +614,7 @@ class HomeTest(ZulipTestCase):
is_admin=False,
is_owner=False,
is_cross_realm_bot=True,
- is_guest=False
+ is_guest=False,
),
dict(
avatar_version=email_gateway_bot.avatar_version,
@@ -628,7 +628,7 @@ class HomeTest(ZulipTestCase):
is_admin=False,
is_owner=False,
is_cross_realm_bot=True,
- is_guest=False
+ is_guest=False,
),
dict(
avatar_version=email_gateway_bot.avatar_version,
@@ -642,7 +642,7 @@ class HomeTest(ZulipTestCase):
is_admin=False,
is_owner=False,
is_cross_realm_bot=True,
- is_guest=False
+ is_guest=False,
),
], key=by_email))
diff --git a/zerver/tests/test_import_export.py b/zerver/tests/test_import_export.py
index 71bfdcf23e..809c2b345c 100644
--- a/zerver/tests/test_import_export.py
+++ b/zerver/tests/test_import_export.py
@@ -48,7 +48,7 @@ from zerver.lib.bot_lib import (
StateHandler,
)
from zerver.lib.bot_config import (
- set_bot_config
+ set_bot_config,
)
from zerver.lib.actions import (
do_create_user,
@@ -108,7 +108,7 @@ class QueryUtilTest(ZulipTestCase):
queries = [
Message.objects.filter(sender_id=cordelia.id),
Message.objects.filter(sender_id=hamlet.id),
- Message.objects.exclude(sender_id__in=[cordelia.id, hamlet.id])
+ Message.objects.exclude(sender_id__in=[cordelia.id, hamlet.id]),
]
return queries
@@ -149,7 +149,7 @@ class QueryUtilTest(ZulipTestCase):
list(chunker) # exhaust the iterator
self.assertEqual(
len(all_msg_ids),
- len(Message.objects.filter(sender_id__in=[cordelia.id, hamlet.id]))
+ len(Message.objects.filter(sender_id__in=[cordelia.id, hamlet.id])),
)
# Try just a single query to validate chunking.
@@ -165,7 +165,7 @@ class QueryUtilTest(ZulipTestCase):
list(chunker) # exhaust the iterator
self.assertEqual(
len(all_msg_ids),
- len(Message.objects.exclude(sender_id=cordelia.id))
+ len(Message.objects.exclude(sender_id=cordelia.id)),
)
self.assertTrue(len(all_msg_ids) > 15)
@@ -290,7 +290,7 @@ class ImportExportTest(ZulipTestCase):
user_profile=user_profile,
path_id=attachment_path_id,
message=message,
- is_message_realm_public=True
+ is_message_realm_public=True,
)
avatar_path_id = user_avatar_path(user_profile)
original_avatar_path_id = avatar_path_id + ".original"
@@ -472,7 +472,7 @@ class ImportExportTest(ZulipTestCase):
exported_streams = self.get_set(data['zerver_stream'], 'name')
self.assertEqual(
exported_streams,
- {'Denmark', 'Rome', 'Scotland', 'Venice', 'Verona'}
+ {'Denmark', 'Rome', 'Scotland', 'Venice', 'Verona'},
)
data = full_data['message']
@@ -600,7 +600,7 @@ class ImportExportTest(ZulipTestCase):
self.assertEqual(
exported_streams,
{'Denmark', 'Rome', 'Scotland', 'Venice', 'Verona',
- 'Private A', 'Private B', 'Private C'}
+ 'Private A', 'Private B', 'Private C'},
)
data = full_data['message']
@@ -694,10 +694,10 @@ class ImportExportTest(ZulipTestCase):
# data to test import of huddles
huddle = [
self.example_user('hamlet'),
- self.example_user('othello')
+ self.example_user('othello'),
]
self.send_huddle_message(
- self.example_user('cordelia'), huddle, 'test huddle message'
+ self.example_user('cordelia'), huddle, 'test huddle message',
)
user_mention_message = '@**King Hamlet** Hello'
@@ -716,7 +716,7 @@ class ImportExportTest(ZulipTestCase):
# data to test import of hotspots
UserHotspot.objects.create(
- user=sample_user, hotspot='intro_streams'
+ user=sample_user, hotspot='intro_streams',
)
# data to test import of muted topic
@@ -770,16 +770,16 @@ class ImportExportTest(ZulipTestCase):
# test users
assert_realm_values(
- lambda r: {user.email for user in r.get_admin_users_and_bots()}
+ lambda r: {user.email for user in r.get_admin_users_and_bots()},
)
assert_realm_values(
- lambda r: {user.email for user in r.get_active_users()}
+ lambda r: {user.email for user in r.get_active_users()},
)
# test stream
assert_realm_values(
- lambda r: {stream.name for stream in get_active_streams(r)}
+ lambda r: {stream.name for stream in get_active_streams(r)},
)
# test recipients
@@ -799,11 +799,11 @@ class ImportExportTest(ZulipTestCase):
return users
assert_realm_values(
- lambda r: get_subscribers(get_recipient_stream(r))
+ lambda r: get_subscribers(get_recipient_stream(r)),
)
assert_realm_values(
- lambda r: get_subscribers(get_recipient_user(r))
+ lambda r: get_subscribers(get_recipient_user(r)),
)
# test custom profile fields
@@ -893,7 +893,7 @@ class ImportExportTest(ZulipTestCase):
# test usergroups
assert_realm_values(
- lambda r: {group.name for group in UserGroup.objects.filter(realm=r)}
+ lambda r: {group.name for group in UserGroup.objects.filter(realm=r)},
)
def get_user_membership(r: str) -> Set[str]:
@@ -987,7 +987,7 @@ class ImportExportTest(ZulipTestCase):
original_msg.rendered_content,
('\n\n\n'
'@Polonius
' %
- (orig_polonius_user.id,))
+ (orig_polonius_user.id,)),
)
imported_polonius_user = UserProfile.objects.get(delivery_email=self.example_email("polonius"),
realm=imported_realm)
@@ -996,7 +996,7 @@ class ImportExportTest(ZulipTestCase):
imported_msg.rendered_content,
('\n'
'@Polonius
' %
- (imported_polonius_user.id,))
+ (imported_polonius_user.id,)),
)
# Check recipient_id was generated correctly for the imported users and streams.
diff --git a/zerver/tests/test_integrations_dev_panel.py b/zerver/tests/test_integrations_dev_panel.py
index 13058684a8..3a6dd4528f 100644
--- a/zerver/tests/test_integrations_dev_panel.py
+++ b/zerver/tests/test_integrations_dev_panel.py
@@ -17,7 +17,7 @@ class TestIntegrationsDevPanel(ZulipTestCase):
"url": url,
"body": body,
"custom_headers": "{}",
- "is_json": "true"
+ "is_json": "true",
}
response = self.client_post(target_url, data)
@@ -37,7 +37,7 @@ class TestIntegrationsDevPanel(ZulipTestCase):
"url": url,
"body": body,
"custom_headers": "{}",
- "is_json": "true"
+ "is_json": "true",
}
response = self.client_post(target_url, data)
@@ -64,7 +64,7 @@ class TestIntegrationsDevPanel(ZulipTestCase):
"url": url,
"body": body,
"custom_headers": ujson.dumps({"X_GITHUB_EVENT": "ping"}),
- "is_json": "true"
+ "is_json": "true",
}
response = self.client_post(target_url, data)
@@ -143,13 +143,13 @@ class TestIntegrationsDevPanel(ZulipTestCase):
{
"fixture_name": "sample.json",
"status_code": 200,
- "message": {"msg": "", "result": "success"}
+ "message": {"msg": "", "result": "success"},
},
{
"fixture_name": "review.json",
"status_code": 200,
- "message": {"msg": "", "result": "success"}
- }
+ "message": {"msg": "", "result": "success"},
+ },
]
responses = ujson.loads(response.content)["responses"]
for r in responses:
@@ -187,43 +187,43 @@ class TestIntegrationsDevPanel(ZulipTestCase):
{
"message": {'msg': 'Unknown WordPress webhook action: WordPress Action', 'result': 'error'},
"fixture_name": "user_register.txt",
- "status_code": 400
+ "status_code": 400,
},
{
"message": {'msg': 'Unknown WordPress webhook action: WordPress Action', 'result': 'error'},
"fixture_name": "publish_post_no_data_provided.txt",
- "status_code": 400
+ "status_code": 400,
},
{
"message": {'msg': 'Unknown WordPress webhook action: WordPress Action', 'result': 'error'},
"fixture_name": "unknown_action_no_data.txt",
- "status_code": 400
+ "status_code": 400,
},
{
"message": {'msg': 'Unknown WordPress webhook action: WordPress Action', 'result': 'error'},
"fixture_name": "publish_page.txt",
- "status_code": 400
+ "status_code": 400,
},
{
"message": {'msg': 'Unknown WordPress webhook action: WordPress Action', 'result': 'error'},
"fixture_name": "unknown_action_no_hook_provided.txt",
- "status_code": 400
+ "status_code": 400,
},
{
"message": {'msg': 'Unknown WordPress webhook action: WordPress Action', 'result': 'error'},
"fixture_name": "publish_post_type_not_provided.txt",
- "status_code": 400
+ "status_code": 400,
},
{
"message": {'msg': 'Unknown WordPress webhook action: WordPress Action', 'result': 'error'},
"fixture_name": "wp_login.txt",
- "status_code": 400
+ "status_code": 400,
},
{
"message": {'msg': 'Unknown WordPress webhook action: WordPress Action', 'result': 'error'},
"fixture_name": "publish_post.txt",
- "status_code": 400
- }
+ "status_code": 400,
+ },
]
responses = ujson.loads(response.content)["responses"]
for r in responses:
diff --git a/zerver/tests/test_mattermost_importer.py b/zerver/tests/test_mattermost_importer.py
index f30efd0354..ff0978b3cd 100644
--- a/zerver/tests/test_mattermost_importer.py
+++ b/zerver/tests/test_mattermost_importer.py
@@ -297,7 +297,7 @@ class MatterMostImporter(ZulipTestCase):
realm_id=3,
custom_emoji_data=mattermost_data["emoji"],
data_dir=self.fixture_file_name("", "mattermost_fixtures"),
- output_dir = output_dir
+ output_dir = output_dir,
)
self.assertEqual(len(zerver_realm_emoji), 2)
self.assertEqual(zerver_realm_emoji[0]["file_name"], "peerdium")
@@ -327,72 +327,72 @@ class MatterMostImporter(ZulipTestCase):
harry_id = user_id_mapper.get("harry")
raw_message = {
- "content": "Hello @harry"
+ "content": "Hello @harry",
}
ids = get_mentioned_user_ids(raw_message, user_id_mapper)
self.assertEqual(list(ids), [harry_id])
raw_message = {
- "content": "Hello"
+ "content": "Hello",
}
ids = get_mentioned_user_ids(raw_message, user_id_mapper)
self.assertEqual(list(ids), [])
raw_message = {
- "content": "@harry How are you?"
+ "content": "@harry How are you?",
}
ids = get_mentioned_user_ids(raw_message, user_id_mapper)
self.assertEqual(list(ids), [harry_id])
raw_message = {
- "content": "@harry @ron Where are you folks?"
+ "content": "@harry @ron Where are you folks?",
}
ron_id = user_id_mapper.get("ron")
ids = get_mentioned_user_ids(raw_message, user_id_mapper)
self.assertEqual(list(ids), [harry_id, ron_id])
raw_message = {
- "content": "@harry.com How are you?"
+ "content": "@harry.com How are you?",
}
ids = get_mentioned_user_ids(raw_message, user_id_mapper)
self.assertEqual(list(ids), [])
raw_message = {
- "content": "hello@harry.com How are you?"
+ "content": "hello@harry.com How are you?",
}
ids = get_mentioned_user_ids(raw_message, user_id_mapper)
self.assertEqual(list(ids), [])
harry_id = user_id_mapper.get("harry_")
raw_message = {
- "content": "Hello @harry_"
+ "content": "Hello @harry_",
}
ids = get_mentioned_user_ids(raw_message, user_id_mapper)
self.assertEqual(list(ids), [harry_id])
harry_id = user_id_mapper.get("harry.")
raw_message = {
- "content": "Hello @harry."
+ "content": "Hello @harry.",
}
ids = get_mentioned_user_ids(raw_message, user_id_mapper)
self.assertEqual(list(ids), [harry_id])
harry_id = user_id_mapper.get("ha_rry.")
raw_message = {
- "content": "Hello @ha_rry."
+ "content": "Hello @ha_rry.",
}
ids = get_mentioned_user_ids(raw_message, user_id_mapper)
self.assertEqual(list(ids), [harry_id])
ron_id = user_id_mapper.get("ron")
raw_message = {
- "content": "Hello @ron."
+ "content": "Hello @ron.",
}
ids = get_mentioned_user_ids(raw_message, user_id_mapper)
self.assertEqual(list(ids), [])
raw_message = {
- "content": "Hello @ron_"
+ "content": "Hello @ron_",
}
ids = get_mentioned_user_ids(raw_message, user_id_mapper)
self.assertEqual(list(ids), [])
@@ -444,14 +444,14 @@ class MatterMostImporter(ZulipTestCase):
{"user": "harry", "create_at": 1553165521410, "emoji_name": "tick"},
{"user": "ron", "create_at": 1553166530805, "emoji_name": "smile"},
{"user": "ron", "create_at": 1553166540953, "emoji_name": "world_map"},
- {"user": "harry", "create_at": 1553166540957, "emoji_name": "world_map"}
+ {"user": "harry", "create_at": 1553166540957, "emoji_name": "world_map"},
]
zerver_realmemoji = write_emoticon_data(
realm_id=3,
custom_emoji_data=mattermost_data["emoji"],
data_dir=self.fixture_file_name("", "mattermost_fixtures"),
- output_dir=self.make_import_output_dir("mattermost")
+ output_dir=self.make_import_output_dir("mattermost"),
)
# Make sure tick is present in fixture data
@@ -468,7 +468,7 @@ class MatterMostImporter(ZulipTestCase):
reactions=reactions,
message_id=5,
user_id_mapper=user_id_mapper,
- zerver_realmemoji=zerver_realmemoji
+ zerver_realmemoji=zerver_realmemoji,
)
smile_emoji_code = name_to_codepoint["smile"]
@@ -498,7 +498,7 @@ class MatterMostImporter(ZulipTestCase):
do_convert_data(
mattermost_data_dir=mattermost_data_dir,
output_dir=output_dir,
- masking_content=False
+ masking_content=False,
)
harry_team_output_dir = self.team_output_dir(output_dir, "gryffindor")
@@ -552,7 +552,7 @@ class MatterMostImporter(ZulipTestCase):
do_import_realm(
import_dir=harry_team_output_dir,
- subdomain='gryffindor'
+ subdomain='gryffindor',
)
realm = get_realm('gryffindor')
@@ -571,7 +571,7 @@ class MatterMostImporter(ZulipTestCase):
do_convert_data(
mattermost_data_dir=mattermost_data_dir,
output_dir=output_dir,
- masking_content=False
+ masking_content=False,
)
harry_team_output_dir = self.team_output_dir(output_dir, "gryffindor")
@@ -625,7 +625,7 @@ class MatterMostImporter(ZulipTestCase):
do_import_realm(
import_dir=harry_team_output_dir,
- subdomain='gryffindor'
+ subdomain='gryffindor',
)
realm = get_realm('gryffindor')
@@ -662,7 +662,7 @@ class MatterMostImporter(ZulipTestCase):
do_convert_data(
mattermost_data_dir=mattermost_data_dir,
output_dir=output_dir,
- masking_content=True
+ masking_content=True,
)
harry_team_output_dir = self.team_output_dir(output_dir, "gryffindor")
@@ -677,14 +677,14 @@ class MatterMostImporter(ZulipTestCase):
do_convert_data(
mattermost_data_dir=mattermost_data_dir,
output_dir=output_dir,
- masking_content=True
+ masking_content=True,
)
harry_team_output_dir = self.team_output_dir(output_dir, "gryffindor")
do_import_realm(
import_dir=harry_team_output_dir,
- subdomain='gryffindor'
+ subdomain='gryffindor',
)
realm = get_realm('gryffindor')
diff --git a/zerver/tests/test_message_edit_notifications.py b/zerver/tests/test_message_edit_notifications.py
index e3eeb406aa..c2f882b2a7 100644
--- a/zerver/tests/test_message_edit_notifications.py
+++ b/zerver/tests/test_message_edit_notifications.py
@@ -45,7 +45,7 @@ class EditMessageSideEffectsTest(ZulipTestCase):
message_id = self.send_personal_message(
hamlet,
cordelia,
- content='no mention'
+ content='no mention',
)
self._assert_update_does_not_notify_anybody(
@@ -143,7 +143,7 @@ class EditMessageSideEffectsTest(ZulipTestCase):
return dict(
enqueue_kwargs=enqueue_kwargs,
- queue_messages=queue_messages
+ queue_messages=queue_messages,
)
def _send_and_update_message(self, original_content: str, updated_content: str,
@@ -175,7 +175,7 @@ class EditMessageSideEffectsTest(ZulipTestCase):
return dict(
message_id=message_id,
- info=info
+ info=info,
)
def test_updates_with_stream_mention(self) -> None:
@@ -262,7 +262,7 @@ class EditMessageSideEffectsTest(ZulipTestCase):
'''
return mock.patch(
'zerver.tornado.event_queue.receiver_is_off_zulip',
- return_value=False
+ return_value=False,
)
def test_stream_push_notify_for_sorta_present_user(self) -> None:
@@ -311,7 +311,7 @@ class EditMessageSideEffectsTest(ZulipTestCase):
notification_message_data = self._send_and_update_message(
original_content, updated_content,
enable_online_push_notifications=True,
- connected_to_zulip=True, present_on_web=True
+ connected_to_zulip=True, present_on_web=True,
)
message_id = notification_message_data['message_id']
@@ -347,7 +347,7 @@ class EditMessageSideEffectsTest(ZulipTestCase):
notification_message_data = self._send_and_update_message(
original_content, updated_content,
enable_online_push_notifications=True,
- connected_to_zulip=True, present_on_web=True
+ connected_to_zulip=True, present_on_web=True,
)
message_id = notification_message_data['message_id']
@@ -386,7 +386,7 @@ class EditMessageSideEffectsTest(ZulipTestCase):
updated_content = 'now we mention @**Cordelia Lear**'
notification_message_data = self._send_and_update_message(
original_content, updated_content,
- connected_to_zulip=True
+ connected_to_zulip=True,
)
message_id = notification_message_data['message_id']
@@ -421,7 +421,7 @@ class EditMessageSideEffectsTest(ZulipTestCase):
updated_content = 'now we mention @**all**'
notification_message_data = self._send_and_update_message(
original_content, updated_content,
- connected_to_zulip=True
+ connected_to_zulip=True,
)
message_id = notification_message_data['message_id']
@@ -481,7 +481,7 @@ class EditMessageSideEffectsTest(ZulipTestCase):
notification_message_data = self._send_and_update_message(
original_content, updated_content,
connected_to_zulip=True,
- present_on_web=True
+ present_on_web=True,
)
message_id = notification_message_data['message_id']
diff --git a/zerver/tests/test_messages.py b/zerver/tests/test_messages.py
index 465e7b1949..6a110fd8b8 100644
--- a/zerver/tests/test_messages.py
+++ b/zerver/tests/test_messages.py
@@ -102,7 +102,7 @@ from zerver.models import (
get_stream, get_system_bot, get_user, Reaction,
flush_per_request_caches, ScheduledMessage, get_huddle_recipient,
bulk_get_huddle_user_ids, get_huddle_user_ids,
- get_display_recipient, RealmFilter
+ get_display_recipient, RealmFilter,
)
@@ -129,7 +129,7 @@ class MiscMessageTest(ZulipTestCase):
def test_get_last_message_id(self) -> None:
self.assertEqual(
get_last_message_id(),
- Message.objects.latest('id').id
+ Message.objects.latest('id').id,
)
Message.objects.all().delete()
@@ -277,7 +277,7 @@ class TopicHistoryTest(ZulipTestCase):
# out of realm
bad_stream = self.make_stream(
'mit_stream',
- realm=get_realm('zephyr')
+ realm=get_realm('zephyr'),
)
endpoint = f'/json/users/me/{bad_stream.id}/topics'
result = self.client_get(endpoint, dict())
@@ -286,7 +286,7 @@ class TopicHistoryTest(ZulipTestCase):
# private stream to which I am not subscribed
private_stream = self.make_stream(
'private_stream',
- invite_only=True
+ invite_only=True,
)
endpoint = f'/json/users/me/{private_stream.id}/topics'
result = self.client_get(endpoint, dict())
@@ -311,7 +311,7 @@ class TopicDeleteTest(ZulipTestCase):
self.login_user(user_profile)
endpoint = '/json/streams/' + str(stream.id) + '/delete_topic'
result = self.client_post(endpoint, {
- "topic_name": topic_name
+ "topic_name": topic_name,
})
self.assert_json_error(result, "Must be an organization administrator")
self.assertEqual(self.get_last_message().id, last_msg_id)
@@ -330,7 +330,7 @@ class TopicDeleteTest(ZulipTestCase):
# delete new_last_msg_id, i.e. the one sent since they joined.
self.assertEqual(self.get_last_message().id, new_last_msg_id)
result = self.client_post(endpoint, {
- "topic_name": topic_name
+ "topic_name": topic_name,
})
self.assert_json_success(result)
self.assertEqual(self.get_last_message().id, last_msg_id)
@@ -338,7 +338,7 @@ class TopicDeleteTest(ZulipTestCase):
# Try to delete all messages in the topic again. There are no messages accessible
# to the administrator, so this should do nothing.
result = self.client_post(endpoint, {
- "topic_name": topic_name
+ "topic_name": topic_name,
})
self.assert_json_success(result)
self.assertEqual(self.get_last_message().id, last_msg_id)
@@ -348,14 +348,14 @@ class TopicDeleteTest(ZulipTestCase):
history_public_to_subscribers=True)
# Delete the topic should now remove all messages
result = self.client_post(endpoint, {
- "topic_name": topic_name
+ "topic_name": topic_name,
})
self.assert_json_success(result)
self.assertEqual(self.get_last_message().id, initial_last_msg_id)
# Delete again, to test the edge case of deleting an empty topic.
result = self.client_post(endpoint, {
- "topic_name": topic_name
+ "topic_name": topic_name,
})
self.assert_json_success(result)
self.assertEqual(self.get_last_message().id, initial_last_msg_id)
@@ -501,7 +501,7 @@ class TestAddressee(ZulipTestCase):
result = Addressee.legacy_build(
sender=self.example_user('hamlet'), message_type_name='private',
message_to=user_ids, topic_name='random_topic',
- realm=realm
+ realm=realm,
)
user_profiles = result.user_profiles()
result_user_ids = [user_profiles[0].id, user_profiles[1].id]
@@ -518,7 +518,7 @@ class TestAddressee(ZulipTestCase):
result = Addressee.legacy_build(
sender=sender, message_type_name='stream',
message_to=[stream.id], topic_name='random_topic',
- realm=realm
+ realm=realm,
)
stream_id = result.stream_id()
@@ -567,7 +567,7 @@ class InternalPrepTest(ZulipTestCase):
sender=cordelia,
topic='whatever',
content=bad_content,
- stream=stream
+ stream=stream,
)
arg = m.call_args_list[0][0][0]
@@ -579,7 +579,7 @@ class InternalPrepTest(ZulipTestCase):
sender=cordelia,
stream_name=stream.name,
topic='whatever',
- content=bad_content
+ content=bad_content,
)
arg = m.call_args_list[0][0][0]
@@ -796,7 +796,7 @@ class PersonalMessagesTest(ZulipTestCase):
user_message = most_recent_usermessage(user_profile)
self.assertEqual(
str(user_message),
- f''
+ f'',
)
@slow("checks several profiles")
@@ -865,7 +865,7 @@ class PersonalMessagesTest(ZulipTestCase):
self.login('hamlet')
self.assert_personal(
sender=self.example_user("hamlet"),
- receiver=self.example_user("othello")
+ receiver=self.example_user("othello"),
)
def test_private_message_policy(self) -> None:
@@ -892,7 +892,7 @@ class PersonalMessagesTest(ZulipTestCase):
self.assert_personal(
sender=self.example_user("hamlet"),
receiver=self.example_user("othello"),
- content="hümbüǵ"
+ content="hümbüǵ",
)
class StreamMessagesTest(ZulipTestCase):
@@ -972,7 +972,7 @@ class StreamMessagesTest(ZulipTestCase):
)
Subscription.objects.create(
user_profile=user,
- recipient=recipient
+ recipient=recipient,
)
def send_test_message() -> None:
@@ -1085,7 +1085,7 @@ class StreamMessagesTest(ZulipTestCase):
self.send_stream_message(
user,
stream_name,
- content=content
+ content=content,
)
self.assertEqual(m.call_count, 1)
users = m.call_args[0][2]
@@ -1101,7 +1101,7 @@ class StreamMessagesTest(ZulipTestCase):
self.subscribe(hamlet, stream_name)
UserMessage.objects.filter(
- user_profile=cordelia
+ user_profile=cordelia,
).delete()
def mention_cordelia() -> Set[int]:
@@ -1110,13 +1110,13 @@ class StreamMessagesTest(ZulipTestCase):
user_ids = self._send_stream_message(
user=hamlet,
stream_name=stream_name,
- content=content
+ content=content,
)
return user_ids
def num_cordelia_messages() -> int:
return UserMessage.objects.filter(
- user_profile=cordelia
+ user_profile=cordelia,
).count()
user_ids = mention_cordelia()
@@ -1155,7 +1155,7 @@ class StreamMessagesTest(ZulipTestCase):
user_ids = self._send_stream_message(
user=hamlet,
stream_name=stream_name,
- content=content
+ content=content,
)
self.assertIn(normal_bot.id, user_ids)
@@ -1331,7 +1331,7 @@ class MessageDictTest(ZulipTestCase):
hamlet,
"Scotland",
topic_name="editing",
- content="before edit"
+ content="before edit",
)
return msg_id
@@ -1381,7 +1381,7 @@ class MessageDictTest(ZulipTestCase):
date_sent=timezone_now(),
sending_client=sending_client,
last_edit_time=timezone_now(),
- edit_history='[]'
+ edit_history='[]',
)
message.set_topic_name('whatever')
message.save()
@@ -1426,7 +1426,7 @@ class MessageDictTest(ZulipTestCase):
date_sent=timezone_now(),
sending_client=sending_client,
last_edit_time=timezone_now(),
- edit_history='[]'
+ edit_history='[]',
)
message.set_topic_name('whatever')
message.save()
@@ -1456,7 +1456,7 @@ class MessageDictTest(ZulipTestCase):
date_sent=timezone_now(),
sending_client=sending_client,
last_edit_time=timezone_now(),
- edit_history='[]'
+ edit_history='[]',
)
message.set_topic_name('whatever')
message.save()
@@ -1516,7 +1516,7 @@ class MessageDictTest(ZulipTestCase):
date_sent=timezone_now(),
sending_client=sending_client,
last_edit_time=timezone_now(),
- edit_history='[]'
+ edit_history='[]',
)
message.set_topic_name('whatever')
message.save()
@@ -1572,7 +1572,7 @@ class SewMessageAndReactionTest(ZulipTestCase):
date_sent=timezone_now(),
sending_client=sending_client,
last_edit_time=timezone_now(),
- edit_history='[]'
+ edit_history='[]',
)
message.set_topic_name('whatever')
message.save()
@@ -1642,8 +1642,8 @@ class MessagePOSTTest(ZulipTestCase):
"to": ujson.dumps([99999]),
"client": "test suite",
"content": "Stream message by ID.",
- "topic": "Test topic for stream ID message"
- }
+ "topic": "Test topic for stream ID message",
+ },
)
self.assert_json_error(result, "Stream with ID '99999' does not exist")
@@ -1882,8 +1882,8 @@ class MessagePOSTTest(ZulipTestCase):
"type": "private",
"content": "Test message",
"client": "test suite",
- "to": ujson.dumps([self.example_user("othello").id])
- }
+ "to": ujson.dumps([self.example_user("othello").id]),
+ },
)
self.assert_json_success(result)
@@ -1903,8 +1903,8 @@ class MessagePOSTTest(ZulipTestCase):
"content": "Test message",
"client": "test suite",
"to": ujson.dumps([self.example_user("othello").id,
- self.example_user("cordelia").id])
- }
+ self.example_user("cordelia").id]),
+ },
)
self.assert_json_success(result)
@@ -1913,7 +1913,7 @@ class MessagePOSTTest(ZulipTestCase):
self.assertEqual(msg.recipient_id, get_huddle_recipient(
{self.example_user("hamlet").id,
self.example_user("othello").id,
- self.example_user("cordelia").id}).id
+ self.example_user("cordelia").id}).id,
)
def test_personal_message_copying_self(self) -> None:
@@ -2650,21 +2650,21 @@ class EditMessageTest(ZulipTestCase):
self.assertEqual(
fetch_message_dict[TOPIC_NAME],
- msg.topic_name()
+ msg.topic_name(),
)
self.assertEqual(
fetch_message_dict['content'],
- msg.content
+ msg.content,
)
self.assertEqual(
fetch_message_dict['sender_id'],
- msg.sender_id
+ msg.sender_id,
)
if msg.edit_history:
self.assertEqual(
fetch_message_dict['edit_history'],
- ujson.loads(msg.edit_history)
+ ujson.loads(msg.edit_history),
)
def test_query_count_on_to_dict_uncached(self) -> None:
@@ -2710,14 +2710,14 @@ class EditMessageTest(ZulipTestCase):
topic_name="editing", content="before edit")
result = self.client_patch("/json/messages/" + str(msg_id), {
'message_id': msg_id,
- 'content': 'after edit'
+ 'content': 'after edit',
})
self.assert_json_success(result)
self.check_message(msg_id, topic_name="editing", content="after edit")
result = self.client_patch("/json/messages/" + str(msg_id), {
'message_id': msg_id,
- 'topic': 'edited'
+ 'topic': 'edited',
})
self.assert_json_success(result)
self.check_topic(msg_id, topic_name="edited")
@@ -2798,7 +2798,7 @@ class EditMessageTest(ZulipTestCase):
topic_name="editing", content="before edit")
result = self.client_patch("/json/messages/" + str(msg_id), {
'message_id': msg_id,
- 'topic': ' '
+ 'topic': ' ',
})
self.assert_json_error(result, "Topic can't be empty")
@@ -2808,7 +2808,7 @@ class EditMessageTest(ZulipTestCase):
topic_name="editing", content="before edit")
result = self.client_patch("/json/messages/" + str(msg_id), {
'message_id': msg_id,
- 'content': ' '
+ 'content': ' ',
})
self.assert_json_success(result)
content = Message.objects.filter(id=msg_id).values_list('content', flat = True)[0]
@@ -2827,7 +2827,7 @@ class EditMessageTest(ZulipTestCase):
new_content_1 = 'content after edit'
result_1 = self.client_patch("/json/messages/" + str(msg_id_1), {
- 'message_id': msg_id_1, 'content': new_content_1
+ 'message_id': msg_id_1, 'content': new_content_1,
})
self.assert_json_success(result_1)
@@ -2856,7 +2856,7 @@ class EditMessageTest(ZulipTestCase):
content="content before edit")
new_content_1 = 'content after edit'
result_1 = self.client_patch("/json/messages/" + str(msg_id_1), {
- 'message_id': msg_id_1, 'content': new_content_1
+ 'message_id': msg_id_1, 'content': new_content_1,
})
self.assert_json_success(result_1)
@@ -2892,7 +2892,7 @@ class EditMessageTest(ZulipTestCase):
'content after edit, line 2\n'
'content before edit, line 3')
result_2 = self.client_patch("/json/messages/" + str(msg_id_2), {
- 'message_id': msg_id_2, 'content': new_content_2
+ 'message_id': msg_id_2, 'content': new_content_2,
})
self.assert_json_success(result_2)
@@ -2927,7 +2927,7 @@ class EditMessageTest(ZulipTestCase):
content="Here is a link to [zulip](www.zulip.org).")
new_content_1 = 'Here is a link to [zulip](www.zulipchat.com).'
result_1 = self.client_patch("/json/messages/" + str(msg_id_1), {
- 'message_id': msg_id_1, 'content': new_content_1
+ 'message_id': msg_id_1, 'content': new_content_1,
})
self.assert_json_success(result_1)
@@ -3281,13 +3281,13 @@ class EditMessageTest(ZulipTestCase):
if um.user_profile_id == user_id:
return {
"id": user_id,
- "flags": um.flags_list()
+ "flags": um.flags_list(),
}
else:
return {
"id": user_id,
- "flags": ["read"]
+ "flags": ["read"],
}
users_to_be_notified = list(map(notify, [hamlet.id, cordelia.id]))
@@ -3331,7 +3331,7 @@ class EditMessageTest(ZulipTestCase):
def notify(user_id: int) -> Dict[str, Any]:
return {
"id": user_id,
- "flags": ["wildcard_mentioned"]
+ "flags": ["wildcard_mentioned"],
}
users_to_be_notified = sorted(map(notify, [cordelia.id, hamlet.id]), key=itemgetter("id"))
@@ -3369,7 +3369,7 @@ class EditMessageTest(ZulipTestCase):
result = self.client_patch("/json/messages/" + str(id1), {
'message_id': id1,
'topic': 'edited',
- 'propagate_mode': 'change_later'
+ 'propagate_mode': 'change_later',
})
self.assert_json_success(result)
@@ -3397,7 +3397,7 @@ class EditMessageTest(ZulipTestCase):
result = self.client_patch("/json/messages/" + str(id2), {
'message_id': id2,
'topic': 'edited',
- 'propagate_mode': 'change_all'
+ 'propagate_mode': 'change_all',
})
self.assert_json_success(result)
@@ -3451,7 +3451,7 @@ class EditMessageTest(ZulipTestCase):
result = self.client_patch("/json/messages/" + str(msg_id), {
'message_id': msg_id,
'stream_id': new_stream.id,
- 'propagate_mode': 'change_all'
+ 'propagate_mode': 'change_all',
})
self.assert_json_success(result)
@@ -3471,7 +3471,7 @@ class EditMessageTest(ZulipTestCase):
result = self.client_patch("/json/messages/" + str(msg_id_later), {
'message_id': msg_id_later,
'stream_id': new_stream.id,
- 'propagate_mode': 'change_later'
+ 'propagate_mode': 'change_later',
})
self.assert_json_success(result)
@@ -3492,7 +3492,7 @@ class EditMessageTest(ZulipTestCase):
result = self.client_patch("/json/messages/" + str(msg_id), {
'message_id': msg_id,
'stream_id': new_stream.id,
- 'propagate_mode': 'change_all'
+ 'propagate_mode': 'change_all',
})
self.assert_json_error(result, "You don't have permission to move this message")
@@ -3510,7 +3510,7 @@ class EditMessageTest(ZulipTestCase):
'message_id': msg_id,
'stream_id': new_stream.id,
'propagate_mode': 'change_all',
- 'content': 'Not allowed'
+ 'content': 'Not allowed',
})
self.assert_json_error(result, "Cannot change message content while changing stream")
@@ -3529,7 +3529,7 @@ class EditMessageTest(ZulipTestCase):
'message_id': msg_id,
'stream_id': new_stream.id,
'propagate_mode': 'change_all',
- 'topic': 'new topic'
+ 'topic': 'new topic',
})
self.assertEqual(len(queries), 49)
@@ -3864,7 +3864,7 @@ class MessageAccessTests(ZulipTestCase):
self.send_personal_message(
self.example_user("hamlet"),
self.example_user("cordelia"),
- "test_received"
+ "test_received",
),
]
@@ -3985,7 +3985,7 @@ class MessageAccessTests(ZulipTestCase):
content=content)
sent_message = UserMessage.objects.filter(
- user_profile=self.example_user('hamlet')
+ user_profile=self.example_user('hamlet'),
).order_by("id").reverse()[0]
self.assertEqual(sent_message.message.content, content)
self.assertFalse(sent_message.flags.starred)
@@ -3999,7 +3999,7 @@ class MessageAccessTests(ZulipTestCase):
self.login_user(normal_user)
message_id = [
- self.send_stream_message(normal_user, stream_name, "test 1")
+ self.send_stream_message(normal_user, stream_name, "test 1"),
]
guest_user = self.example_user('polonius')
@@ -4015,7 +4015,7 @@ class MessageAccessTests(ZulipTestCase):
# And messages sent after they join
self.login_user(normal_user)
message_id = [
- self.send_stream_message(normal_user, stream_name, "test 2")
+ self.send_stream_message(normal_user, stream_name, "test 2"),
]
self.login_user(guest_user)
result = self.change_star(message_id)
@@ -4030,7 +4030,7 @@ class MessageAccessTests(ZulipTestCase):
self.login_user(normal_user)
message_id = [
- self.send_stream_message(normal_user, stream_name, "test 1")
+ self.send_stream_message(normal_user, stream_name, "test 1"),
]
guest_user = self.example_user('polonius')
@@ -4054,7 +4054,7 @@ class MessageAccessTests(ZulipTestCase):
do_change_stream_invite_only(stream, True, history_public_to_subscribers=False)
self.login_user(normal_user)
message_id = [
- self.send_stream_message(normal_user, stream_name, "test 2")
+ self.send_stream_message(normal_user, stream_name, "test 2"),
]
self.login_user(guest_user)
result = self.change_star(message_id)
@@ -4146,7 +4146,7 @@ class MessageHasKeywordsTest(ZulipTestCase):
dummy_files = [
('zulip.txt', f'{realm_id}/31/4CBjtTLYZhk66pZrF8hnYGwc/zulip.txt', sample_size),
('temp_file.py', f'{realm_id}/31/4CBjtTLYZhk66pZrF8hnYGwc/temp_file.py', sample_size),
- ('abc.py', f'{realm_id}/31/4CBjtTLYZhk66pZrF8hnYGwc/abc.py', sample_size)
+ ('abc.py', f'{realm_id}/31/4CBjtTLYZhk66pZrF8hnYGwc/abc.py', sample_size),
]
for file_name, path_id, size in dummy_files:
@@ -4416,7 +4416,7 @@ class CheckMessageTest(ZulipTestCase):
full_name='',
short_name='',
bot_type=UserProfile.DEFAULT_BOT,
- bot_owner=parent
+ bot_owner=parent,
)
bot.last_reminder = None
@@ -4496,7 +4496,7 @@ class DeleteMessageTest(ZulipTestCase):
self.login('iago')
result = self.client_patch("/json/realm", {
'allow_message_deleting': ujson.dumps(allow_message_deleting),
- 'message_content_delete_limit_seconds': message_content_delete_limit_seconds
+ 'message_content_delete_limit_seconds': message_content_delete_limit_seconds,
})
self.assert_json_success(result)
@@ -4600,7 +4600,7 @@ class SoftDeactivationMessageTest(ZulipTestCase):
def last_realm_audit_log_entry(event_type: int) -> RealmAuditLog:
return RealmAuditLog.objects.filter(
- event_type=event_type
+ event_type=event_type,
).order_by('-event_time')[0]
long_term_idle_user = self.example_user('hamlet')
@@ -4834,7 +4834,7 @@ class SoftDeactivationMessageTest(ZulipTestCase):
recipient_list = [
self.example_user("hamlet"),
self.example_user("iago"),
- self.example_user('cordelia')
+ self.example_user('cordelia'),
]
for user_profile in recipient_list:
self.subscribe(user_profile, "Denmark")
@@ -5004,7 +5004,7 @@ class MessageHydrationTest(ZulipTestCase):
full_name='Aaron Smith',
short_name='Aaron',
id=999,
- is_mirror_dummy=False
+ is_mirror_dummy=False,
),
]
@@ -5028,7 +5028,7 @@ class MessageHydrationTest(ZulipTestCase):
full_name='Aaron Smith',
short_name='Aaron',
id=999,
- is_mirror_dummy=False
+ is_mirror_dummy=False,
),
dict(
email=cordelia.email,
@@ -5151,7 +5151,7 @@ class TestMessageForIdsDisplayRecipientFetching(ZulipTestCase):
othello = self.example_user('othello')
message_ids = [
self.send_personal_message(hamlet, cordelia, 'test'),
- self.send_personal_message(cordelia, othello, 'test')
+ self.send_personal_message(cordelia, othello, 'test'),
]
messages = messages_for_ids(
@@ -5170,7 +5170,7 @@ class TestMessageForIdsDisplayRecipientFetching(ZulipTestCase):
cordelia = self.example_user('cordelia')
message_ids = [
self.send_stream_message(cordelia, "Verona", content='test'),
- self.send_stream_message(cordelia, "Denmark", content='test')
+ self.send_stream_message(cordelia, "Denmark", content='test'),
]
messages = messages_for_ids(
@@ -5192,7 +5192,7 @@ class TestMessageForIdsDisplayRecipientFetching(ZulipTestCase):
iago = self.example_user('iago')
message_ids = [
self.send_huddle_message(hamlet, [cordelia, othello], 'test'),
- self.send_huddle_message(cordelia, [hamlet, othello, iago], 'test')
+ self.send_huddle_message(cordelia, [hamlet, othello, iago], 'test'),
]
messages = messages_for_ids(
@@ -5218,7 +5218,7 @@ class TestMessageForIdsDisplayRecipientFetching(ZulipTestCase):
self.send_personal_message(hamlet, cordelia, 'test'),
self.send_stream_message(cordelia, "Denmark", content='test'),
self.send_huddle_message(cordelia, [hamlet, othello, iago], 'test'),
- self.send_personal_message(cordelia, othello, 'test')
+ self.send_personal_message(cordelia, othello, 'test'),
]
messages = messages_for_ids(
@@ -5303,7 +5303,7 @@ class TestBulkGetHuddleUserIds(ZulipTestCase):
iago = self.example_user('iago')
message_ids = [
self.send_huddle_message(hamlet, [cordelia, othello], 'test'),
- self.send_huddle_message(cordelia, [hamlet, othello, iago], 'test')
+ self.send_huddle_message(cordelia, [hamlet, othello, iago], 'test'),
]
messages = Message.objects.filter(id__in=message_ids).order_by("id")
diff --git a/zerver/tests/test_middleware.py b/zerver/tests/test_middleware.py
index dbdf138ead..1e5c0a440f 100644
--- a/zerver/tests/test_middleware.py
+++ b/zerver/tests/test_middleware.py
@@ -42,7 +42,7 @@ class SlowQueryTest(ZulipTestCase):
logged_line = mock_slow_query_logger.info.call_args_list[0][0][0]
self.assertRegex(
logged_line,
- r"123\.456\.789\.012 GET 200 10\.\ds .* \(unknown via \?\)"
+ r"123\.456\.789\.012 GET 200 10\.\ds .* \(unknown via \?\)",
)
class OpenGraphTest(ZulipTestCase):
@@ -73,7 +73,7 @@ class OpenGraphTest(ZulipTestCase):
"users can view the edit history of a message. | To remove the",
"best to delete the message entirely. "],
["Disable message edit history", "feature is only available", "Related articles",
- "Restrict message editing"]
+ "Restrict message editing"],
)
def test_double_quotes(self) -> None:
@@ -83,7 +83,7 @@ class OpenGraphTest(ZulipTestCase):
"Night mode (Zulip Help Center)",
['By default, Zulip has a white background. ',
'Zulip also provides a "night mode", which is great for working in a dark space.'],
- []
+ [],
)
def test_settings_tab(self) -> None:
diff --git a/zerver/tests/test_muting.py b/zerver/tests/test_muting.py
index 946df021b2..5a64ee928e 100644
--- a/zerver/tests/test_muting.py
+++ b/zerver/tests/test_muting.py
@@ -9,7 +9,7 @@ from zerver.lib.stream_topic import StreamTopicTarget
from zerver.models import (
get_stream,
UserProfile,
- MutedTopic
+ MutedTopic,
)
from zerver.lib.topic_mutes import (
diff --git a/zerver/tests/test_narrow.py b/zerver/tests/test_narrow.py
index c258bc2396..a118e44491 100644
--- a/zerver/tests/test_narrow.py
+++ b/zerver/tests/test_narrow.py
@@ -8,7 +8,7 @@ from sqlalchemy.sql.elements import ClauseElement
from zerver.models import (
Realm, Subscription, Recipient, Stream,
get_display_recipient, get_realm, get_stream,
- UserMessage, Message
+ UserMessage, Message,
)
from zerver.lib.actions import (
do_set_realm_property,
@@ -124,19 +124,19 @@ class NarrowBuilderTest(ZulipTestCase):
stream_dicts: List[Mapping[str, Any]] = [
{
"name": "publicstream",
- "description": "Public stream with public history"
+ "description": "Public stream with public history",
},
{
"name": "privatestream",
"description": "Private stream with non-public history",
- "invite_only": True
+ "invite_only": True,
},
{
"name": "privatewithhistory",
"description": "Private stream with public history",
"invite_only": True,
- "history_public_to_subscribers": True
- }
+ "history_public_to_subscribers": True,
+ },
]
realm = get_realm('zulip')
created, existing = create_streams_if_needed(realm, stream_dicts)
@@ -154,19 +154,19 @@ class NarrowBuilderTest(ZulipTestCase):
stream_dicts: List[Mapping[str, Any]] = [
{
"name": "publicstream",
- "description": "Public stream with public history"
+ "description": "Public stream with public history",
},
{
"name": "privatestream",
"description": "Private stream with non-public history",
- "invite_only": True
+ "invite_only": True,
},
{
"name": "privatewithhistory",
"description": "Private stream with public history",
"invite_only": True,
- "history_public_to_subscribers": True
- }
+ "history_public_to_subscribers": True,
+ },
]
realm = get_realm('zulip')
created, existing = create_streams_if_needed(realm, stream_dicts)
@@ -201,7 +201,7 @@ class NarrowBuilderTest(ZulipTestCase):
where_clause = 'WHERE (flags & %(flags_1)s) = %(param_1)s'
params = dict(
flags_1=UserMessage.flags.starred.mask,
- param_1=0
+ param_1=0,
)
self._do_add_term_test(term, where_clause, params)
@@ -209,7 +209,7 @@ class NarrowBuilderTest(ZulipTestCase):
where_clause = 'WHERE (flags & %(flags_1)s) = %(param_1)s'
params = dict(
flags_1=UserMessage.flags.has_alert_word.mask,
- param_1=0
+ param_1=0,
)
self._do_add_term_test(term, where_clause, params)
@@ -219,7 +219,7 @@ class NarrowBuilderTest(ZulipTestCase):
flags_1=UserMessage.flags.mentioned.mask,
param_1=0,
flags_2=UserMessage.flags.wildcard_mentioned.mask,
- param_2=0
+ param_2=0,
)
self._do_add_term_test(term, where_clause, params)
@@ -1003,7 +1003,7 @@ class PostProcessTest(ZulipTestCase):
anchor=anchor, anchored_to_left=False, anchored_to_right=False,
out_ids=[1000],
found_anchor=True, found_oldest=False,
- found_newest=False, history_limited=False
+ found_newest=False, history_limited=False,
)
verify(
in_ids=[1000],
@@ -1012,7 +1012,7 @@ class PostProcessTest(ZulipTestCase):
anchor=anchor, anchored_to_left=False, anchored_to_right=False,
out_ids=[1000],
found_anchor=True, found_oldest=False,
- found_newest=False, history_limited=False
+ found_newest=False, history_limited=False,
)
verify(
in_ids=[1000],
@@ -1033,7 +1033,7 @@ class PostProcessTest(ZulipTestCase):
anchor=anchor, anchored_to_left=False, anchored_to_right=False,
out_ids=[],
found_anchor=False, found_oldest=False,
- found_newest=False, history_limited=False
+ found_newest=False, history_limited=False,
)
class GetOldMessagesTest(ZulipTestCase):
@@ -1140,7 +1140,7 @@ class GetOldMessagesTest(ZulipTestCase):
self.login('othello')
reaction_name = 'thumbs_up'
reaction_info = {
- 'emoji_name': reaction_name
+ 'emoji_name': reaction_name,
}
url = f'/json/messages/{message_id}/reactions'
@@ -1174,17 +1174,17 @@ class GetOldMessagesTest(ZulipTestCase):
self.get_and_check_messages(
dict(
narrow=ujson.dumps(
- [['pm-with', othello_email]]
- )
- )
+ [['pm-with', othello_email]],
+ ),
+ ),
)
self.get_and_check_messages(
dict(
narrow=ujson.dumps(
- [dict(operator='pm-with', operand=othello_email)]
- )
- )
+ [dict(operator='pm-with', operand=othello_email)],
+ ),
+ ),
)
def test_client_avatar(self) -> None:
@@ -1295,14 +1295,14 @@ class GetOldMessagesTest(ZulipTestCase):
matching_message_ids.append(
self.send_huddle_message(
me,
- [iago, cordelia, othello]
+ [iago, cordelia, othello],
),
)
matching_message_ids.append(
self.send_huddle_message(
me,
- [cordelia, othello]
+ [cordelia, othello],
),
)
@@ -1315,7 +1315,7 @@ class GetOldMessagesTest(ZulipTestCase):
non_matching_message_ids.append(
self.send_huddle_message(
me,
- [iago, othello]
+ [iago, othello],
),
)
@@ -1382,7 +1382,7 @@ class GetOldMessagesTest(ZulipTestCase):
self.login_user(hamlet)
narrow = [
- dict(operator='stream', operand=stream_name)
+ dict(operator='stream', operand=stream_name),
]
req = dict(
@@ -1870,7 +1870,7 @@ class GetOldMessagesTest(ZulipTestCase):
# This bug is a pgroonga regression and according to one of
# the author, this should be fixed in its next release.
['I want to go to 日本!
', # This is correct.
- 'I want to go to 日本!
', ])
+ 'I want to go to 日本!
'])
# Should not crash when multiple search operands are present
multi_search_narrow = [
@@ -2291,7 +2291,7 @@ class GetOldMessagesTest(ZulipTestCase):
# parameter, one at a time.
post_params = dict(other_params + [(param, type)] +
[(other_param, 0) for other_param in
- int_params[:idx] + int_params[idx + 1:]]
+ int_params[:idx] + int_params[idx + 1:]],
)
result = self.client_get("/json/messages", post_params)
self.assert_json_error(result,
@@ -2488,7 +2488,7 @@ class GetOldMessagesTest(ZulipTestCase):
anchor="first_unread",
num_before=10,
num_after=10,
- narrow='[["stream", "England"]]'
+ narrow='[["stream", "England"]]',
)
request = POSTRequestMock(query_params, user_profile)
@@ -2501,7 +2501,7 @@ class GetOldMessagesTest(ZulipTestCase):
messages = result['messages']
self.assertEqual(
{msg['id'] for msg in messages},
- {unsub_message_id, muted_message_id, first_message_id, extra_message_id}
+ {unsub_message_id, muted_message_id, first_message_id, extra_message_id},
)
def test_use_first_unread_anchor_with_some_unread_messages(self) -> None:
@@ -2524,7 +2524,7 @@ class GetOldMessagesTest(ZulipTestCase):
anchor="first_unread",
num_before=10,
num_after=10,
- narrow='[]'
+ narrow='[]',
)
request = POSTRequestMock(query_params, user_profile)
@@ -2571,7 +2571,7 @@ class GetOldMessagesTest(ZulipTestCase):
anchor="first_unread",
num_before=10,
num_after=10,
- narrow='[]'
+ narrow='[]',
)
request = POSTRequestMock(query_params, user_profile)
@@ -2586,11 +2586,11 @@ class GetOldMessagesTest(ZulipTestCase):
self.assertNotIn(f'AND message_id = {LARGER_THAN_MAX_MESSAGE_ID}', sql)
self.assertIn('ORDER BY message_id ASC', sql)
cond = 'WHERE user_profile_id = %d AND message_id <= %d' % (
- user_profile.id, first_unread_message_id - 1
+ user_profile.id, first_unread_message_id - 1,
)
self.assertIn(cond, sql)
cond = 'WHERE user_profile_id = %d AND message_id >= %d' % (
- user_profile.id, first_visible_message_id
+ user_profile.id, first_visible_message_id,
)
self.assertIn(cond, sql)
@@ -2601,7 +2601,7 @@ class GetOldMessagesTest(ZulipTestCase):
anchor="first_unread",
num_before=10,
num_after=10,
- narrow='[]'
+ narrow='[]',
)
request = POSTRequestMock(query_params, user_profile)
@@ -2645,7 +2645,7 @@ class GetOldMessagesTest(ZulipTestCase):
muted_topics = [
['Scotland', 'golf'],
['web stuff', 'css'],
- ['bogus', 'bogus']
+ ['bogus', 'bogus'],
]
set_topic_mutes(user_profile, muted_topics)
@@ -2653,7 +2653,7 @@ class GetOldMessagesTest(ZulipTestCase):
anchor="first_unread",
num_before=0,
num_after=0,
- narrow='[["stream", "Scotland"]]'
+ narrow='[["stream", "Scotland"]]',
)
request = POSTRequestMock(query_params, user_profile)
@@ -2686,7 +2686,7 @@ class GetOldMessagesTest(ZulipTestCase):
# Test the do-nothing case first.
muted_topics = [
- ['irrelevant_stream', 'irrelevant_topic']
+ ['irrelevant_stream', 'irrelevant_topic'],
]
set_topic_mutes(user_profile, muted_topics)
@@ -2700,7 +2700,7 @@ class GetOldMessagesTest(ZulipTestCase):
# Also test that passing stream ID works
narrow = [
- dict(operator='stream', operand=get_stream('Scotland', realm).id)
+ dict(operator='stream', operand=get_stream('Scotland', realm).id),
]
muting_conditions = exclude_muting_conditions(user_profile, narrow)
self.assertEqual(muting_conditions, [])
diff --git a/zerver/tests/test_new_users.py b/zerver/tests/test_new_users.py
index 84571921a4..ec1baccb00 100644
--- a/zerver/tests/test_new_users.py
+++ b/zerver/tests/test_new_users.py
@@ -120,11 +120,11 @@ class TestBrowserAndOsUserAgentStrings(ZulipTestCase):
super().setUp()
self.user_agents = [
('mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) ' +
- 'Chrome/54.0.2840.59 Safari/537.36', 'Chrome', 'Linux',),
+ 'Chrome/54.0.2840.59 Safari/537.36', 'Chrome', 'Linux'),
('mozilla/5.0 (windows nt 6.1; win64; x64) applewebkit/537.36 (khtml, like gecko) ' +
- 'chrome/56.0.2924.87 safari/537.36', 'Chrome', 'Windows',),
+ 'chrome/56.0.2924.87 safari/537.36', 'Chrome', 'Windows'),
('mozilla/5.0 (windows nt 6.1; wow64; rv:51.0) ' +
- 'gecko/20100101 firefox/51.0', 'Firefox', 'Windows',),
+ 'gecko/20100101 firefox/51.0', 'Firefox', 'Windows'),
('mozilla/5.0 (windows nt 6.1; wow64; trident/7.0; rv:11.0) ' +
'like gecko', 'Internet Explorer', 'Windows'),
('Mozilla/5.0 (Android; Mobile; rv:27.0) ' +
diff --git a/zerver/tests/test_onboarding.py b/zerver/tests/test_onboarding.py
index cd34ad4f15..4477257c20 100644
--- a/zerver/tests/test_onboarding.py
+++ b/zerver/tests/test_onboarding.py
@@ -13,7 +13,7 @@ class TestRealmInternalBotCreation(ZulipTestCase):
def check_test_bot_exists() -> bool:
all_realms_count = Realm.objects.count()
all_test_bot_count = UserProfile.objects.filter(
- email='test-bot@zulip.com'
+ email='test-bot@zulip.com',
).count()
return all_realms_count == all_test_bot_count
diff --git a/zerver/tests/test_openapi.py b/zerver/tests/test_openapi.py
index 6bfa44a4a2..7a7f8fff1a 100644
--- a/zerver/tests/test_openapi.py
+++ b/zerver/tests/test_openapi.py
@@ -16,7 +16,7 @@ from zerver.openapi.openapi import (
get_openapi_fixture, get_openapi_parameters,
validate_against_openapi_schema, to_python_type,
SchemaError, openapi_spec, get_openapi_paths,
- OpenAPISpec, OPENAPI_SPEC_PATH
+ OpenAPISpec, OPENAPI_SPEC_PATH,
)
from zerver.lib.request import arguments_map
@@ -49,7 +49,7 @@ class OpenAPIToolsTest(ZulipTestCase):
expected = {
'code': 'BAD_REQUEST',
'msg': 'You don\'t have permission to edit this message',
- 'result': 'error'
+ 'result': 'error',
}
self.assertEqual(actual, expected)
@@ -62,7 +62,7 @@ class OpenAPIToolsTest(ZulipTestCase):
'The target message\'s ID.\n',
'example': 42,
'required': True,
- 'schema': {'type': 'integer'}
+ 'schema': {'type': 'integer'},
}
assert(expected_item in actual)
@@ -73,7 +73,7 @@ class OpenAPIToolsTest(ZulipTestCase):
bad_content: Dict[str, object] = {
'msg': '',
'result': 'success',
- 'foo': 'bar'
+ 'foo': 'bar',
}
validate_against_openapi_schema(bad_content,
TEST_ENDPOINT,
@@ -117,14 +117,14 @@ class OpenAPIToolsTest(ZulipTestCase):
openapi.EXCLUDE_PROPERTIES = {
TEST_ENDPOINT: {
TEST_METHOD: {
- TEST_RESPONSE_SUCCESS: ['foo']
- }
- }
+ TEST_RESPONSE_SUCCESS: ['foo'],
+ },
+ },
}
good_content = {
'msg': '',
'result': 'success',
- 'foo': 'bar'
+ 'foo': 'bar',
}
validate_against_openapi_schema(good_content,
TEST_ENDPOINT,
@@ -138,7 +138,7 @@ class OpenAPIToolsTest(ZulipTestCase):
'integer': int,
'boolean': bool,
'array': list,
- 'object': dict
+ 'object': dict,
}
for oa_type, py_type in TYPES.items():
@@ -693,32 +693,32 @@ class TestCurlExampleGeneration(ZulipTestCase):
"in": "query",
"description": "The ID of the stream whose messages should be marked as read.",
"schema": {
- "type": "integer"
+ "type": "integer",
},
- "required": True
+ "required": True,
},
{
"name": "bool_param",
"in": "query",
"description": "Just a boolean parameter.",
"schema": {
- "type": "boolean"
+ "type": "boolean",
},
- "required": True
- }
+ "required": True,
+ },
],
- }
- }
- }
+ },
+ },
+ },
}
spec_mock_with_invalid_method: Dict[str, object] = {
"security": [{"basicAuth": []}],
"paths": {
"/endpoint": {
- "brew": {} # the data is irrelevant as is should be rejected.
- }
- }
+ "brew": {}, # the data is irrelevant as is should be rejected.
+ },
+ },
}
spec_mock_using_object = {
@@ -733,17 +733,17 @@ class TestCurlExampleGeneration(ZulipTestCase):
"in": "query",
"description": "An object",
"schema": {
- "type": "object"
+ "type": "object",
},
"example": {
- "key": "value"
+ "key": "value",
},
- "required": True
- }
- ]
- }
- }
- }
+ "required": True,
+ },
+ ],
+ },
+ },
+ },
}
spec_mock_using_param_in_path = {
@@ -758,27 +758,27 @@ class TestCurlExampleGeneration(ZulipTestCase):
"in": "path",
"description": "Param in path",
"schema": {
- "type": "integer"
+ "type": "integer",
},
"example": 35,
- "required": True
+ "required": True,
},
{
"name": "param2",
"in": "query",
"description": "An object",
"schema": {
- "type": "object"
+ "type": "object",
},
"example": {
- "key": "value"
+ "key": "value",
},
- "required": True
- }
- ]
- }
- }
- }
+ "required": True,
+ },
+ ],
+ },
+ },
+ },
}
spec_mock_using_object_without_example = {
@@ -793,14 +793,14 @@ class TestCurlExampleGeneration(ZulipTestCase):
"in": "query",
"description": "An object",
"schema": {
- "type": "object"
+ "type": "object",
},
- "required": True
- }
- ]
- }
- }
- }
+ "required": True,
+ },
+ ],
+ },
+ },
+ },
}
spec_mock_using_array_without_example = {
@@ -815,14 +815,14 @@ class TestCurlExampleGeneration(ZulipTestCase):
"in": "query",
"description": "An array",
"schema": {
- "type": "array"
+ "type": "array",
},
- "required": True
- }
- ]
- }
- }
- }
+ "required": True,
+ },
+ ],
+ },
+ },
+ },
}
def curl_example(self, endpoint: str, method: str, *args: Any, **kwargs: Any) -> List[str]:
@@ -836,7 +836,7 @@ class TestCurlExampleGeneration(ZulipTestCase):
"curl -sSX GET -G http://localhost:9991/api/v1/get_stream_id \\",
" -u BOT_EMAIL_ADDRESS:BOT_API_KEY \\",
" -d 'stream=Denmark'",
- "```"
+ "```",
]
self.assertEqual(generated_curl_example, expected_curl_example)
@@ -852,7 +852,7 @@ class TestCurlExampleGeneration(ZulipTestCase):
"```curl",
"curl -sSX POST http://localhost:9991/api/v1/dev_fetch_api_key \\",
" -d 'username=iago@zulip.com'",
- "```"
+ "```",
]
self.assertEqual(generated_curl_example, expected_curl_example)
@@ -866,7 +866,7 @@ class TestCurlExampleGeneration(ZulipTestCase):
" -u BOT_EMAIL_ADDRESS:BOT_API_KEY \\",
" -d 'stream_id=1' \\",
" -d 'bool_param=false'",
- "```"
+ "```",
]
self.assertEqual(generated_curl_example, expected_curl_example)
@@ -889,7 +889,7 @@ class TestCurlExampleGeneration(ZulipTestCase):
" -d 'client_gravatar=true' \\",
" -d 'apply_markdown=false' \\",
" -d 'use_first_unread_anchor=true'",
- '```'
+ '```',
]
self.assertEqual(generated_curl_example, expected_curl_example)
@@ -902,7 +902,7 @@ class TestCurlExampleGeneration(ZulipTestCase):
'curl -sSX GET -G http://localhost:9991/api/v1/endpoint \\',
' -u BOT_EMAIL_ADDRESS:BOT_API_KEY \\',
' --data-urlencode param1=\'{"key": "value"}\'',
- '```'
+ '```',
]
self.assertEqual(generated_curl_example, expected_curl_example)
@@ -927,7 +927,7 @@ class TestCurlExampleGeneration(ZulipTestCase):
'curl -sSX GET -G http://localhost:9991/api/v1/endpoint/35 \\',
' -u BOT_EMAIL_ADDRESS:BOT_API_KEY \\',
' --data-urlencode param2=\'{"key": "value"}\'',
- '```'
+ '```',
]
self.assertEqual(generated_curl_example, expected_curl_example)
@@ -939,7 +939,7 @@ class TestCurlExampleGeneration(ZulipTestCase):
"curl -sSX GET -G https://zulip.example.com/api/v1/get_stream_id \\",
" -u email:key \\",
" -d 'stream=Denmark'",
- "```"
+ "```",
]
self.assertEqual(generated_curl_example, expected_curl_example)
@@ -955,7 +955,7 @@ class TestCurlExampleGeneration(ZulipTestCase):
" -d 'num_after=8' \\",
' --data-urlencode narrow=\'[{"operand": "Denmark", "operator": "stream"}]\' \\',
" -d 'use_first_unread_anchor=true'",
- '```'
+ '```',
]
self.assertEqual(generated_curl_example, expected_curl_example)
diff --git a/zerver/tests/test_outgoing_webhook_interfaces.py b/zerver/tests/test_outgoing_webhook_interfaces.py
index d7b1807878..5e141ec8b0 100644
--- a/zerver/tests/test_outgoing_webhook_interfaces.py
+++ b/zerver/tests/test_outgoing_webhook_interfaces.py
@@ -43,7 +43,7 @@ class TestGenericOutgoingWebhookService(ZulipTestCase):
event = dict(
user_profile_id=99,
- message=dict(type='private')
+ message=dict(type='private'),
)
service_handler = self.handler
@@ -63,7 +63,7 @@ class TestGenericOutgoingWebhookService(ZulipTestCase):
process_success_response(
event=event,
service_handler=service_handler,
- response=response
+ response=response,
)
self.assertTrue(m.called)
@@ -73,7 +73,7 @@ class TestGenericOutgoingWebhookService(ZulipTestCase):
message_id = self.send_stream_message(
othello,
stream.name,
- content="@**test**"
+ content="@**test**",
)
message = Message.objects.get(id=message_id)
@@ -168,7 +168,7 @@ class TestSlackOutgoingWebhookService(ZulipTestCase):
'timestamp': 123456,
'sender_id': 21,
'sender_full_name': 'Sample User',
- }
+ },
}
self.private_message_event = {
@@ -186,7 +186,7 @@ class TestSlackOutgoingWebhookService(ZulipTestCase):
'id': 219,
TOPIC_NAME: 'test',
'content': 'test content',
- }
+ },
}
service_class = get_service_interface_class(SLACK_INTERFACE)
diff --git a/zerver/tests/test_outgoing_webhook_system.py b/zerver/tests/test_outgoing_webhook_system.py
index fa7df64c6c..aee46890ae 100644
--- a/zerver/tests/test_outgoing_webhook_system.py
+++ b/zerver/tests/test_outgoing_webhook_system.py
@@ -155,7 +155,7 @@ class TestOutgoingWebhookMessaging(ZulipTestCase):
bot_owner,
full_name='Outgoing Webhook bot',
bot_type=UserProfile.OUTGOING_WEBHOOK_BOT,
- service_name='foo-service'
+ service_name='foo-service',
)
def test_multiple_services(self) -> None:
@@ -193,7 +193,7 @@ class TestOutgoingWebhookMessaging(ZulipTestCase):
self.send_personal_message(
sender,
bot,
- content="some content"
+ content="some content",
)
url_token_tups = set()
@@ -212,7 +212,7 @@ class TestOutgoingWebhookMessaging(ZulipTestCase):
{
('weather_url', 'weather_token'),
('qotd_url', 'qotd_token'),
- }
+ },
)
@mock.patch('requests.request', return_value=ResponseMock(200, {"response_string": "Hidley ho, I'm a webhook responding!"}))
@@ -228,11 +228,11 @@ class TestOutgoingWebhookMessaging(ZulipTestCase):
self.assertEqual(last_message.sender_id, bot.id)
self.assertEqual(
last_message.recipient.type_id,
- sender.id
+ sender.id,
)
self.assertEqual(
last_message.recipient.type,
- Recipient.PERSONAL
+ Recipient.PERSONAL,
)
@mock.patch('requests.request', return_value=ResponseMock(200, {"response_string": "Hidley ho, I'm a webhook responding!"}))
diff --git a/zerver/tests/test_presence.py b/zerver/tests/test_presence.py
index 4504ed2559..9a16db32d6 100644
--- a/zerver/tests/test_presence.py
+++ b/zerver/tests/test_presence.py
@@ -5,7 +5,7 @@ from unittest import mock
from typing import Any, Dict
from zerver.lib.actions import do_deactivate_user
from zerver.lib.presence import (
- get_status_dict_by_realm
+ get_status_dict_by_realm,
)
from zerver.lib.statistics import seconds_usage_between
from zerver.lib.test_helpers import (
@@ -43,7 +43,7 @@ class ActivityTest(ZulipTestCase):
client=client,
query=query,
count=count,
- last_visit=last_visit
+ last_visit=last_visit,
)
# Fails when not staff
@@ -146,7 +146,7 @@ class UserPresenceModelTests(ZulipTestCase):
PushDeviceToken.objects.create(
user=user_profile,
- kind=PushDeviceToken.APNS
+ kind=PushDeviceToken.APNS,
)
self.assertTrue(pushable())
@@ -181,7 +181,7 @@ class UserPresenceTests(ZulipTestCase):
presences = json['presences']
self.assertEqual(
set(presences.keys()),
- {str(hamlet.id), str(othello.id)}
+ {str(hamlet.id), str(othello.id)},
)
hamlet_info = presences[str(hamlet.id)]
othello_info = presences[str(othello.id)]
@@ -191,7 +191,7 @@ class UserPresenceTests(ZulipTestCase):
self.assertGreaterEqual(
othello_info['idle_timestamp'],
- hamlet_info['idle_timestamp']
+ hamlet_info['idle_timestamp'],
)
def test_set_active(self) -> None:
@@ -233,24 +233,24 @@ class UserPresenceTests(ZulipTestCase):
presences = json['presences']
self.assertEqual(
set(presences.keys()),
- {str(hamlet.id), str(othello.id)}
+ {str(hamlet.id), str(othello.id)},
)
othello_info = presences[str(othello.id)]
hamlet_info = presences[str(hamlet.id)]
self.assertEqual(
set(othello_info.keys()),
- {'active_timestamp'}
+ {'active_timestamp'},
)
self.assertEqual(
set(hamlet_info.keys()),
- {'active_timestamp'}
+ {'active_timestamp'},
)
self.assertGreaterEqual(
hamlet_info['active_timestamp'],
- othello_info['active_timestamp']
+ othello_info['active_timestamp'],
)
@mock.patch("stripe.Customer.list", return_value=[])
@@ -380,7 +380,7 @@ class UserPresenceTests(ZulipTestCase):
client=client,
query='get_events',
count=2,
- last_visit=last_visit
+ last_visit=last_visit,
)
def test_same_realm(self) -> None:
@@ -399,7 +399,7 @@ class UserPresenceTests(ZulipTestCase):
self.assertEqual(json['presences'][hamlet.email]["website"]['status'], 'idle')
self.assertEqual(
json['presences'].keys(),
- {hamlet.email}
+ {hamlet.email},
)
class SingleUserPresenceTests(ZulipTestCase):
@@ -494,8 +494,8 @@ class UserPresenceAggregationTests(ZulipTestCase):
{
'status': status,
'timestamp': datetime_to_timestamp(validate_time - datetime.timedelta(seconds=2)),
- 'client': 'ZulipAndroid'
- }
+ 'client': 'ZulipAndroid',
+ },
)
result = self.client_get(f"/json/users/{user.email}/presence")
@@ -515,8 +515,8 @@ class UserPresenceAggregationTests(ZulipTestCase):
{
'status': 'active',
'timestamp': datetime_to_timestamp(validate_time - datetime.timedelta(seconds=1)),
- 'client': 'ZulipTestDev'
- }
+ 'client': 'ZulipTestDev',
+ },
)
def test_aggregated_presense_active(self) -> None:
@@ -528,8 +528,8 @@ class UserPresenceAggregationTests(ZulipTestCase):
result_dict['presence']['aggregated'],
{
"status": "active",
- "timestamp": datetime_to_timestamp(validate_time - datetime.timedelta(seconds=2))
- }
+ "timestamp": datetime_to_timestamp(validate_time - datetime.timedelta(seconds=2)),
+ },
)
def test_aggregated_presense_idle(self) -> None:
@@ -541,8 +541,8 @@ class UserPresenceAggregationTests(ZulipTestCase):
result_dict['presence']['aggregated'],
{
"status": "idle",
- "timestamp": datetime_to_timestamp(validate_time - datetime.timedelta(seconds=2))
- }
+ "timestamp": datetime_to_timestamp(validate_time - datetime.timedelta(seconds=2)),
+ },
)
def test_aggregated_presense_mixed(self) -> None:
@@ -558,8 +558,8 @@ class UserPresenceAggregationTests(ZulipTestCase):
result_dict['presence']['aggregated'],
{
"status": "idle",
- "timestamp": datetime_to_timestamp(validate_time - datetime.timedelta(seconds=2))
- }
+ "timestamp": datetime_to_timestamp(validate_time - datetime.timedelta(seconds=2)),
+ },
)
def test_aggregated_presense_offline(self) -> None:
@@ -572,8 +572,8 @@ class UserPresenceAggregationTests(ZulipTestCase):
result_dict['presence']['aggregated'],
{
"status": "offline",
- "timestamp": datetime_to_timestamp(validate_time - datetime.timedelta(seconds=2))
- }
+ "timestamp": datetime_to_timestamp(validate_time - datetime.timedelta(seconds=2)),
+ },
)
class GetRealmStatusesTest(ZulipTestCase):
diff --git a/zerver/tests/test_push_notifications.py b/zerver/tests/test_push_notifications.py
index 537169c682..b2097566fc 100644
--- a/zerver/tests/test_push_notifications.py
+++ b/zerver/tests/test_push_notifications.py
@@ -685,7 +685,7 @@ class HandlePushNotificationTest(PushNotificationTest):
message = self.get_message(Recipient.PERSONAL, type_id=1)
UserMessage.objects.create(
user_profile=self.user_profile,
- message=message
+ message=message,
)
missed_message = {
@@ -739,7 +739,7 @@ class HandlePushNotificationTest(PushNotificationTest):
message = self.get_message(Recipient.PERSONAL, type_id=1)
UserMessage.objects.create(
user_profile=self.user_profile,
- message=message
+ message=message,
)
missed_message = {
@@ -782,7 +782,7 @@ class HandlePushNotificationTest(PushNotificationTest):
UserMessage.objects.create(
user_profile=user_profile,
flags=UserMessage.flags.read,
- message=message
+ message=message,
)
missed_message = {
@@ -799,7 +799,7 @@ class HandlePushNotificationTest(PushNotificationTest):
UserMessage.objects.create(
user_profile=user_profile,
flags=UserMessage.flags.read,
- message=message
+ message=message,
)
missed_message = {
'message_id': message.id,
@@ -824,7 +824,7 @@ class HandlePushNotificationTest(PushNotificationTest):
UserMessage.objects.create(
user_profile=user_profile,
flags=UserMessage.flags.read,
- message=message
+ message=message,
)
missed_message = {
'message_id': message.id,
@@ -848,7 +848,7 @@ class HandlePushNotificationTest(PushNotificationTest):
message = self.get_message(Recipient.PERSONAL, type_id=1)
UserMessage.objects.create(
user_profile=user_profile,
- message=message
+ message=message,
)
missed_message = {
@@ -875,7 +875,7 @@ class HandlePushNotificationTest(PushNotificationTest):
message = self.get_message(Recipient.PERSONAL, type_id=1)
UserMessage.objects.create(
user_profile=self.user_profile,
- message=message
+ message=message,
)
android_devices = list(
@@ -1180,8 +1180,8 @@ class TestGetAPNsPayload(PushNotificationTest):
'realm_id': self.sender.realm.id,
'realm_uri': self.sender.realm.uri,
"user_id": user_profile.id,
- }
- }
+ },
+ },
}
self.assertDictEqual(payload, expected)
@@ -1216,8 +1216,8 @@ class TestGetAPNsPayload(PushNotificationTest):
'realm_id': self.sender.realm.id,
'realm_uri': self.sender.realm.uri,
"user_id": user_profile.id,
- }
- }
+ },
+ },
}
self.assertDictEqual(payload, expected)
mock_push_notifications.assert_called()
@@ -1248,8 +1248,8 @@ class TestGetAPNsPayload(PushNotificationTest):
'realm_id': self.sender.realm.id,
'realm_uri': self.sender.realm.uri,
"user_id": self.sender.id,
- }
- }
+ },
+ },
}
self.assertDictEqual(payload, expected)
@@ -1280,8 +1280,8 @@ class TestGetAPNsPayload(PushNotificationTest):
'realm_id': self.sender.realm.id,
'realm_uri': self.sender.realm.uri,
"user_id": user_profile.id,
- }
- }
+ },
+ },
}
self.assertDictEqual(payload, expected)
@@ -1312,8 +1312,8 @@ class TestGetAPNsPayload(PushNotificationTest):
'realm_id': self.sender.realm.id,
'realm_uri': self.sender.realm.uri,
"user_id": user_profile.id,
- }
- }
+ },
+ },
}
self.assertDictEqual(payload, expected)
@@ -1348,8 +1348,8 @@ class TestGetAPNsPayload(PushNotificationTest):
'realm_id': self.sender.realm.id,
'realm_uri': self.sender.realm.uri,
"user_id": user_profile.id,
- }
- }
+ },
+ },
}
self.assertDictEqual(payload, expected)
@@ -1436,7 +1436,7 @@ class TestGetGCMPayload(PushNotificationTest):
"sender_avatar_url": absolute_avatar_url(message.sender),
"recipient_type": "stream",
"topic": "Test Topic",
- "stream": "Denmark"
+ "stream": "Denmark",
})
self.assertDictEqual(gcm_options, {
"priority": "high",
@@ -1466,7 +1466,7 @@ class TestGetGCMPayload(PushNotificationTest):
"sender_avatar_url": absolute_avatar_url(message.sender),
"recipient_type": "stream",
"topic": "Test Topic",
- "stream": "Denmark"
+ "stream": "Denmark",
})
self.assertDictEqual(gcm_options, {
"priority": "high",
diff --git a/zerver/tests/test_queue_worker.py b/zerver/tests/test_queue_worker.py
index 5fea7fdf85..2bde78a4c6 100644
--- a/zerver/tests/test_queue_worker.py
+++ b/zerver/tests/test_queue_worker.py
@@ -81,14 +81,14 @@ class WorkerTest(ZulipTestCase):
user = self.example_user('hamlet')
UserActivity.objects.filter(
user_profile = user.id,
- client = get_client('ios')
+ client = get_client('ios'),
).delete()
data = dict(
user_profile_id = user.id,
client_id = get_client('ios').id,
time = time.time(),
- query = 'send_message'
+ query = 'send_message',
)
fake_client.queue.append(('user_activity', data))
@@ -100,7 +100,7 @@ class WorkerTest(ZulipTestCase):
user_profile_id = user.id,
client = 'ios',
time = time.time(),
- query = 'send_message'
+ query = 'send_message',
)
fake_client.queue.append(('user_activity', data_old_format))
@@ -114,7 +114,7 @@ class WorkerTest(ZulipTestCase):
pass
activity_records = UserActivity.objects.filter(
user_profile = user.id,
- client = get_client('ios')
+ client = get_client('ios'),
)
self.assertEqual(len(activity_records), 1)
self.assertEqual(activity_records[0].count, 2)
@@ -133,7 +133,7 @@ class WorkerTest(ZulipTestCase):
pass
activity_records = UserActivity.objects.filter(
user_profile = user.id,
- client = get_client('ios')
+ client = get_client('ios'),
)
self.assertEqual(len(activity_records), 1)
self.assertEqual(activity_records[0].count, 3)
@@ -198,7 +198,7 @@ class WorkerTest(ZulipTestCase):
)
send_mock = patch(
- 'zerver.lib.email_notifications.do_send_missedmessage_events_reply_in_zulip'
+ 'zerver.lib.email_notifications.do_send_missedmessage_events_reply_in_zulip',
)
mmw.BATCH_DURATION = 0
@@ -242,7 +242,7 @@ class WorkerTest(ZulipTestCase):
self.assertEqual(othello_info['count'], 1)
self.assertEqual(
{m['message'].content for m in othello_info['missed_messages']},
- {'where art thou, othello?'}
+ {'where art thou, othello?'},
)
def test_push_notifications_worker(self) -> None:
@@ -310,8 +310,8 @@ class WorkerTest(ZulipTestCase):
dict(
message='\xf3test',
time=time.time(),
- rcpt_to=stream_to_address
- )
+ rcpt_to=stream_to_address,
+ ),
] * 3
for element in data:
fake_client.queue.append(('email_mirror', element))
@@ -337,8 +337,8 @@ class WorkerTest(ZulipTestCase):
dict(
message='\xf3test',
time=time.time(),
- rcpt_to=stream_to_address
- )
+ rcpt_to=stream_to_address,
+ ),
] * 5
for element in data:
fake_client.queue.append(('email_mirror', element))
@@ -364,7 +364,7 @@ class WorkerTest(ZulipTestCase):
event = dict(
message='\xf3test',
time=time.time(),
- rcpt_to=address
+ rcpt_to=address,
)
fake_client.queue.append(('email_mirror', event))
worker.start()
@@ -397,7 +397,7 @@ class WorkerTest(ZulipTestCase):
'to_emails': [self.example_email("hamlet")],
'from_name': 'Zulip Account Security',
'from_address': FromAddress.NOREPLY,
- 'context': {}
+ 'context': {},
}
fake_client.queue.append(('email_senders', data))
diff --git a/zerver/tests/test_rate_limiter.py b/zerver/tests/test_rate_limiter.py
index b248c24aef..7afa2379f4 100644
--- a/zerver/tests/test_rate_limiter.py
+++ b/zerver/tests/test_rate_limiter.py
@@ -86,7 +86,7 @@ class RateLimiterBackendBase(ZulipTestCase):
raise NotImplementedError()
def test_hit_ratelimits(self) -> None:
- obj = self.create_object('test', [(2, 3), ])
+ obj = self.create_object('test', [(2, 3)])
start_time = time.time()
for i in range(3):
@@ -100,7 +100,7 @@ class RateLimiterBackendBase(ZulipTestCase):
self.make_request(obj, expect_ratelimited=False)
def test_clear_history(self) -> None:
- obj = self.create_object('test', [(2, 3), ])
+ obj = self.create_object('test', [(2, 3)])
start_time = time.time()
for i in range(3):
with mock.patch('time.time', return_value=(start_time + i * 0.1)):
@@ -115,7 +115,7 @@ class RateLimiterBackendBase(ZulipTestCase):
self.make_request(obj, expect_ratelimited=False)
def test_block_unblock_access(self) -> None:
- obj = self.create_object('test', [(2, 5), ])
+ obj = self.create_object('test', [(2, 5)])
start_time = time.time()
obj.block_access(1)
@@ -161,7 +161,7 @@ class RedisRateLimiterBackendTest(RateLimiterBackendBase):
inside redis, so we're not able to mock the timer. Making the test
sleep for 1s is also too costly to be worth it.
"""
- obj = self.create_object('test', [(2, 5), ])
+ obj = self.create_object('test', [(2, 5)])
obj.block_access(1)
self.make_request(obj, expect_ratelimited=True, verify_api_calls_left=False)
@@ -192,7 +192,7 @@ class TornadoInMemoryRateLimiterBackendTest(RateLimiterBackendBase):
self.assertEqual(obj.backend, RedisRateLimiterBackend)
def test_block_access(self) -> None:
- obj = self.create_object('test', [(2, 5), ])
+ obj = self.create_object('test', [(2, 5)])
start_time = time.time()
obj.block_access(1)
@@ -217,13 +217,13 @@ class RateLimitedObjectsTest(ZulipTestCase):
add_ratelimit_rule(10, 100, domain='some_new_domain')
obj = RateLimitedUser(user_profile)
- self.assertEqual(obj.get_rules(), [(1, 2), ])
+ self.assertEqual(obj.get_rules(), [(1, 2)])
obj.domain = 'some_new_domain'
self.assertEqual(obj.get_rules(), [(4, 5), (10, 100)])
remove_ratelimit_rule(10, 100, domain='some_new_domain')
- self.assertEqual(obj.get_rules(), [(4, 5), ])
+ self.assertEqual(obj.get_rules(), [(4, 5)])
def test_empty_rules_edge_case(self) -> None:
obj = RateLimitedTestObject("test", rules=[], backend=RedisRateLimiterBackend)
- self.assertEqual(obj.get_rules(), [(1, 9999), ])
+ self.assertEqual(obj.get_rules(), [(1, 9999)])
diff --git a/zerver/tests/test_reactions.py b/zerver/tests/test_reactions.py
index 528fe087fa..9e1ad910ee 100644
--- a/zerver/tests/test_reactions.py
+++ b/zerver/tests/test_reactions.py
@@ -18,7 +18,7 @@ class ReactionEmojiTest(ZulipTestCase):
"""
sender = self.example_user("hamlet")
reaction_info = {
- 'emoji_name': ''
+ 'emoji_name': '',
}
result = self.api_post(sender, '/api/v1/messages/1/reactions',
@@ -31,7 +31,7 @@ class ReactionEmojiTest(ZulipTestCase):
"""
sender = self.example_user("hamlet")
reaction_info = {
- 'emoji_name': 'foo'
+ 'emoji_name': 'foo',
}
result = self.api_post(sender, '/api/v1/messages/1/reactions',
@@ -48,7 +48,7 @@ class ReactionEmojiTest(ZulipTestCase):
sender = self.example_user("hamlet")
reaction_info = {
'emoji_name': 'green_tick',
- 'reaction_type': 'realm_emoji'
+ 'reaction_type': 'realm_emoji',
}
result = self.api_post(sender, '/api/v1/messages/1/reactions',
@@ -61,7 +61,7 @@ class ReactionEmojiTest(ZulipTestCase):
"""
sender = self.example_user("hamlet")
reaction_info = {
- 'emoji_name': 'smile'
+ 'emoji_name': 'smile',
}
base_query = Reaction.objects.filter(user_profile=sender,
@@ -86,7 +86,7 @@ class ReactionEmojiTest(ZulipTestCase):
"""
sender = self.example_user("hamlet")
reaction_info = {
- 'emoji_name': 'smile'
+ 'emoji_name': 'smile',
}
result = self.api_post(sender, '/api/v1/messages/1/reactions',
reaction_info)
@@ -103,9 +103,9 @@ class ReactionEmojiTest(ZulipTestCase):
'user': {
'email': 'user10@zulip.testserver',
'id': 10,
- 'full_name': 'King Hamlet'
+ 'full_name': 'King Hamlet',
},
- 'user_id': 10
+ 'user_id': 10,
}]
self.assertEqual(expected_reaction_data, message['reactions'])
@@ -116,7 +116,7 @@ class ReactionEmojiTest(ZulipTestCase):
sender = self.example_user("hamlet")
reaction_info = {
'emoji_name': 'zulip',
- 'reaction_type': 'zulip_extra_emoji'
+ 'reaction_type': 'zulip_extra_emoji',
}
base_query = Reaction.objects.filter(user_profile=sender,
emoji_name=reaction_info['emoji_name'])
@@ -151,7 +151,7 @@ class ReactionEmojiTest(ZulipTestCase):
# Have hamlet react to the message
reaction_info = {
- 'emoji_name': 'smile'
+ 'emoji_name': 'smile',
}
result = self.api_post(sender, f'/api/v1/messages/{message_id}/reactions',
@@ -172,7 +172,7 @@ class ReactionEmojiTest(ZulipTestCase):
reaction_info = {
'emoji_name': 'green_tick',
- 'reaction_type': 'realm_emoji'
+ 'reaction_type': 'realm_emoji',
}
result = self.api_post(sender, '/api/v1/messages/1/reactions',
@@ -241,7 +241,7 @@ class ReactionMessageIDTest(ZulipTestCase):
"""
sender = self.example_user("hamlet")
reaction_info = {
- 'emoji_name': 'smile'
+ 'emoji_name': 'smile',
}
result = self.api_post(sender, '/api/v1/messages//reactions',
@@ -254,7 +254,7 @@ class ReactionMessageIDTest(ZulipTestCase):
"""
sender = self.example_user("hamlet")
reaction_info = {
- 'emoji_name': 'smile'
+ 'emoji_name': 'smile',
}
result = self.api_post(sender, '/api/v1/messages/-1/reactions',
@@ -276,7 +276,7 @@ class ReactionMessageIDTest(ZulipTestCase):
self.assert_json_success(result)
pm_id = result.json()['id']
reaction_info = {
- 'emoji_name': 'smile'
+ 'emoji_name': 'smile',
}
result = self.api_post(reaction_sender, f'/api/v1/messages/{pm_id}/reactions',
@@ -302,7 +302,7 @@ class ReactionTest(ZulipTestCase):
pm_id = content['id']
reaction_info = {
- 'emoji_name': 'smile'
+ 'emoji_name': 'smile',
}
first = self.api_post(reaction_sender, f'/api/v1/messages/{pm_id}/reactions',
@@ -330,7 +330,7 @@ class ReactionTest(ZulipTestCase):
content = ujson.loads(pm.content)
pm_id = content['id']
reaction_info = {
- 'emoji_name': 'smile'
+ 'emoji_name': 'smile',
}
add = self.api_post(reaction_sender, f'/api/v1/messages/{pm_id}/reactions',
@@ -356,7 +356,7 @@ class ReactionTest(ZulipTestCase):
reaction_info = {
'emoji_name': 'smile',
'emoji_code': emoji_code,
- 'reaction_type': reaction_type
+ 'reaction_type': reaction_type,
}
result = self.api_post(sender, '/api/v1/messages/1/reactions', reaction_info)
@@ -377,7 +377,7 @@ class ReactionTest(ZulipTestCase):
reaction_info = {
'emoji_name': 'green_tick',
'emoji_code': str(emoji.id),
- 'reaction_type': 'realm_emoji'
+ 'reaction_type': 'realm_emoji',
}
result = self.api_post(sender, '/api/v1/messages/1/reactions', reaction_info)
@@ -409,7 +409,7 @@ class ReactionEventTest(ZulipTestCase):
expected_recipient_ids = {pm_sender.id, pm_recipient.id}
reaction_info = {
- 'emoji_name': 'smile'
+ 'emoji_name': 'smile',
}
events: List[Mapping[str, Any]] = []
@@ -449,7 +449,7 @@ class ReactionEventTest(ZulipTestCase):
expected_recipient_ids = {pm_sender.id, pm_recipient.id}
reaction_info = {
- 'emoji_name': 'smile'
+ 'emoji_name': 'smile',
}
add = self.api_post(reaction_sender, f'/api/v1/messages/{pm_id}/reactions',
@@ -591,7 +591,7 @@ class DefaultEmojiReactionTests(EmojiReactionBase):
def test_add_reaction_by_name(self) -> None:
reaction_info = {
- 'emoji_name': '+1'
+ 'emoji_name': '+1',
}
result = self.post_reaction(reaction_info)
self.assert_json_success(result)
@@ -602,7 +602,7 @@ class DefaultEmojiReactionTests(EmojiReactionBase):
message=message,
emoji_name=reaction_info['emoji_name'],
emoji_code='1f44d',
- reaction_type='unicode_emoji').exists()
+ reaction_type='unicode_emoji').exists(),
)
def test_preserve_non_canonical_name(self) -> None:
@@ -683,7 +683,7 @@ class DefaultEmojiReactionTests(EmojiReactionBase):
)
reaction_info = {
- 'emoji_name': '+1'
+ 'emoji_name': '+1',
}
result = self.delete_reaction(reaction_info)
self.assert_json_success(result)
@@ -692,7 +692,7 @@ class DefaultEmojiReactionTests(EmojiReactionBase):
message=message,
emoji_name=reaction_info['emoji_name'],
emoji_code='1f44d',
- reaction_type='unicode_emoji').exists()
+ reaction_type='unicode_emoji').exists(),
)
def test_react_historical(self) -> None:
diff --git a/zerver/tests/test_realm.py b/zerver/tests/test_realm.py
index 51d5ab71c2..89a514cceb 100644
--- a/zerver/tests/test_realm.py
+++ b/zerver/tests/test_realm.py
@@ -15,7 +15,7 @@ from zerver.lib.actions import (
do_create_realm,
do_scrub_realm,
do_change_plan_type,
- do_send_realm_reactivation_email
+ do_send_realm_reactivation_email,
)
from confirmation.models import create_confirmation_link, Confirmation
@@ -521,7 +521,7 @@ class RealmTest(ZulipTestCase):
"Invalid %(field_name)s" % dict(field_name=val_name),
"Bad value for '%(field_name)s'" % dict(field_name=val_name),
"Bad value for '%(field_name)s': %(value)s" % dict(field_name=val_name, value=invalid_val),
- "Invalid %(field_name)s %(value)s" % dict(field_name=val_name, value=invalid_val)
+ "Invalid %(field_name)s %(value)s" % dict(field_name=val_name, value=invalid_val),
}
req = {val_name: invalid_val}
@@ -711,11 +711,11 @@ class RealmAPITest(ZulipTestCase):
video_chat_provider=[
dict(
video_chat_provider=ujson.dumps(Realm.VIDEO_CHAT_PROVIDERS['google_hangouts']['id']),
- google_hangouts_domain=ujson.dumps('zulip.com')
+ google_hangouts_domain=ujson.dumps('zulip.com'),
),
dict(
video_chat_provider=ujson.dumps(Realm.VIDEO_CHAT_PROVIDERS['jitsi_meet']['id']),
- )
+ ),
],
google_hangouts_domain=['zulip.com', 'zulip.org'],
)
diff --git a/zerver/tests/test_realm_emoji.py b/zerver/tests/test_realm_emoji.py
index 43430d25e2..0a672339c7 100644
--- a/zerver/tests/test_realm_emoji.py
+++ b/zerver/tests/test_realm_emoji.py
@@ -86,7 +86,7 @@ class RealmEmojiTest(ZulipTestCase):
file_name = str(realm_emoji.id) + '.png'
self.assertEqual(
str(realm_emoji),
- f''
+ f'',
)
def test_upload_exception(self) -> None:
diff --git a/zerver/tests/test_redis_utils.py b/zerver/tests/test_redis_utils.py
index 06b33c2a7e..db15268f61 100644
--- a/zerver/tests/test_redis_utils.py
+++ b/zerver/tests/test_redis_utils.py
@@ -16,7 +16,7 @@ class RedisUtilsTest(ZulipTestCase):
def test_put_and_get_data(self) -> None:
data = {
"a": 1,
- "b": "some value"
+ "b": "some value",
}
key = put_dict_in_redis(self.redis_client, self.key_format, data,
expiration_seconds=self.expiration_seconds)
@@ -26,7 +26,7 @@ class RedisUtilsTest(ZulipTestCase):
def test_put_data_key_length_check(self) -> None:
data = {
"a": 1,
- "b": "some value"
+ "b": "some value",
}
max_valid_token_length = MAX_KEY_LENGTH - (len(self.key_format) - len('{token}'))
diff --git a/zerver/tests/test_report.py b/zerver/tests/test_report.py
index 9250a4a3c6..714e70adfe 100644
--- a/zerver/tests/test_report.py
+++ b/zerver/tests/test_report.py
@@ -112,7 +112,7 @@ class TestReport(ZulipTestCase):
publish_mock = mock.patch('zerver.views.report.queue_json_publish')
subprocess_mock = mock.patch(
'zerver.views.report.subprocess.check_output',
- side_effect=KeyError('foo')
+ side_effect=KeyError('foo'),
)
with publish_mock as m, subprocess_mock:
result = self.client_post("/json/report/error", params)
diff --git a/zerver/tests/test_retention.py b/zerver/tests/test_retention.py
index 28a1199230..056909aec8 100644
--- a/zerver/tests/test_retention.py
+++ b/zerver/tests/test_retention.py
@@ -36,12 +36,12 @@ class RetentionTestingBase(ZulipTestCase):
expected_usermessage_ids: List[int]) -> None:
self.assertEqual(
set(ArchivedMessage.objects.values_list('id', flat=True)),
- set(expected_message_ids)
+ set(expected_message_ids),
)
self.assertEqual(
set(ArchivedUserMessage.objects.values_list('id', flat=True)),
- set(expected_usermessage_ids)
+ set(expected_usermessage_ids),
)
# Archived Messages and UserMessages should have been removed from the normal tables:
@@ -53,23 +53,23 @@ class RetentionTestingBase(ZulipTestCase):
# Check that the data was restored:
self.assertEqual(
set(Message.objects.filter(id__in=expected_message_ids).values_list('id', flat=True)),
- set(expected_message_ids)
+ set(expected_message_ids),
)
self.assertEqual(
set(UserMessage.objects.filter(id__in=expected_usermessage_ids).values_list('id', flat=True)),
- set(expected_usermessage_ids)
+ set(expected_usermessage_ids),
)
# The Messages and UserMessages should still be in the archive - we don't delete them.
self.assertEqual(
set(ArchivedMessage.objects.values_list('id', flat=True)),
- set(expected_message_ids)
+ set(expected_message_ids),
)
self.assertEqual(
set(ArchivedUserMessage.objects.values_list('id', flat=True)),
- set(expected_usermessage_ids)
+ set(expected_usermessage_ids),
)
class ArchiveMessagesTestingBase(RetentionTestingBase):
@@ -124,7 +124,7 @@ class ArchiveMessagesTestingBase(RetentionTestingBase):
sender__realm=self.zulip_realm).values_list('id', flat=True)[3:3 + message_quantity])
self._change_messages_date_sent(
msg_ids,
- timezone_now() - timedelta(ZULIP_REALM_DAYS+1)
+ timezone_now() - timedelta(ZULIP_REALM_DAYS+1),
)
return msg_ids
@@ -137,7 +137,7 @@ class ArchiveMessagesTestingBase(RetentionTestingBase):
dummy_files = [
('zulip.txt', f'{realm_id}/31/4CBjtTLYZhk66pZrF8hnYGwc/zulip.txt', sample_size),
('temp_file.py', f'{realm_id}/31/4CBjtTLYZhk66pZrF8hnYGwc/temp_file.py', sample_size),
- ('abc.py', f'{realm_id}/31/4CBjtTLYZhk66pZrF8hnYGwc/abc.py', sample_size)
+ ('abc.py', f'{realm_id}/31/4CBjtTLYZhk66pZrF8hnYGwc/abc.py', sample_size),
]
for file_name, path_id, size in dummy_files:
@@ -170,7 +170,7 @@ class TestArchiveMessagesGeneral(ArchiveMessagesTestingBase):
# Make some expired messages in MIT:
expired_mit_msg_ids = self._make_mit_messages(
5,
- timezone_now() - timedelta(days=MIT_REALM_DAYS+1)
+ timezone_now() - timedelta(days=MIT_REALM_DAYS+1),
)
# Make some non-expired messages in MIT:
self._make_mit_messages(4, timezone_now() - timedelta(days=MIT_REALM_DAYS-1))
@@ -180,7 +180,7 @@ class TestArchiveMessagesGeneral(ArchiveMessagesTestingBase):
sender__realm=self.zulip_realm).values_list('id', flat=True)[3:10])
self._change_messages_date_sent(
expired_zulip_msg_ids,
- timezone_now() - timedelta(ZULIP_REALM_DAYS+1)
+ timezone_now() - timedelta(ZULIP_REALM_DAYS+1),
)
expired_msg_ids = expired_mit_msg_ids + expired_zulip_msg_ids
@@ -199,7 +199,7 @@ class TestArchiveMessagesGeneral(ArchiveMessagesTestingBase):
# Make some expired messages in MIT:
expired_mit_msg_ids = self._make_mit_messages(
5,
- timezone_now() - timedelta(days=MIT_REALM_DAYS+1)
+ timezone_now() - timedelta(days=MIT_REALM_DAYS+1),
)
# Make some non-expired messages in MIT:
self._make_mit_messages(4, timezone_now() - timedelta(days=MIT_REALM_DAYS-1))
@@ -210,7 +210,7 @@ class TestArchiveMessagesGeneral(ArchiveMessagesTestingBase):
sender__realm=self.zulip_realm).values_list('id', flat=True)[3:10])
self._change_messages_date_sent(
zulip_msg_ids,
- timezone_now() - timedelta(ZULIP_REALM_DAYS+1)
+ timezone_now() - timedelta(ZULIP_REALM_DAYS+1),
)
# Only MIT has a retention policy:
@@ -277,11 +277,11 @@ class TestArchiveMessagesGeneral(ArchiveMessagesTestingBase):
self.assertEqual(
set(Message.objects.filter(id__in=expired_msg_ids).values_list('id', flat=True)),
- set(expired_msg_ids)
+ set(expired_msg_ids),
)
self.assertEqual(
set(UserMessage.objects.filter(id__in=expired_usermsg_ids).values_list('id', flat=True)),
- set(expired_usermsg_ids)
+ set(expired_usermsg_ids),
)
def test_archive_message_tool(self) -> None:
@@ -290,7 +290,7 @@ class TestArchiveMessagesGeneral(ArchiveMessagesTestingBase):
# Make some expired messages in MIT:
expired_mit_msg_ids = self._make_mit_messages(
5,
- timezone_now() - timedelta(days=MIT_REALM_DAYS+1)
+ timezone_now() - timedelta(days=MIT_REALM_DAYS+1),
)
# Make some non-expired messages in MIT:
self._make_mit_messages(4, timezone_now() - timedelta(days=MIT_REALM_DAYS-1))
@@ -302,7 +302,7 @@ class TestArchiveMessagesGeneral(ArchiveMessagesTestingBase):
# Make the message expired in the recipient's realm:
self._change_messages_date_sent(
[expired_crossrealm_msg_id],
- timezone_now() - timedelta(ZULIP_REALM_DAYS+1)
+ timezone_now() - timedelta(ZULIP_REALM_DAYS+1),
)
expired_msg_ids = expired_mit_msg_ids + expired_zulip_msg_ids + [expired_crossrealm_msg_id]
@@ -329,7 +329,7 @@ class TestArchiveMessagesGeneral(ArchiveMessagesTestingBase):
self.assertEqual(
list(ArchivedAttachment.objects.distinct('messages__id').values_list('messages__id',
flat=True)),
- [msgs_ids['expired_message_id']]
+ [msgs_ids['expired_message_id']],
)
self.assertEqual(Attachment.objects.count(), 3)
@@ -352,7 +352,7 @@ class TestArchiveMessagesGeneral(ArchiveMessagesTestingBase):
self.assertEqual(
list(ArchivedAttachment.objects.distinct('messages__id').order_by('messages__id').values_list(
'messages__id', flat=True)),
- sorted(msgs_ids.values())
+ sorted(msgs_ids.values()),
)
restore_all_data_from_archive()
@@ -362,13 +362,13 @@ class TestArchiveMessagesGeneral(ArchiveMessagesTestingBase):
self.assertEqual(
list(Attachment.objects.distinct('messages__id').order_by('messages__id').values_list(
'messages__id', flat=True)),
- sorted(msgs_ids.values())
+ sorted(msgs_ids.values()),
)
def test_restoring_and_rearchiving(self) -> None:
expired_msg_ids = self._make_mit_messages(
7,
- timezone_now() - timedelta(days=MIT_REALM_DAYS+1)
+ timezone_now() - timedelta(days=MIT_REALM_DAYS+1),
)
expired_usermsg_ids = self._get_usermessage_ids(expired_msg_ids)
@@ -406,14 +406,14 @@ class TestArchivingSubMessages(ArchiveMessagesTestingBase):
sender_id=cordelia.id,
message_id=expired_msg_ids[0],
msg_type='whatever',
- content='{"name": "alice", "salary": 20}'
+ content='{"name": "alice", "salary": 20}',
)
do_add_submessage(
realm=self.zulip_realm,
sender_id=hamlet.id,
message_id=expired_msg_ids[0],
msg_type='whatever',
- content='{"name": "john", "salary": 30}'
+ content='{"name": "john", "salary": 30}',
)
do_add_submessage(
@@ -421,11 +421,11 @@ class TestArchivingSubMessages(ArchiveMessagesTestingBase):
sender_id=cordelia.id,
message_id=expired_msg_ids[1],
msg_type='whatever',
- content='{"name": "jack", "salary": 10}'
+ content='{"name": "jack", "salary": 10}',
)
submessage_ids = list(
- SubMessage.objects.filter(message_id__in=expired_msg_ids).values_list('id', flat=True)
+ SubMessage.objects.filter(message_id__in=expired_msg_ids).values_list('id', flat=True),
)
self.assertEqual(len(submessage_ids), 3)
@@ -435,13 +435,13 @@ class TestArchivingSubMessages(ArchiveMessagesTestingBase):
self.assertEqual(
set(ArchivedSubMessage.objects.filter(id__in=submessage_ids).values_list('id', flat=True)),
- set(submessage_ids)
+ set(submessage_ids),
)
restore_all_data_from_archive()
self.assertEqual(
set(SubMessage.objects.filter(id__in=submessage_ids).values_list('id', flat=True)),
- set(submessage_ids)
+ set(submessage_ids),
)
class TestArchivingReactions(ArchiveMessagesTestingBase, EmojiReactionBase):
@@ -454,7 +454,7 @@ class TestArchivingReactions(ArchiveMessagesTestingBase, EmojiReactionBase):
self.post_zulip_reaction(expired_msg_ids[1], 'hamlet')
reaction_ids = list(
- Reaction.objects.filter(message_id__in=expired_msg_ids).values_list('id', flat=True)
+ Reaction.objects.filter(message_id__in=expired_msg_ids).values_list('id', flat=True),
)
self.assertEqual(len(reaction_ids), 3)
@@ -464,13 +464,13 @@ class TestArchivingReactions(ArchiveMessagesTestingBase, EmojiReactionBase):
self.assertEqual(
set(ArchivedReaction.objects.filter(id__in=reaction_ids).values_list('id', flat=True)),
- set(reaction_ids)
+ set(reaction_ids),
)
restore_all_data_from_archive()
self.assertEqual(
set(Reaction.objects.filter(id__in=reaction_ids).values_list('id', flat=True)),
- set(reaction_ids)
+ set(reaction_ids),
)
class MoveMessageToArchiveBase(RetentionTestingBase):
@@ -487,7 +487,7 @@ class MoveMessageToArchiveBase(RetentionTestingBase):
('temp_file.py', f'{realm_id}/31/4CBjtTLYZhk66pZrF8hnYGwc/temp_file.py', sample_size),
('abc.py', f'{realm_id}/31/4CBjtTLYZhk66pZrF8hnYGwc/abc.py', sample_size),
('hello.txt', f'{realm_id}/31/4CBjtTLYZhk66pZrF8hnYGwc/hello.txt', sample_size),
- ('new.py', f'{realm_id}/31/4CBjtTLYZhk66pZrF8hnYGwc/new.py', sample_size)
+ ('new.py', f'{realm_id}/31/4CBjtTLYZhk66pZrF8hnYGwc/new.py', sample_size),
]
user_profile = self.example_user('hamlet')
for file_name, path_id, size in dummy_files:
@@ -590,16 +590,16 @@ class MoveMessageToArchiveGeneral(MoveMessageToArchiveBase):
msg_ids = [
self.send_personal_message(self.sender, self.recipient, body1),
- self.send_personal_message(self.sender, self.recipient, body2)
+ self.send_personal_message(self.sender, self.recipient, body2),
]
attachment_id_to_message_ids: Dict[int, List[int]] = {}
attachment_ids = list(
- Attachment.objects.filter(messages__id__in=msg_ids).values_list("id", flat=True)
+ Attachment.objects.filter(messages__id__in=msg_ids).values_list("id", flat=True),
)
for attachment_id in attachment_ids:
attachment_id_to_message_ids[attachment_id] = list(
- Message.objects.filter(attachment__id=attachment_id).values_list("id", flat=True)
+ Message.objects.filter(attachment__id=attachment_id).values_list("id", flat=True),
)
usermsg_ids = self._get_usermessage_ids(msg_ids)
@@ -610,7 +610,7 @@ class MoveMessageToArchiveGeneral(MoveMessageToArchiveBase):
self.assertFalse(Attachment.objects.exists())
archived_attachment_ids = list(
- ArchivedAttachment.objects.filter(messages__id__in=msg_ids).values_list("id", flat=True)
+ ArchivedAttachment.objects.filter(messages__id__in=msg_ids).values_list("id", flat=True),
)
self.assertEqual(set(attachment_ids), set(archived_attachment_ids))
@@ -618,21 +618,21 @@ class MoveMessageToArchiveGeneral(MoveMessageToArchiveBase):
self.assertEqual(
set(attachment_id_to_message_ids[attachment_id]),
set(ArchivedMessage.objects.filter(
- archivedattachment__id=attachment_id).values_list("id", flat=True))
+ archivedattachment__id=attachment_id).values_list("id", flat=True)),
)
restore_all_data_from_archive()
self._verify_restored_data(msg_ids, usermsg_ids)
restored_attachment_ids = list(
- Attachment.objects.filter(messages__id__in=msg_ids).values_list("id", flat=True)
+ Attachment.objects.filter(messages__id__in=msg_ids).values_list("id", flat=True),
)
self.assertEqual(set(attachment_ids), set(restored_attachment_ids))
for attachment_id in restored_attachment_ids:
self.assertEqual(
set(attachment_id_to_message_ids[attachment_id]),
- set(Message.objects.filter(attachment__id=attachment_id).values_list("id", flat=True))
+ set(Message.objects.filter(attachment__id=attachment_id).values_list("id", flat=True)),
)
def test_archiving_message_with_shared_attachment(self) -> None:
@@ -658,7 +658,7 @@ class MoveMessageToArchiveGeneral(MoveMessageToArchiveBase):
usermsg_ids = self._get_usermessage_ids([msg_id])
attachment_ids = list(
- Attachment.objects.filter(messages__id=msg_id).values_list("id", flat=True)
+ Attachment.objects.filter(messages__id=msg_id).values_list("id", flat=True),
)
self._assert_archive_empty()
@@ -670,7 +670,7 @@ class MoveMessageToArchiveGeneral(MoveMessageToArchiveBase):
self.assertEqual(
set(ArchivedAttachment.objects.filter(messages__id=msg_id).values_list("id", flat=True)),
- set(attachment_ids)
+ set(attachment_ids),
)
# Restore the first message:
@@ -689,7 +689,7 @@ class MoveMessageToArchiveGeneral(MoveMessageToArchiveBase):
restore_all_data_from_archive()
self.assertEqual(
set(Attachment.objects.filter(messages__id=msg_id).values_list("id", flat=True)),
- set(attachment_ids)
+ set(attachment_ids),
)
class MoveMessageToArchiveWithSubMessages(MoveMessageToArchiveBase):
@@ -703,18 +703,18 @@ class MoveMessageToArchiveWithSubMessages(MoveMessageToArchiveBase):
sender_id=cordelia.id,
message_id=msg_id,
msg_type='whatever',
- content='{"name": "alice", "salary": 20}'
+ content='{"name": "alice", "salary": 20}',
)
do_add_submessage(
realm=get_realm('zulip'),
sender_id=hamlet.id,
message_id=msg_id,
msg_type='whatever',
- content='{"name": "john", "salary": 30}'
+ content='{"name": "john", "salary": 30}',
)
submessage_ids = list(
- SubMessage.objects.filter(message_id=msg_id).values_list('id', flat=True)
+ SubMessage.objects.filter(message_id=msg_id).values_list('id', flat=True),
)
self.assertEqual(SubMessage.objects.filter(id__in=submessage_ids).count(), 2)
@@ -722,14 +722,14 @@ class MoveMessageToArchiveWithSubMessages(MoveMessageToArchiveBase):
self.assertEqual(
set(ArchivedSubMessage.objects.filter(message_id=msg_id).values_list("id", flat=True)),
- set(submessage_ids)
+ set(submessage_ids),
)
self.assertEqual(SubMessage.objects.filter(id__in=submessage_ids).count(), 0)
restore_all_data_from_archive()
self.assertEqual(
set(SubMessage.objects.filter(id__in=submessage_ids).values_list('id', flat=True)),
- set(submessage_ids)
+ set(submessage_ids),
)
class MoveMessageToArchiveWithReactions(MoveMessageToArchiveBase, EmojiReactionBase):
@@ -740,7 +740,7 @@ class MoveMessageToArchiveWithReactions(MoveMessageToArchiveBase, EmojiReactionB
self.post_zulip_reaction(msg_id, 'cordelia')
reaction_ids = list(
- Reaction.objects.filter(message_id=msg_id).values_list('id', flat=True)
+ Reaction.objects.filter(message_id=msg_id).values_list('id', flat=True),
)
self.assertEqual(Reaction.objects.filter(id__in=reaction_ids).count(), 2)
@@ -748,14 +748,14 @@ class MoveMessageToArchiveWithReactions(MoveMessageToArchiveBase, EmojiReactionB
self.assertEqual(
set(ArchivedReaction.objects.filter(message_id=msg_id).values_list("id", flat=True)),
- set(reaction_ids)
+ set(reaction_ids),
)
self.assertEqual(Reaction.objects.filter(id__in=reaction_ids).count(), 0)
restore_all_data_from_archive()
self.assertEqual(
set(Reaction.objects.filter(id__in=reaction_ids).values_list('id', flat=True)),
- set(reaction_ids)
+ set(reaction_ids),
)
class TestCleaningArchive(ArchiveMessagesTestingBase):
@@ -905,7 +905,7 @@ class TestDoDeleteMessages(ZulipTestCase):
'sender_id': message.sender_id,
'message_id': message.id,
'message_type': "private",
- 'recipient_id': message.recipient_id
+ 'recipient_id': message.recipient_id,
}
move_messages_to_archive([message_id])
# We only send the event to see no exception is thrown - as it would be if the block
diff --git a/zerver/tests/test_service_bot_system.py b/zerver/tests/test_service_bot_system.py
index d5985aeecf..8867ef75d2 100644
--- a/zerver/tests/test_service_bot_system.py
+++ b/zerver/tests/test_service_bot_system.py
@@ -258,14 +258,14 @@ class TestServiceBotStateHandler(ZulipTestCase):
# Store some data.
initial_dict = {'key 1': 'value 1', 'key 2': 'value 2', 'key 3': 'value 3'}
params = {
- 'storage': ujson.dumps(initial_dict)
+ 'storage': ujson.dumps(initial_dict),
}
result = self.client_put('/json/bot_storage', params)
self.assert_json_success(result)
# Assert the stored data for some keys.
params = {
- 'keys': ujson.dumps(['key 1', 'key 3'])
+ 'keys': ujson.dumps(['key 1', 'key 3']),
}
result = self.client_get('/json/bot_storage', params)
self.assert_json_success(result)
@@ -279,7 +279,7 @@ class TestServiceBotStateHandler(ZulipTestCase):
# Store some more data; update an entry and store a new entry
dict_update = {'key 1': 'new value', 'key 4': 'value 4'}
params = {
- 'storage': ujson.dumps(dict_update)
+ 'storage': ujson.dumps(dict_update),
}
result = self.client_put('/json/bot_storage', params)
self.assert_json_success(result)
@@ -293,19 +293,19 @@ class TestServiceBotStateHandler(ZulipTestCase):
# Assert errors on invalid requests.
params = {
- 'keys': ["This is a list, but should be a serialized string."] # type: ignore[dict-item] # Ignore 'incompatible type "str": "List[str]"; expected "str": "str"' for testing
+ 'keys': ["This is a list, but should be a serialized string."], # type: ignore[dict-item] # Ignore 'incompatible type "str": "List[str]"; expected "str": "str"' for testing
}
result = self.client_get('/json/bot_storage', params)
self.assert_json_error(result, 'Argument "keys" is not valid JSON.')
params = {
- 'keys': ujson.dumps(["key 1", "nonexistent key"])
+ 'keys': ujson.dumps(["key 1", "nonexistent key"]),
}
result = self.client_get('/json/bot_storage', params)
self.assert_json_error(result, "Key does not exist.")
params = {
- 'storage': ujson.dumps({'foo': [1, 2, 3]})
+ 'storage': ujson.dumps({'foo': [1, 2, 3]}),
}
result = self.client_put('/json/bot_storage', params)
self.assert_json_error(result, "Value type is , but should be str.")
@@ -313,7 +313,7 @@ class TestServiceBotStateHandler(ZulipTestCase):
# Remove some entries.
keys_to_remove = ['key 1', 'key 2']
params = {
- 'keys': ujson.dumps(keys_to_remove)
+ 'keys': ujson.dumps(keys_to_remove),
}
result = self.client_delete('/json/bot_storage', params)
self.assert_json_success(result)
@@ -327,7 +327,7 @@ class TestServiceBotStateHandler(ZulipTestCase):
# Try to remove an existing and a nonexistent key.
params = {
- 'keys': ujson.dumps(['key 3', 'nonexistent key'])
+ 'keys': ujson.dumps(['key 3', 'nonexistent key']),
}
result = self.client_delete('/json/bot_storage', params)
self.assert_json_error(result, "Key does not exist.")
diff --git a/zerver/tests/test_sessions.py b/zerver/tests/test_sessions.py
index 57201903ed..9b4daf3294 100644
--- a/zerver/tests/test_sessions.py
+++ b/zerver/tests/test_sessions.py
@@ -14,7 +14,7 @@ from zerver.lib.sessions import (
)
from zerver.models import (
- get_realm, Realm, UserProfile
+ get_realm, Realm, UserProfile,
)
from zerver.lib.test_classes import ZulipTestCase
diff --git a/zerver/tests/test_settings.py b/zerver/tests/test_settings.py
index e42516bd69..4b70aa01d0 100644
--- a/zerver/tests/test_settings.py
+++ b/zerver/tests/test_settings.py
@@ -13,7 +13,7 @@ from zerver.lib.users import get_all_api_keys
from zerver.lib.rate_limiter import add_ratelimit_rule, remove_ratelimit_rule
from zerver.models import (
UserProfile,
- get_user_profile_by_api_key
+ get_user_profile_by_api_key,
)
class ChangeSettingsTest(ZulipTestCase):
@@ -88,8 +88,8 @@ class ChangeSettingsTest(ZulipTestCase):
self.client.login(
username=user.delivery_email,
password='foobar1',
- realm=user.realm
- )
+ realm=user.realm,
+ ),
)
self.assert_logged_in_user_id(user.id)
@@ -314,7 +314,7 @@ class ChangeSettingsTest(ZulipTestCase):
"""
self.login('hamlet')
result = self.client_patch("/json/settings",
- dict(old_password='ignored',))
+ dict(old_password='ignored'))
self.assert_json_error(result, "Please fill out all fields.")
def do_test_change_user_display_setting(self, setting_name: str) -> None:
diff --git a/zerver/tests/test_signup.py b/zerver/tests/test_signup.py
index 66c55c6be4..242e007862 100644
--- a/zerver/tests/test_signup.py
+++ b/zerver/tests/test_signup.py
@@ -34,7 +34,7 @@ from zerver.models import (
CustomProfileFieldValue, DefaultStream, PreregistrationUser,
Realm, Recipient, Message, ScheduledEmail, UserProfile, UserMessage,
Stream, Subscription, flush_per_request_caches, get_system_bot,
- get_user_by_delivery_email
+ get_user_by_delivery_email,
)
from zerver.lib.actions import (
do_change_user_role,
@@ -105,7 +105,7 @@ class RedirectAndLogIntoSubdomainTestCase(ZulipTestCase):
# the email has an account at the subdomain,
# so is_signup get overridden to False:
'is_signup': False,
- 'multiuse_object_key': 'key'
+ 'multiuse_object_key': 'key',
})
data_dict = ExternalAuthDataDict(email=self.nonreg_email("alice"),
@@ -121,7 +121,7 @@ class RedirectAndLogIntoSubdomainTestCase(ZulipTestCase):
'full_name_validated': True,
'subdomain': realm.subdomain,
'is_signup': True,
- 'multiuse_object_key': 'key'
+ 'multiuse_object_key': 'key',
})
class DeactivationNoticeTestCase(ZulipTestCase):
@@ -196,7 +196,7 @@ class AddNewUserHistoryTest(ZulipTestCase):
# that weren't the race message are marked as unread.
latest_messages = UserMessage.objects.filter(
user_profile=user_profile,
- message__recipient__type=Recipient.STREAM
+ message__recipient__type=Recipient.STREAM,
).exclude(message_id=race_message_id).order_by('-message_id')[0:ONBOARDING_UNREAD_MESSAGES]
self.assertEqual(len(latest_messages), 2)
for msg in latest_messages:
@@ -205,7 +205,7 @@ class AddNewUserHistoryTest(ZulipTestCase):
# Verify that older messages are correctly marked as read.
older_messages = UserMessage.objects.filter(
user_profile=user_profile,
- message__recipient__type=Recipient.STREAM
+ message__recipient__type=Recipient.STREAM,
).exclude(message_id=race_message_id).order_by(
'-message_id')[ONBOARDING_UNREAD_MESSAGES:ONBOARDING_UNREAD_MESSAGES + 1]
self.assertTrue(len(older_messages) > 0)
@@ -1090,7 +1090,7 @@ class InviteUserTest(InviteUserBase):
second_msg = last_3_messages[1]
self.assertEqual(second_msg.sender.email, "notification-bot@zulip.com")
self.assertTrue(second_msg.content.startswith(
- f"alice_zulip.com <`{invitee_profile.email}`> accepted your"
+ f"alice_zulip.com <`{invitee_profile.email}`> accepted your",
))
# The second, from welcome-bot to the user who was invited.
@@ -1189,7 +1189,7 @@ earl-test@zulip.com""", ["Denmark"]))
self.assert_json_error(result, "We weren't able to invite anyone.")
self.assertFalse(
- PreregistrationUser.objects.filter(email__iexact=hamlet_email).exists()
+ PreregistrationUser.objects.filter(email__iexact=hamlet_email).exists(),
)
self.check_sent_emails([])
@@ -2456,7 +2456,7 @@ class UserSignUpTest(InviteUserBase):
smtp_mock = patch(
'zerver.views.registration.send_confirm_registration_email',
- side_effect=smtplib.SMTPException('uh oh')
+ side_effect=smtplib.SMTPException('uh oh'),
)
error_mock = patch('logging.error')
@@ -2479,7 +2479,7 @@ class UserSignUpTest(InviteUserBase):
smtp_mock = patch(
'zerver.views.registration.send_confirm_registration_email',
- side_effect=smtplib.SMTPException('uh oh')
+ side_effect=smtplib.SMTPException('uh oh'),
)
error_mock = patch('logging.error')
@@ -4050,7 +4050,7 @@ class ConfirmationKeyTest(ZulipTestCase):
def test_confirmation_key(self) -> None:
request = MagicMock()
request.session = {
- 'confirmation_key': {'confirmation_key': 'xyzzy'}
+ 'confirmation_key': {'confirmation_key': 'xyzzy'},
}
result = confirmation_key(request)
self.assert_json_success(result)
diff --git a/zerver/tests/test_slack_importer.py b/zerver/tests/test_slack_importer.py
index 2ba5f66c2f..3d9b5df545 100644
--- a/zerver/tests/test_slack_importer.py
+++ b/zerver/tests/test_slack_importer.py
@@ -39,7 +39,7 @@ from zerver.lib.test_classes import (
ZulipTestCase,
)
from zerver.lib.test_helpers import (
- get_test_image_file
+ get_test_image_file,
)
from zerver.lib.topic import (
EXPORT_TOPIC_NAME,
@@ -95,17 +95,17 @@ class SlackImporter(ZulipTestCase):
token = 'xoxp-invalid-token'
with self.assertRaises(Exception) as invalid:
get_slack_api_data(slack_user_list_url, "members", token=token)
- self.assertEqual(invalid.exception.args, ('Error accessing Slack API: invalid_auth',),)
+ self.assertEqual(invalid.exception.args, ('Error accessing Slack API: invalid_auth',))
with self.assertRaises(Exception) as invalid:
get_slack_api_data(slack_user_list_url, "members")
- self.assertEqual(invalid.exception.args, ('Slack token missing in kwargs',),)
+ self.assertEqual(invalid.exception.args, ('Slack token missing in kwargs',))
token = 'xoxp-status404'
wrong_url = "https://slack.com/api/wrong"
with self.assertRaises(Exception) as invalid:
get_slack_api_data(wrong_url, "members", token=token)
- self.assertEqual(invalid.exception.args, ('HTTP error accessing the Slack API.',),)
+ self.assertEqual(invalid.exception.args, ('HTTP error accessing the Slack API.',))
def test_build_zerver_realm(self) -> None:
realm_id = 2
@@ -163,9 +163,9 @@ class SlackImporter(ZulipTestCase):
data_file_mock.side_effect = [
[
{"name": "general", "members": ["U061A1R2R", "U061A5N1G"]},
- {"name": "sharedchannel", "members": ["U061A1R2R", "U061A3E0G"]}
+ {"name": "sharedchannel", "members": ["U061A1R2R", "U061A3E0G"]},
],
- []
+ [],
]
api_mock.side_effect = [
{"id": "U061A3E0G", "team_id": "T6LARQE2Z"},
@@ -201,7 +201,7 @@ class SlackImporter(ZulipTestCase):
call("https://slack.com/api/users.info", "user", token="token", user="U061A3E0G"),
call("https://slack.com/api/team.info", "team", token="token", team="T6LARQE2Z"),
call("https://slack.com/api/users.info", "user", token="token", user="U061A8H1G"),
- call("https://slack.com/api/team.info", "team", token="token", team="T7KJRQE8Y")
+ call("https://slack.com/api/team.info", "team", token="token", team="T7KJRQE8Y"),
]
api_mock.assert_has_calls(api_calls, any_order=True)
diff --git a/zerver/tests/test_slack_message_conversion.py b/zerver/tests/test_slack_message_conversion.py
index c3809c96de..11c6154590 100644
--- a/zerver/tests/test_slack_message_conversion.py
+++ b/zerver/tests/test_slack_message_conversion.py
@@ -1,6 +1,6 @@
from zerver.data_import.slack_message_conversion import (
convert_to_zulip_markdown,
- get_user_full_name
+ get_user_full_name,
)
from zerver.lib.test_classes import (
ZulipTestCase,
diff --git a/zerver/tests/test_soft_deactivation.py b/zerver/tests/test_soft_deactivation.py
index 241becb799..c7eda6dba8 100644
--- a/zerver/tests/test_soft_deactivation.py
+++ b/zerver/tests/test_soft_deactivation.py
@@ -9,11 +9,11 @@ from zerver.lib.soft_deactivation import (
do_soft_activate_users,
get_soft_deactivated_users_for_catch_up,
do_catch_up_soft_deactivated_users,
- do_auto_soft_deactivate_users
+ do_auto_soft_deactivate_users,
)
from zerver.lib.test_classes import ZulipTestCase
from zerver.models import (
- Client, UserProfile, UserActivity, get_realm, UserMessage
+ Client, UserProfile, UserActivity, get_realm, UserMessage,
)
class UserSoftDeactivationTests(ZulipTestCase):
@@ -70,7 +70,7 @@ class UserSoftDeactivationTests(ZulipTestCase):
client=client,
query=query,
count=count,
- last_visit=last_visit
+ last_visit=last_visit,
)
filter_kwargs = dict(user_profile__realm=get_realm('zulip'))
users_to_deactivate = get_users_for_soft_deactivation(-1, filter_kwargs)
@@ -177,7 +177,7 @@ class UserSoftDeactivationTests(ZulipTestCase):
client=client,
query=query,
count=count,
- last_visit=last_visit
+ last_visit=last_visit,
)
with mock.patch('logging.info'):
diff --git a/zerver/tests/test_submessage.py b/zerver/tests/test_submessage.py
index 632d2929a2..e3785c599c 100644
--- a/zerver/tests/test_submessage.py
+++ b/zerver/tests/test_submessage.py
@@ -119,7 +119,7 @@ class TestBasics(ZulipTestCase):
payload = dict(
message_id=message_id,
msg_type='whatever',
- content='{"name": "alice", "salary": 20}'
+ content='{"name": "alice", "salary": 20}',
)
with mock.patch('zerver.lib.actions.send_event') as m:
result = self.client_post('/json/submessage', payload)
diff --git a/zerver/tests/test_subs.py b/zerver/tests/test_subs.py
index a672a286a0..6257055dcb 100644
--- a/zerver/tests/test_subs.py
+++ b/zerver/tests/test_subs.py
@@ -9,7 +9,7 @@ from zerver.lib import cache
from zerver.lib.test_helpers import (
get_subscription, queries_captured, tornado_redirected_to_list,
- reset_emails_in_zulip_realm
+ reset_emails_in_zulip_realm,
)
from zerver.lib.test_classes import (
@@ -17,7 +17,7 @@ from zerver.lib.test_classes import (
)
from zerver.decorator import (
- JsonableError
+ JsonableError,
)
from zerver.lib.response import (
@@ -27,7 +27,7 @@ from zerver.lib.response import (
from zerver.lib.streams import (
access_stream_by_id, access_stream_by_name, filter_stream_authorization,
- list_to_streams, create_streams_if_needed
+ list_to_streams, create_streams_if_needed,
)
from zerver.lib.stream_subscription import (
@@ -36,14 +36,14 @@ from zerver.lib.stream_subscription import (
)
from zerver.lib.test_runner import (
- slow
+ slow,
)
from zerver.models import (
Realm, Recipient, Stream, Subscription,
DefaultStream, UserProfile, active_non_guest_user_ids,
get_default_stream_groups, flush_per_request_caches, DefaultStreamGroup,
- get_client, get_realm, get_user, get_user_profile_by_id_in_realm, Message, UserMessage
+ get_client, get_realm, get_user, get_user_profile_by_id_in_realm, Message, UserMessage,
)
from zerver.lib.actions import (
@@ -69,7 +69,7 @@ from zerver.lib.actions import (
)
from zerver.views.streams import (
- compose_views
+ compose_views,
)
from zerver.lib.message import (
@@ -193,24 +193,24 @@ class TestCreateStreams(ZulipTestCase):
stream_dicts: List[Mapping[str, Any]] = [
{
"name": "publicstream",
- "description": "Public stream with public history"
+ "description": "Public stream with public history",
},
{
"name": "privatestream",
"description": "Private stream with non-public history",
- "invite_only": True
+ "invite_only": True,
},
{
"name": "privatewithhistory",
"description": "Private stream with public history",
"invite_only": True,
- "history_public_to_subscribers": True
+ "history_public_to_subscribers": True,
},
{
"name": "publictrywithouthistory",
"description": "Public stream without public history (disallowed)",
"invite_only": False,
- "history_public_to_subscribers": False
+ "history_public_to_subscribers": False,
},
]
@@ -272,7 +272,7 @@ class TestCreateStreams(ZulipTestCase):
"invite_only": 'false',
"announce": 'true',
"principals": ujson.dumps([iago.id, aaron.id, cordelia.id, hamlet.id]),
- "stream_post_policy": '1'
+ "stream_post_policy": '1',
}
response = self.client_post("/json/users/me/subscriptions", data)
@@ -287,9 +287,9 @@ class TestCreateStreams(ZulipTestCase):
"AARON@zulip.com": ["brand new stream"],
"cordelia@zulip.com": ["brand new stream"],
"hamlet@zulip.com": ["brand new stream"],
- "iago@zulip.com": ["brand new stream"]
+ "iago@zulip.com": ["brand new stream"],
},
- "already_subscribed": {}
+ "already_subscribed": {},
}
self.assertEqual(response.status_code, 200)
self.assertEqual(ujson.loads(response.content.decode()), expected_response)
@@ -342,7 +342,7 @@ class StreamAdminTest(ZulipTestCase):
do_change_user_role(user_profile, UserProfile.ROLE_REALM_ADMINISTRATOR)
params = {
'stream_name': ujson.dumps('private_stream'),
- 'is_private': ujson.dumps(False)
+ 'is_private': ujson.dumps(False),
}
stream_id = get_stream('private_stream', user_profile.realm).id
result = self.client_patch("/json/streams/%d" % (stream_id,), params)
@@ -354,7 +354,7 @@ class StreamAdminTest(ZulipTestCase):
do_change_user_role(user_profile, UserProfile.ROLE_REALM_ADMINISTRATOR)
params = {
'stream_name': ujson.dumps('private_stream'),
- 'is_private': ujson.dumps(False)
+ 'is_private': ujson.dumps(False),
}
result = self.client_patch("/json/streams/%d" % (stream_id,), params)
self.assert_json_success(result)
@@ -373,7 +373,7 @@ class StreamAdminTest(ZulipTestCase):
do_change_user_role(user_profile, UserProfile.ROLE_REALM_ADMINISTRATOR)
params = {
'stream_name': ujson.dumps('public_stream'),
- 'is_private': ujson.dumps(True)
+ 'is_private': ujson.dumps(True),
}
stream_id = get_stream('public_stream', realm).id
result = self.client_patch("/json/streams/%d" % (stream_id,), params)
@@ -392,7 +392,7 @@ class StreamAdminTest(ZulipTestCase):
do_change_user_role(user_profile, UserProfile.ROLE_REALM_ADMINISTRATOR)
params = {
'stream_name': ujson.dumps('target_stream'),
- 'is_private': ujson.dumps(False)
+ 'is_private': ujson.dumps(False),
}
stream_id = get_stream('target_stream', realm).id
result = self.client_patch("/json/streams/%d" % (stream_id,), params,
@@ -599,7 +599,7 @@ class StreamAdminTest(ZulipTestCase):
property='name',
value='stream_name2',
stream_id=stream_id,
- name='sTREAm_name1'
+ name='sTREAm_name1',
))
notified_user_ids = set(events[1]['users'])
@@ -756,7 +756,7 @@ class StreamAdminTest(ZulipTestCase):
value='Test description',
rendered_description='Test description
',
stream_id=stream_id,
- name='stream_name1'
+ name='stream_name1',
))
notified_user_ids = set(events[0]['users'])
@@ -1895,7 +1895,7 @@ class SubscriptionRestApiTest(ZulipTestCase):
# add
request = {
- 'add': ujson.dumps([{'name': 'my_test_stream_1'}])
+ 'add': ujson.dumps([{'name': 'my_test_stream_1'}]),
}
result = self.api_patch(user, "/api/v1/users/me/subscriptions", request)
self.assert_json_success(result)
@@ -1904,7 +1904,7 @@ class SubscriptionRestApiTest(ZulipTestCase):
# now delete the same stream
request = {
- 'delete': ujson.dumps(['my_test_stream_1'])
+ 'delete': ujson.dumps(['my_test_stream_1']),
}
result = self.api_patch(user, "/api/v1/users/me/subscriptions", request)
self.assert_json_success(result)
@@ -1917,14 +1917,14 @@ class SubscriptionRestApiTest(ZulipTestCase):
# add with color proposition
request = {
- 'add': ujson.dumps([{'name': 'my_test_stream_2', 'color': '#afafaf'}])
+ 'add': ujson.dumps([{'name': 'my_test_stream_2', 'color': '#afafaf'}]),
}
result = self.api_patch(user, "/api/v1/users/me/subscriptions", request)
self.assert_json_success(result)
# incorrect color format
request = {
- 'subscriptions': ujson.dumps([{'name': 'my_test_stream_3', 'color': '#0g0g0g'}])
+ 'subscriptions': ujson.dumps([{'name': 'my_test_stream_3', 'color': '#0g0g0g'}]),
}
result = self.api_post(user, "/api/v1/users/me/subscriptions", request)
self.assert_json_error(result, 'subscriptions[0]["color"] is not a valid hex color code')
@@ -1973,7 +1973,7 @@ class SubscriptionRestApiTest(ZulipTestCase):
def check_for_error(val: Any, expected_message: str) -> None:
request = {
- 'add': ujson.dumps(val)
+ 'add': ujson.dumps(val),
}
result = self.api_patch(user, "/api/v1/users/me/subscriptions", request)
self.assert_json_error(result, expected_message)
@@ -1998,7 +1998,7 @@ class SubscriptionRestApiTest(ZulipTestCase):
self.login_user(user)
request = {
- 'delete': ujson.dumps([{'name': 'my_test_stream_1'}])
+ 'delete': ujson.dumps([{'name': 'my_test_stream_1'}]),
}
result = self.api_patch(user, "/api/v1/users/me/subscriptions", request)
self.assert_json_error(result, "delete[0] is not a string")
@@ -2020,7 +2020,7 @@ class SubscriptionRestApiTest(ZulipTestCase):
invalid_stream_name = ""
request = {
- 'delete': ujson.dumps([invalid_stream_name])
+ 'delete': ujson.dumps([invalid_stream_name]),
}
result = self.api_patch(user, "/api/v1/users/me/subscriptions", request)
self.assert_json_error(result,
@@ -2032,7 +2032,7 @@ class SubscriptionRestApiTest(ZulipTestCase):
long_stream_name = "a" * 61
request = {
- 'delete': ujson.dumps([long_stream_name])
+ 'delete': ujson.dumps([long_stream_name]),
}
result = self.api_patch(user, "/api/v1/users/me/subscriptions", request)
self.assert_json_error(result,
@@ -2044,7 +2044,7 @@ class SubscriptionRestApiTest(ZulipTestCase):
stream_name = "abc\000"
request = {
- 'delete': ujson.dumps([stream_name])
+ 'delete': ujson.dumps([stream_name]),
}
result = self.api_patch(user, "/api/v1/users/me/subscriptions", request)
self.assert_json_error(result,
@@ -2215,7 +2215,7 @@ class SubscriptionAPITest(ZulipTestCase):
invite_streams,
extra_post_data={
'announce': 'true',
- 'principals': ujson.dumps([self.user_profile.id])
+ 'principals': ujson.dumps([self.user_profile.id]),
},
)
self.assert_json_success(result)
@@ -2243,7 +2243,7 @@ class SubscriptionAPITest(ZulipTestCase):
invite_streams,
extra_post_data=dict(
announce='true',
- principals= ujson.dumps([self.user_profile.id])
+ principals= ujson.dumps([self.user_profile.id]),
),
)
self.assert_json_success(result)
@@ -2279,7 +2279,7 @@ class SubscriptionAPITest(ZulipTestCase):
user,
invite_streams,
extra_post_data=dict(
- announce='true'
+ announce='true',
),
subdomain="testrealm",
)
@@ -2311,7 +2311,7 @@ class SubscriptionAPITest(ZulipTestCase):
invite_streams,
extra_post_data={
'announce': 'true',
- 'principals': ujson.dumps([self.user_profile.id])
+ 'principals': ujson.dumps([self.user_profile.id]),
},
)
self.assert_json_success(result)
@@ -2511,7 +2511,7 @@ class SubscriptionAPITest(ZulipTestCase):
self.assertEqual(ev['event']['op'], 'add')
self.assertEqual(
set(ev['event']['subscriptions'][0]['subscribers']),
- {user1.id, user2.id}
+ {user1.id, user2.id},
)
else:
# Check "peer_add" events for streams users were
@@ -2540,7 +2540,7 @@ class SubscriptionAPITest(ZulipTestCase):
self.assertEqual(add_event['users'], [get_user(self.test_email, self.test_realm).id])
self.assertEqual(
set(add_event['event']['subscriptions'][0]['subscribers']),
- {user1.id, user2.id, self.test_user.id}
+ {user1.id, user2.id, self.test_user.id},
)
self.assertNotIn(self.example_user('polonius').id, add_peer_event['users'])
@@ -2570,7 +2570,7 @@ class SubscriptionAPITest(ZulipTestCase):
self.assertEqual(add_event['users'], [get_user(email3, realm3).id])
self.assertEqual(
set(add_event['event']['subscriptions'][0]['subscribers']),
- {user1.id, user2.id, user3.id, self.test_user.id}
+ {user1.id, user2.id, user3.id, self.test_user.id},
)
# We don't send a peer_add event to othello
@@ -2611,7 +2611,7 @@ class SubscriptionAPITest(ZulipTestCase):
self.assertEqual(add_event['users'], [user_profile.id])
self.assertEqual(
set(add_event['event']['subscriptions'][0]['subscribers']),
- {user_profile.id, existing_user_profile.id}
+ {user_profile.id, existing_user_profile.id},
)
# We don't send a peer_add event to othello, but we do send peer_add event to
@@ -2695,7 +2695,7 @@ class SubscriptionAPITest(ZulipTestCase):
'invite_only': False,
'history_public_to_subscribers': None,
'name': 'new_stream',
- 'stream_post_policy': Stream.STREAM_POST_POLICY_EVERYONE
+ 'stream_post_policy': Stream.STREAM_POST_POLICY_EVERYONE,
}]
with self.assertRaisesRegex(JsonableError, "User cannot create streams."):
@@ -2772,7 +2772,7 @@ class SubscriptionAPITest(ZulipTestCase):
bulk_remove_subscriptions(
[user1, user2],
[stream1, stream2, private],
- get_client("website")
+ get_client("website"),
)
peer_events = [e for e in events
@@ -2891,7 +2891,7 @@ class SubscriptionAPITest(ZulipTestCase):
"""
target_profile = self.example_user("cordelia")
post_data = dict(
- principals=ujson.dumps([target_profile.id])
+ principals=ujson.dumps([target_profile.id]),
)
result = self.common_subscribe_to_streams(self.test_user, "Verona", post_data)
self.assert_json_success(result)
@@ -3204,7 +3204,7 @@ class SubscriptionAPITest(ZulipTestCase):
self.login_user(admin_user)
- for stream_name in ["stream1", "stream2", "stream3", ]:
+ for stream_name in ["stream1", "stream2", "stream3"]:
self.make_stream(stream_name, realm=realm, invite_only=False)
self.subscribe(admin_user, stream_name)
self.subscribe(non_admin_user, stream_name)
@@ -3245,7 +3245,7 @@ class SubscriptionAPITest(ZulipTestCase):
stream_dict = {
'name': 'publicstream',
'description': 'Public stream with public history',
- 'realm_id': realm.id
+ 'realm_id': realm.id,
}
# For this test to work, othello can't be in the no_othello_here realm
@@ -3268,7 +3268,7 @@ class SubscriptionAPITest(ZulipTestCase):
new_streams = [
'query_count_stream_1',
'query_count_stream_2',
- 'query_count_stream_3'
+ 'query_count_stream_3',
]
# Test creating a public stream when realm does not have a notification stream.
@@ -3300,8 +3300,8 @@ class SubscriptionAPITest(ZulipTestCase):
[new_streams[2]],
dict(
announce='true',
- principals=ujson.dumps([user1.id, user2.id])
- )
+ principals=ujson.dumps([user1.id, user2.id]),
+ ),
)
self.assert_length(queries, 50)
@@ -3336,7 +3336,7 @@ class GetStreamsTest(ZulipTestCase):
self.subscribe(test_bot, 'Scotland')
result = self.api_get(
test_bot,
- "/api/v1/streams?include_owner_subscribed=true&include_public=false&include_subscribed=true"
+ "/api/v1/streams?include_owner_subscribed=true&include_public=false&include_subscribed=true",
)
self.assert_json_success(result)
@@ -3356,7 +3356,7 @@ class GetStreamsTest(ZulipTestCase):
self.subscribe(test_bot, 'private_stream')
result = self.api_get(
test_bot,
- "/api/v1/streams?include_owner_subscribed=true&include_public=true&include_subscribed=false"
+ "/api/v1/streams?include_owner_subscribed=true&include_public=true&include_subscribed=false",
)
self.assert_json_success(result)
@@ -3375,7 +3375,7 @@ class GetStreamsTest(ZulipTestCase):
# the bot's subs
result = self.api_get(
test_bot,
- "/api/v1/streams?include_owner_subscribed=true&include_public=true&include_subscribed=true"
+ "/api/v1/streams?include_owner_subscribed=true&include_public=true&include_subscribed=true",
)
self.assert_json_success(result)
@@ -3429,7 +3429,7 @@ class GetStreamsTest(ZulipTestCase):
self.assertEqual(
stream_names,
- {'Venice', 'Denmark', 'Scotland', 'Verona', 'Rome'}
+ {'Venice', 'Denmark', 'Scotland', 'Verona', 'Rome'},
)
def test_public_streams_api(self) -> None:
@@ -3727,7 +3727,7 @@ class GetSubscribersTest(ZulipTestCase):
ret = self.common_subscribe_to_streams(
self.user_profile,
public_streams,
- dict(principals=ujson.dumps(users_to_subscribe))
+ dict(principals=ujson.dumps(users_to_subscribe)),
)
self.assert_json_success(ret)
@@ -3738,7 +3738,7 @@ class GetSubscribersTest(ZulipTestCase):
self.user_profile,
private_streams,
dict(principals=ujson.dumps(users_to_subscribe)),
- invite_only=True
+ invite_only=True,
)
self.assert_json_success(ret)
@@ -3774,7 +3774,7 @@ class GetSubscribersTest(ZulipTestCase):
self.assertEqual(
len(never_subscribed),
- len(public_streams) + len(private_streams)
+ len(public_streams) + len(private_streams),
)
for stream_dict in never_subscribed:
self.assertTrue(len(stream_dict["subscribers"]) == len(users_to_subscribe))
diff --git a/zerver/tests/test_templates.py b/zerver/tests/test_templates.py
index 16a2ade777..a35d282ab4 100644
--- a/zerver/tests/test_templates.py
+++ b/zerver/tests/test_templates.py
@@ -10,7 +10,7 @@ class TemplateTestCase(ZulipTestCase):
def test_markdown_in_template(self) -> None:
template = get_template("tests/test_markdown.html")
context = {
- 'markdown_test_file': "zerver/tests/markdown/test_markdown.md"
+ 'markdown_test_file': "zerver/tests/markdown/test_markdown.md",
}
content = template.render(context)
@@ -21,7 +21,7 @@ class TemplateTestCase(ZulipTestCase):
def test_markdown_tabbed_sections_extension(self) -> None:
template = get_template("tests/test_markdown.html")
context = {
- 'markdown_test_file': "zerver/tests/markdown/test_tabbed_sections.md"
+ 'markdown_test_file': "zerver/tests/markdown/test_tabbed_sections.md",
}
content = template.render(context)
content_sans_whitespace = content.replace(" ", "").replace('\n', '')
@@ -94,7 +94,7 @@ footer
def test_markdown_nested_code_blocks(self) -> None:
template = get_template("tests/test_markdown.html")
context = {
- 'markdown_test_file': "zerver/tests/markdown/test_nested_code_blocks.md"
+ 'markdown_test_file': "zerver/tests/markdown/test_nested_code_blocks.md",
}
content = template.render(context)
@@ -109,7 +109,7 @@ footer
def test_custom_markdown_include_extension(self) -> None:
template = get_template("tests/test_markdown.html")
context = {
- 'markdown_test_file': "zerver/tests/markdown/test_custom_include_extension.md"
+ 'markdown_test_file': "zerver/tests/markdown/test_custom_include_extension.md",
}
with self.assertRaisesRegex(InvalidMarkdownIncludeStatement, "Invalid markdown include statement"):
@@ -118,7 +118,7 @@ footer
def test_custom_markdown_include_extension_empty_macro(self) -> None:
template = get_template("tests/test_markdown.html")
context = {
- 'markdown_test_file': "zerver/tests/markdown/test_custom_include_extension_empty.md"
+ 'markdown_test_file': "zerver/tests/markdown/test_custom_include_extension_empty.md",
}
content = template.render(context)
content_sans_whitespace = content.replace(" ", "").replace('\n', '')
diff --git a/zerver/tests/test_thumbnail.py b/zerver/tests/test_thumbnail.py
index 9b09d6b4a6..6653093bea 100644
--- a/zerver/tests/test_thumbnail.py
+++ b/zerver/tests/test_thumbnail.py
@@ -5,7 +5,7 @@ from zerver.lib.test_helpers import (
use_s3_backend,
create_s3_buckets,
override_settings,
- get_test_image_file
+ get_test_image_file,
)
from zerver.lib.upload import upload_backend, upload_emoji_image
from zerver.lib.users import get_api_key
diff --git a/zerver/tests/test_tornado.py b/zerver/tests/test_tornado.py
index 18d2dc3ff0..9b377dddf6 100644
--- a/zerver/tests/test_tornado.py
+++ b/zerver/tests/test_tornado.py
@@ -53,7 +53,7 @@ class TornadoWebTestCase(AsyncHTTPTestCase, ZulipTestCase):
self.get_url(path),
self.stop,
method=method,
- **kwargs
+ **kwargs,
)
def client_get_async(self, path: str, **kwargs: Any) -> None:
@@ -66,7 +66,7 @@ class TornadoWebTestCase(AsyncHTTPTestCase, ZulipTestCase):
session_cookie = settings.SESSION_COOKIE_NAME
session_key = self.client.session.session_key
self.session_cookie = {
- "Cookie": f"{session_cookie}={session_key}"
+ "Cookie": f"{session_cookie}={session_key}",
}
def get_session_cookie(self) -> Dict[str, str]:
diff --git a/zerver/tests/test_typing.py b/zerver/tests/test_typing.py
index 01284b942a..e85ca32e6a 100644
--- a/zerver/tests/test_typing.py
+++ b/zerver/tests/test_typing.py
@@ -32,7 +32,7 @@ class TypingValidateOperatorTest(ZulipTestCase):
sender = self.example_user("hamlet")
params = dict(
to=ujson.dumps([sender.id]),
- op='foo'
+ op='foo',
)
result = self.api_post(sender, '/api/v1/typing', params)
self.assert_json_error(result, 'Invalid \'op\' value (should be start or stop)')
@@ -163,8 +163,8 @@ class TypingHappyPathTest(ZulipTestCase):
'/api/v1/typing',
{
'to': ujson.dumps([user.id]),
- 'op': 'start'
- }
+ 'op': 'start',
+ },
)
self.assert_json_success(result)
self.assertEqual(len(events), 1)
@@ -194,7 +194,7 @@ class TypingHappyPathTest(ZulipTestCase):
params = dict(
to=ujson.dumps([recipient.id]),
- op='start'
+ op='start',
)
events: List[Mapping[str, Any]] = []
@@ -230,7 +230,7 @@ class TypingHappyPathTest(ZulipTestCase):
with tornado_redirected_to_list(events):
params = dict(
to=ujson.dumps([user.id]),
- op='stop'
+ op='stop',
)
result = self.api_post(user, '/api/v1/typing', params)
@@ -264,7 +264,7 @@ class TypingHappyPathTest(ZulipTestCase):
with tornado_redirected_to_list(events):
params = dict(
to=ujson.dumps([recipient.id]),
- op='stop'
+ op='stop',
)
result = self.api_post(sender, '/api/v1/typing', params)
diff --git a/zerver/tests/test_unread.py b/zerver/tests/test_unread.py
index e5b7905590..a427d4988f 100644
--- a/zerver/tests/test_unread.py
+++ b/zerver/tests/test_unread.py
@@ -263,7 +263,7 @@ class UnreadCountTests(ZulipTestCase):
events: List[Mapping[str, Any]] = []
with tornado_redirected_to_list(events):
result = self.client_post("/json/mark_stream_as_read", {
- "stream_id": stream.id
+ "stream_id": stream.id,
})
self.assert_json_success(result)
@@ -296,7 +296,7 @@ class UnreadCountTests(ZulipTestCase):
self.login('hamlet')
invalid_stream_id = "12345678"
result = self.client_post("/json/mark_stream_as_read", {
- "stream_id": invalid_stream_id
+ "stream_id": invalid_stream_id,
})
self.assert_json_error(result, 'Invalid stream id')
@@ -383,7 +383,7 @@ class FixUnreadTests(ZulipTestCase):
recipient = stream.recipient
subscription = Subscription.objects.get(
user_profile=user,
- recipient=recipient
+ recipient=recipient,
)
subscription.is_muted = True
subscription.save()
diff --git a/zerver/tests/test_upload.py b/zerver/tests/test_upload.py
index 213dd9f722..1e08e1ceef 100644
--- a/zerver/tests/test_upload.py
+++ b/zerver/tests/test_upload.py
@@ -35,7 +35,7 @@ from zerver.lib.actions import (
do_change_logo_source,
do_delete_old_unclaimed_attachments,
internal_send_private_message,
- do_set_realm_property
+ do_set_realm_property,
)
from zerver.lib.cache import get_realm_used_upload_space_cache_key, cache_get
from zerver.lib.create_user import copy_user_settings
@@ -424,7 +424,7 @@ class FileUploadTest(UploadSerializeMixin, ZulipTestCase):
"[f2.txt](http://{}/user_uploads/".format(host) + f2_path_id + ")")
result = self.client_patch("/json/messages/" + str(msg_id), {
'message_id': msg_id,
- 'content': new_body
+ 'content': new_body,
})
self.assert_json_success(result)
@@ -441,7 +441,7 @@ class FileUploadTest(UploadSerializeMixin, ZulipTestCase):
new_body = "(deleted)"
result = self.client_patch("/json/messages/" + str(msg_id), {
'message_id': msg_id,
- 'content': new_body
+ 'content': new_body,
})
self.assert_json_success(result)
@@ -809,7 +809,7 @@ class AvatarTest(UploadSerializeMixin, ZulipTestCase):
self.assertEqual(
url,
- '/user_avatars/5/fc2b9f1a81f4508a4df2d95451a2a77e0524ca0e-medium.png?x=x&version=2'
+ '/user_avatars/5/fc2b9f1a81f4508a4df2d95451a2a77e0524ca0e-medium.png?x=x&version=2',
)
url = get_avatar_field(
@@ -824,7 +824,7 @@ class AvatarTest(UploadSerializeMixin, ZulipTestCase):
self.assertEqual(
url,
- 'https://secure.gravatar.com/avatar/b48def645758b95537d4424c84d1a9ff?d=identicon&s=500&version=2'
+ 'https://secure.gravatar.com/avatar/b48def645758b95537d4424c84d1a9ff?d=identicon&s=500&version=2',
)
url = get_avatar_field(
@@ -901,7 +901,7 @@ class AvatarTest(UploadSerializeMixin, ZulipTestCase):
('img.jpg', None), # jpeg resizing is platform-dependent
('img.gif', 'gif_resized.png'),
('img.tif', 'tif_resized.png'),
- ('cmyk.jpg', None)
+ ('cmyk.jpg', None),
]
corrupt_files = ['text.txt', 'corrupt.png', 'corrupt.gif']
@@ -1220,7 +1220,7 @@ class RealmIconTest(UploadSerializeMixin, ZulipTestCase):
('img.jpg', None), # jpeg resizing is platform-dependent
('img.gif', 'gif_resized.png'),
('img.tif', 'tif_resized.png'),
- ('cmyk.jpg', None)
+ ('cmyk.jpg', None),
]
corrupt_files = ['text.txt', 'corrupt.png', 'corrupt.gif']
@@ -1354,7 +1354,7 @@ class RealmLogoTest(UploadSerializeMixin, ZulipTestCase):
('img.jpg', None), # jpeg resizing is platform-dependent
('img.gif', 'gif_resized.png'),
('img.tif', 'tif_resized.png'),
- ('cmyk.jpg', None)
+ ('cmyk.jpg', None),
]
corrupt_files = ['text.txt', 'corrupt.png', 'corrupt.gif']
diff --git a/zerver/tests/test_user_status.py b/zerver/tests/test_user_status.py
index 4112f4b683..051b7606c1 100644
--- a/zerver/tests/test_user_status.py
+++ b/zerver/tests/test_user_status.py
@@ -147,7 +147,7 @@ class UserStatusTest(ZulipTestCase):
self.assertEqual(
user_info(hamlet),
- dict(status_text='in a meeting')
+ dict(status_text='in a meeting'),
)
away_user_ids = get_away_user_ids(realm_id=realm_id)
diff --git a/zerver/tests/test_users.py b/zerver/tests/test_users.py
index 7a4760e1de..cc4a7278e7 100644
--- a/zerver/tests/test_users.py
+++ b/zerver/tests/test_users.py
@@ -628,7 +628,7 @@ class PermissionTest(ZulipTestCase):
# non-existent field and no data
invalid_profile_data = [{
'id': 9001,
- 'value': ''
+ 'value': '',
}]
result = self.client_patch(f'/json/users/{cordelia.id}',
{'profile_data': ujson.dumps(invalid_profile_data)})
@@ -637,7 +637,7 @@ class PermissionTest(ZulipTestCase):
# non-existent field and data
invalid_profile_data = [{
'id': 9001,
- 'value': 'some data'
+ 'value': 'some data',
}]
result = self.client_patch(f'/json/users/{cordelia.id}',
{'profile_data': ujson.dumps(invalid_profile_data)})
@@ -725,7 +725,7 @@ class BulkCreateUserTest(ZulipTestCase):
fred = get_user_by_delivery_email('fred@zulip.com', realm)
self.assertEqual(
fred.email,
- f'user{fred.id}@zulip.testserver'
+ f'user{fred.id}@zulip.testserver',
)
lisa = get_user_by_delivery_email('lisa@zulip.com', realm)
@@ -939,7 +939,7 @@ class UserProfileTest(ZulipTestCase):
webhook_bot = self.example_user("webhook_bot")
result = bulk_get_users(
[hamlet.email, cordelia.email],
- get_realm("zulip")
+ get_realm("zulip"),
)
self.assertEqual(result[hamlet.email].email, hamlet.email)
self.assertEqual(result[cordelia.email].email, cordelia.email)
@@ -947,7 +947,7 @@ class UserProfileTest(ZulipTestCase):
result = bulk_get_users(
[hamlet.email, cordelia.email, webhook_bot.email],
None,
- base_query=UserProfile.objects.all()
+ base_query=UserProfile.objects.all(),
)
self.assertEqual(result[hamlet.email].email, hamlet.email)
self.assertEqual(result[cordelia.email].email, cordelia.email)
@@ -1418,7 +1418,7 @@ class RecipientInfoTest(ZulipTestCase):
recipient=recipient,
sender_id=hamlet.id,
stream_topic=stream_topic,
- possibly_mentioned_user_ids={service_bot.id}
+ possibly_mentioned_user_ids={service_bot.id},
)
self.assertEqual(info['service_bot_tuples'], [
(service_bot.id, UserProfile.EMBEDDED_BOT),
@@ -1438,7 +1438,7 @@ class RecipientInfoTest(ZulipTestCase):
recipient=recipient,
sender_id=hamlet.id,
stream_topic=stream_topic,
- possibly_mentioned_user_ids={service_bot.id, normal_bot.id}
+ possibly_mentioned_user_ids={service_bot.id, normal_bot.id},
)
self.assertEqual(info['default_bot_user_ids'], {normal_bot.id})
@@ -1481,7 +1481,7 @@ class BulkUsersTest(ZulipTestCase):
self.assertEqual(
get_hamlet_avatar(client_gravatar=True),
- None
+ None,
)
'''
diff --git a/zerver/tests/test_webhooks_common.py b/zerver/tests/test_webhooks_common.py
index 93ef1e3272..cf4b3ebeeb 100644
--- a/zerver/tests/test_webhooks_common.py
+++ b/zerver/tests/test_webhooks_common.py
@@ -48,7 +48,7 @@ class WebhooksCommonTestCase(ZulipTestCase):
request_path=request.path,
header_name='X_CUSTOM_HEADER',
integration_name='test_webhook',
- support_email=FromAddress.SUPPORT
+ support_email=FromAddress.SUPPORT,
).rstrip()
self.assertEqual(msg.sender.email, notification_bot.email)
self.assertEqual(msg.content, expected_message)
@@ -110,7 +110,7 @@ class WebhooksCommonTestCase(ZulipTestCase):
@patch("zerver.lib.webhooks.common.importlib.import_module")
def test_get_fixture_http_headers_with_no_fixtures_to_headers_function(
self,
- import_module_mock: MagicMock
+ import_module_mock: MagicMock,
) -> None:
fake_module = SimpleNamespace()
@@ -118,7 +118,7 @@ class WebhooksCommonTestCase(ZulipTestCase):
self.assertEqual(
get_fixture_http_headers("some_integration", "simple_fixture"),
- {}
+ {},
)
def test_standardize_headers(self) -> None:
@@ -150,7 +150,7 @@ class MissingEventHeaderTestCase(WebhookTestCase):
request_path='/api/v1/external/groove',
header_name='X_GROOVE_EVENT',
integration_name='Groove',
- support_email=FromAddress.SUPPORT
+ support_email=FromAddress.SUPPORT,
).rstrip()
if msg.sender.email != notification_bot.email: # nocoverage
# This block seems to fire occasionally; debug output:
diff --git a/zerver/tornado/event_queue.py b/zerver/tornado/event_queue.py
index cbdd7db20c..4803ff7c40 100644
--- a/zerver/tornado/event_queue.py
+++ b/zerver/tornado/event_queue.py
@@ -142,7 +142,7 @@ class ClientDescriptor:
d['slim_presence'],
d['all_public_streams'],
d['queue_timeout'],
- d.get('narrow', [])
+ d.get('narrow', []),
)
ret.last_connection_time = d['last_connection_time']
return ret
@@ -629,7 +629,7 @@ def get_user_events(user_profile: UserProfile, queue_id: str, last_event_id: int
'dont_block': 'true',
'user_profile_id': user_profile.id,
'secret': settings.SHARED_SECRET,
- 'client': 'internal'
+ 'client': 'internal',
}
resp = requests_client.post(tornado_uri + '/api/v1/events/internal',
data=post_data)
@@ -798,7 +798,7 @@ def get_client_info_for_message_event(event_template: Mapping[str, Any],
send_to_clients[client.event_queue.id] = dict(
client=client,
flags=[],
- is_sender=is_sender_client(client)
+ is_sender=is_sender_client(client),
)
for user_data in users:
@@ -809,7 +809,7 @@ def get_client_info_for_message_event(event_template: Mapping[str, Any],
send_to_clients[client.event_queue.id] = dict(
client=client,
flags=flags,
- is_sender=is_sender_client(client)
+ is_sender=is_sender_client(client),
)
return send_to_clients
@@ -844,7 +844,7 @@ def process_message_event(event_template: Mapping[str, Any], users: Iterable[Map
return MessageDict.finalize_payload(
wide_dict,
apply_markdown=apply_markdown,
- client_gravatar=client_gravatar
+ client_gravatar=client_gravatar,
)
# Extra user-specific data to include
diff --git a/zerver/tornado/views.py b/zerver/tornado/views.py
index 5e61ea6f00..fb8a24e9f7 100644
--- a/zerver/tornado/views.py
+++ b/zerver/tornado/views.py
@@ -71,7 +71,7 @@ def get_events_backend(request: HttpRequest, user_profile: UserProfile,
narrow: Iterable[Sequence[str]]=REQ(default=[], validator=check_list(None),
intentionally_undocumented=True),
lifespan_secs: int=REQ(default=0, converter=to_non_negative_int,
- intentionally_undocumented=True)
+ intentionally_undocumented=True),
) -> HttpResponse:
# Extract the Tornado handler from the request
handler: AsyncDjangoHandler = request._tornado_handler
diff --git a/zerver/views/alert_words.py b/zerver/views/alert_words.py
index 968ab30efd..c4821fd847 100644
--- a/zerver/views/alert_words.py
+++ b/zerver/views/alert_words.py
@@ -19,14 +19,14 @@ def clean_alert_words(alert_words: List[str]) -> List[str]:
@has_request_variables
def add_alert_words(request: HttpRequest, user_profile: UserProfile,
- alert_words: List[str]=REQ(validator=check_list(check_capped_string(100)))
+ alert_words: List[str]=REQ(validator=check_list(check_capped_string(100))),
) -> HttpResponse:
do_add_alert_words(user_profile, clean_alert_words(alert_words))
return json_success({'alert_words': user_alert_words(user_profile)})
@has_request_variables
def remove_alert_words(request: HttpRequest, user_profile: UserProfile,
- alert_words: List[str]=REQ(validator=check_list(check_string))
+ alert_words: List[str]=REQ(validator=check_list(check_string)),
) -> HttpResponse:
do_remove_alert_words(user_profile, alert_words)
return json_success({'alert_words': user_alert_words(user_profile)})
diff --git a/zerver/views/archive.py b/zerver/views/archive.py
index 4c8515e539..3b610a17fe 100644
--- a/zerver/views/archive.py
+++ b/zerver/views/archive.py
@@ -30,7 +30,7 @@ def archive(request: HttpRequest,
'message_list': rendered_message_list,
'stream': stream_name,
'topic': topic_name,
- }
+ },
)
try:
@@ -45,7 +45,7 @@ def archive(request: HttpRequest,
messages_for_topic(
stream_recipient_id=stream.recipient_id,
topic_name=topic_name,
- ).select_related('sender').order_by('date_sent')
+ ).select_related('sender').order_by('date_sent'),
)
if not all_messages:
diff --git a/zerver/views/auth.py b/zerver/views/auth.py
index 45e717d525..1fbe546f9f 100644
--- a/zerver/views/auth.py
+++ b/zerver/views/auth.py
@@ -87,7 +87,7 @@ def create_preregistration_user(email: str, request: HttpRequest, realm_creation
password_required=password_required,
realm=realm,
full_name=full_name,
- full_name_validated=full_name_validated
+ full_name_validated=full_name_validated,
)
def maybe_send_to_registration(request: HttpRequest, email: str, full_name: str='',
@@ -168,7 +168,7 @@ def maybe_send_to_registration(request: HttpRequest, email: str, full_name: str=
email, request,
password_required=password_required,
full_name=full_name,
- full_name_validated=full_name_validated
+ full_name_validated=full_name_validated,
)
if multiuse_obj is not None:
@@ -374,7 +374,7 @@ def remote_user_sso(
email=email,
mobile_flow_otp=mobile_flow_otp,
desktop_flow_otp=desktop_flow_otp,
- redirect_to=next
+ redirect_to=next,
)
if realm:
data_dict["subdomain"] = realm.subdomain
@@ -490,7 +490,7 @@ def start_remote_user_sso(request: HttpRequest) -> HttpResponse:
return redirect(add_query_to_redirect_url(reverse('login-sso'), query))
@handle_desktop_flow
-def start_social_login(request: HttpRequest, backend: str, extra_arg: Optional[str]=None
+def start_social_login(request: HttpRequest, backend: str, extra_arg: Optional[str]=None,
) -> HttpResponse:
backend_url = reverse('social:begin', args=[backend])
extra_url_params: Dict[str, str] = {}
@@ -517,7 +517,7 @@ def start_social_login(request: HttpRequest, backend: str, extra_arg: Optional[s
return oauth_redirect_to_root(request, backend_url, 'social', extra_url_params=extra_url_params)
@handle_desktop_flow
-def start_social_signup(request: HttpRequest, backend: str, extra_arg: Optional[str]=None
+def start_social_signup(request: HttpRequest, backend: str, extra_arg: Optional[str]=None,
) -> HttpResponse:
backend_url = reverse('social:begin', args=[backend])
extra_url_params: Dict[str, str] = {}
@@ -1002,7 +1002,7 @@ def config_error_view(request: HttpRequest, error_category_name: str) -> HttpRes
'saml': {'social_backend_name': 'saml'},
'smtp': {'error_name': 'smtp_error'},
'backend_disabled': {'error_name': 'remoteuser_error_backend_disabled'},
- 'remote_user_header_missing': {'error_name': 'remoteuser_error_remote_user_header_missing'}
+ 'remote_user_header_missing': {'error_name': 'remoteuser_error_remote_user_header_missing'},
}
return TemplateView.as_view(template_name='zerver/config_error.html',
diff --git a/zerver/views/camo.py b/zerver/views/camo.py
index de1aaab0a0..fecbdd868e 100644
--- a/zerver/views/camo.py
+++ b/zerver/views/camo.py
@@ -2,7 +2,7 @@ from django.conf import settings
from django.shortcuts import redirect
from django.utils.translation import ugettext as _
from django.http import (
- HttpRequest, HttpResponse, HttpResponseForbidden, HttpResponseNotFound
+ HttpRequest, HttpResponse, HttpResponseForbidden, HttpResponseNotFound,
)
from zerver.lib.camo import is_camo_url_valid
from zerver.lib.thumbnail import generate_thumbnail_url
diff --git a/zerver/views/events_register.py b/zerver/views/events_register.py
index 997618bc64..eab0f35a05 100644
--- a/zerver/views/events_register.py
+++ b/zerver/views/events_register.py
@@ -41,7 +41,7 @@ def events_register_backend(
event_types: Optional[Iterable[str]]=REQ(validator=check_list(check_string), default=None),
fetch_event_types: Optional[Iterable[str]]=REQ(validator=check_list(check_string), default=None),
narrow: NarrowT=REQ(validator=check_list(check_list(check_string, length=2)), default=[]),
- queue_lifespan_secs: int=REQ(converter=int, default=0, documentation_pending=True)
+ queue_lifespan_secs: int=REQ(converter=int, default=0, documentation_pending=True),
) -> HttpResponse:
all_public_streams = _default_all_public_streams(user_profile, all_public_streams)
narrow = _default_narrow(user_profile, narrow)
diff --git a/zerver/views/home.py b/zerver/views/home.py
index 749da6c1d8..5f15d5ddf8 100644
--- a/zerver/views/home.py
+++ b/zerver/views/home.py
@@ -123,7 +123,7 @@ def get_bot_types(user_profile: Optional[UserProfile]) -> List[Dict[str, object]
bot_types.append({
'type_id': type_id,
'name': name,
- 'allowed': type_id in user_profile.allowed_bot_types
+ 'allowed': type_id in user_profile.allowed_bot_types,
})
return bot_types
@@ -159,7 +159,7 @@ def home_real(request: HttpRequest) -> HttpResponse:
'zerver/insecure_desktop_app.html',
context={
"auto_update_broken": auto_update_broken,
- }
+ },
)
(unsupported_browser, browser_name) = is_unsupported_browser(client_user_agent)
if unsupported_browser:
@@ -168,7 +168,7 @@ def home_real(request: HttpRequest) -> HttpResponse:
'zerver/unsupported_browser.html',
context={
"browser_name": browser_name,
- }
+ },
)
# We need to modify the session object every two weeks or it will expire.
@@ -339,7 +339,7 @@ def home_real(request: HttpRequest) -> HttpResponse:
'embedded': narrow_stream is not None,
'invite_as': PreregistrationUser.INVITE_AS,
'max_file_upload_size_mib': settings.MAX_FILE_UPLOAD_SIZE,
- },)
+ })
patch_cache_control(response, no_cache=True, no_store=True, must_revalidate=True)
return response
diff --git a/zerver/views/messages.py b/zerver/views/messages.py
index f1133dc880..a031d3e2ff 100644
--- a/zerver/views/messages.py
+++ b/zerver/views/messages.py
@@ -93,7 +93,7 @@ TS_START = ""
TS_STOP = ""
def ts_locs_array(
- config: ColumnElement, text: ColumnElement, tsquery: ColumnElement
+ config: ColumnElement, text: ColumnElement, tsquery: ColumnElement,
) -> ColumnElement:
options = f"HighlightAll = TRUE, StartSel = {TS_START}, StopSel = {TS_STOP}"
delimited = func.ts_headline(config, text, tsquery, options)
@@ -106,7 +106,7 @@ def ts_locs_array(
select([postgresql.array([match_pos, match_len])])
.select_from(parts)
.offset(1)
- .as_scalar()
+ .as_scalar(),
)
# When you add a new operator to this, also update zerver/lib/narrow.py
@@ -350,7 +350,7 @@ class NarrowBuilder:
email_list = operand.split(",")
user_profiles = get_user_profiles(
emails=email_list,
- realm=self.user_realm
+ realm=self.user_realm,
)
else:
"""
@@ -359,7 +359,7 @@ class NarrowBuilder:
"""
user_profiles = get_user_profiles_by_ids(
user_ids=operand,
- realm=self.user_realm
+ realm=self.user_realm,
)
recipient = recipient_for_user_profiles(user_profiles=user_profiles,
@@ -417,13 +417,13 @@ class NarrowBuilder:
recipient_tuple['recipient_id'] for recipient_tuple
in Subscription.objects.filter(
user_profile=self.user_profile,
- recipient__type=Recipient.HUDDLE
+ recipient__type=Recipient.HUDDLE,
).values("recipient_id")]
narrow_recipient_ids = [
recipient_tuple['recipient_id'] for recipient_tuple
in Subscription.objects.filter(
user_profile=narrow_profile,
- recipient__type=Recipient.HUDDLE
+ recipient__type=Recipient.HUDDLE,
).values("recipient_id")]
recipient_ids = set(self_recipient_ids) & set(narrow_recipient_ids)
@@ -632,7 +632,7 @@ def exclude_muting_conditions(user_profile: UserProfile,
user_profile=user_profile,
active=True,
is_muted=True,
- recipient__type=Recipient.STREAM
+ recipient__type=Recipient.STREAM,
).values('recipient_id')
muted_recipient_ids = [row['recipient_id'] for row in rows]
if len(muted_recipient_ids) > 0:
@@ -698,7 +698,7 @@ def add_narrow_conditions(user_profile: UserProfile,
query = query.column(topic_column_sa()).column(column("rendered_content"))
search_term = dict(
operator='search',
- operand=' '.join(search_operands)
+ operand=' '.join(search_operands),
)
query = builder.add_term(query, search_term)
@@ -1325,7 +1325,7 @@ def send_message_backend(request: HttpRequest, user_profile: UserProfile,
defer_until: Optional[str]=REQ('deliver_at', default=None,
documentation_pending=True),
tz_guess: Optional[str]=REQ('tz_guess', default=None,
- documentation_pending=True)
+ documentation_pending=True),
) -> HttpResponse:
# If req_to is None, then we default to an
@@ -1344,7 +1344,7 @@ def send_message_backend(request: HttpRequest, user_profile: UserProfile,
# a Union[Sequence[int], Sequence[str]].
message_to = cast(
Union[Sequence[int], Sequence[str]],
- [stream_indicator]
+ [stream_indicator],
)
else:
message_to = extract_private_recipients(req_to)
@@ -1683,7 +1683,7 @@ def render_message_backend(request: HttpRequest, user_profile: UserProfile,
@has_request_variables
def messages_in_narrow_backend(request: HttpRequest, user_profile: UserProfile,
msg_ids: List[int]=REQ(validator=check_list(check_int)),
- narrow: OptionalNarrowListT=REQ(converter=narrow_parameter)
+ narrow: OptionalNarrowListT=REQ(converter=narrow_parameter),
) -> HttpResponse:
first_visible_message_id = get_first_visible_message_id(user_profile.realm)
diff --git a/zerver/views/portico.py b/zerver/views/portico.py
index 47ebce214f..b6fdc13706 100644
--- a/zerver/views/portico.py
+++ b/zerver/views/portico.py
@@ -17,8 +17,8 @@ def apps_view(request: HttpRequest, _: str) -> HttpResponse:
context={
"page_params": {
'electron_app_version': LATEST_DESKTOP_VERSION,
- }
- }
+ },
+ },
)
return HttpResponseRedirect('https://zulip.com/apps/', status=301)
diff --git a/zerver/views/presence.py b/zerver/views/presence.py
index d841e75d9e..76525c7f5a 100644
--- a/zerver/views/presence.py
+++ b/zerver/views/presence.py
@@ -80,7 +80,7 @@ def update_active_status_backend(request: HttpRequest, user_profile: UserProfile
status: str=REQ(),
ping_only: bool=REQ(validator=check_bool, default=False),
new_user_input: bool=REQ(validator=check_bool, default=False),
- slim_presence: bool=REQ(validator=check_bool, default=False)
+ slim_presence: bool=REQ(validator=check_bool, default=False),
) -> HttpResponse:
status_val = UserPresence.status_from_string(status)
if status_val is None:
diff --git a/zerver/views/push_notifications.py b/zerver/views/push_notifications.py
index c89254cef4..2d4d88e3ad 100644
--- a/zerver/views/push_notifications.py
+++ b/zerver/views/push_notifications.py
@@ -23,7 +23,7 @@ def validate_token(token_str: str, kind: int) -> None:
@has_request_variables
def add_apns_device_token(request: HttpRequest, user_profile: UserProfile,
token: str=REQ(),
- appid: str=REQ(default=settings.ZULIP_IOS_APP_ID)
+ appid: str=REQ(default=settings.ZULIP_IOS_APP_ID),
) -> HttpResponse:
validate_token(token, PushDeviceToken.APNS)
add_push_device_token(user_profile, token, PushDeviceToken.APNS, ios_app_id=appid)
diff --git a/zerver/views/realm_filters.py b/zerver/views/realm_filters.py
index b26360168a..625ef7a173 100644
--- a/zerver/views/realm_filters.py
+++ b/zerver/views/realm_filters.py
@@ -23,7 +23,7 @@ def create_filter(request: HttpRequest, user_profile: UserProfile, pattern: str=
filter_id = do_add_realm_filter(
realm=user_profile.realm,
pattern=pattern,
- url_format_string=url_format_string
+ url_format_string=url_format_string,
)
return json_success({'id': filter_id})
except ValidationError as e:
diff --git a/zerver/views/realm_icon.py b/zerver/views/realm_icon.py
index 5f2fe64779..66054248dd 100644
--- a/zerver/views/realm_icon.py
+++ b/zerver/views/realm_icon.py
@@ -27,7 +27,7 @@ def upload_icon(request: HttpRequest, user_profile: UserProfile) -> HttpResponse
icon_url = realm_icon_url(user_profile.realm)
json_result = dict(
- icon_url=icon_url
+ icon_url=icon_url,
)
return json_success(json_result)
@@ -40,7 +40,7 @@ def delete_icon_backend(request: HttpRequest, user_profile: UserProfile) -> Http
do_change_icon_source(user_profile.realm, user_profile.realm.ICON_FROM_GRAVATAR)
gravatar_url = realm_icon_url(user_profile.realm)
json_result = dict(
- icon_url=gravatar_url
+ icon_url=gravatar_url,
)
return json_success(json_result)
diff --git a/zerver/views/registration.py b/zerver/views/registration.py
index d9d6f460da..eb7dae16fb 100644
--- a/zerver/views/registration.py
+++ b/zerver/views/registration.py
@@ -210,7 +210,7 @@ def accounts_register(request: HttpRequest) -> HttpResponse:
elif 'full_name' in request.POST:
form = RegistrationForm(
initial={'full_name': request.POST.get('full_name')},
- realm_creation=realm_creation
+ realm_creation=realm_creation,
)
else:
form = RegistrationForm(realm_creation=realm_creation)
@@ -394,8 +394,8 @@ def accounts_register(request: HttpRequest) -> HttpResponse:
'MAX_REALM_NAME_LENGTH': str(Realm.MAX_REALM_NAME_LENGTH),
'MAX_NAME_LENGTH': str(UserProfile.MAX_NAME_LENGTH),
'MAX_PASSWORD_LENGTH': str(form.MAX_PASSWORD_LENGTH),
- 'MAX_REALM_SUBDOMAIN_LENGTH': str(Realm.MAX_REALM_SUBDOMAIN_LENGTH)
- }
+ 'MAX_REALM_SUBDOMAIN_LENGTH': str(Realm.MAX_REALM_SUBDOMAIN_LENGTH),
+ },
)
def login_and_go_to_home(request: HttpRequest, user_profile: UserProfile) -> HttpResponse:
@@ -595,7 +595,7 @@ def find_account(request: HttpRequest) -> HttpResponse:
return render(request,
'zerver/find_account.html',
context={'form': form, 'current_url': lambda: url,
- 'emails': emails},)
+ 'emails': emails})
def realm_redirect(request: HttpRequest) -> HttpResponse:
if request.method == 'POST':
diff --git a/zerver/views/report.py b/zerver/views/report.py
index 981f82c102..de1d62d549 100644
--- a/zerver/views/report.py
+++ b/zerver/views/report.py
@@ -27,7 +27,7 @@ def get_js_source_map() -> Optional[SourceMap]:
global js_source_map
if not js_source_map and not (settings.DEVELOPMENT or settings.TEST_SUITE):
js_source_map = SourceMap([
- static_path('webpack-bundles')
+ static_path('webpack-bundles'),
])
return js_source_map
@@ -90,7 +90,7 @@ def report_unnarrow_times(request: HttpRequest, user_profile: UserProfile,
def report_error(request: HttpRequest, user_profile: UserProfile, message: str=REQ(),
stacktrace: str=REQ(), ui_message: bool=REQ(validator=check_bool),
user_agent: str=REQ(), href: str=REQ(), log: str=REQ(),
- more_info: Optional[Dict[str, Any]]=REQ(validator=check_dict([]), default=None)
+ more_info: Optional[Dict[str, Any]]=REQ(validator=check_dict([]), default=None),
) -> HttpResponse:
"""Accepts an error report and stores in a queue for processing. The
actual error reports are later handled by do_report_error"""
@@ -143,7 +143,7 @@ def report_error(request: HttpRequest, user_profile: UserProfile, message: str=R
stacktrace = stacktrace,
log = log,
more_info = more_info,
- )
+ ),
))
return json_success()
diff --git a/zerver/views/storage.py b/zerver/views/storage.py
index 5fc4b6601b..23e7214640 100644
--- a/zerver/views/storage.py
+++ b/zerver/views/storage.py
@@ -26,7 +26,7 @@ def update_storage(request: HttpRequest, user_profile: UserProfile,
def get_storage(
request: HttpRequest,
user_profile: UserProfile,
- keys: Optional[List[str]]=REQ(validator=check_list(check_string), default=None)
+ keys: Optional[List[str]]=REQ(validator=check_list(check_string), default=None),
) -> HttpResponse:
keys = keys or get_keys_in_bot_storage(user_profile)
try:
@@ -39,7 +39,7 @@ def get_storage(
def remove_storage(
request: HttpRequest,
user_profile: UserProfile,
- keys: Optional[List[str]]=REQ(validator=check_list(check_string), default=None)
+ keys: Optional[List[str]]=REQ(validator=check_list(check_string), default=None),
) -> HttpResponse:
keys = keys or get_keys_in_bot_storage(user_profile)
try:
diff --git a/zerver/views/streams.py b/zerver/views/streams.py
index 4876f04f72..f8513a3372 100644
--- a/zerver/views/streams.py
+++ b/zerver/views/streams.py
@@ -111,7 +111,7 @@ def update_default_stream_group_info(request: HttpRequest, user_profile: UserPro
if not new_group_name and not new_description:
return json_error(_('You must pass "new_description" or "new_group_name".'))
- group = access_default_stream_group_by_id(user_profile.realm, group_id,)
+ group = access_default_stream_group_by_id(user_profile.realm, group_id)
if new_group_name is not None:
do_change_default_stream_group_name(user_profile.realm, group, new_group_name)
if new_description is not None:
@@ -124,7 +124,7 @@ def update_default_stream_group_streams(request: HttpRequest, user_profile: User
group_id: int, op: str=REQ(),
stream_names: List[str]=REQ(
validator=check_list(check_string))) -> None:
- group = access_default_stream_group_by_id(user_profile.realm, group_id,)
+ group = access_default_stream_group_by_id(user_profile.realm, group_id)
streams = []
for stream_name in stream_names:
(stream, recipient, sub) = access_stream_by_name(user_profile, stream_name)
@@ -154,7 +154,7 @@ def remove_default_stream(request: HttpRequest,
(stream, recipient, sub) = access_stream_by_id(
user_profile,
stream_id,
- allow_realm_admin=True
+ allow_realm_admin=True,
)
do_remove_default_stream(stream)
return json_success()
@@ -215,7 +215,7 @@ def list_subscriptions_backend(
include_subscribers: bool=REQ(validator=check_bool, default=False),
) -> HttpResponse:
subscribed, _ = gather_subscriptions(
- user_profile, include_subscribers=include_subscribers
+ user_profile, include_subscribers=include_subscribers,
)
return json_success({"subscriptions": subscribed})
@@ -233,7 +233,7 @@ def update_subscriptions_backend(
method_kwarg_pairs: List[FuncKwargPair] = [
(add_subscriptions_backend, dict(streams_raw=add)),
- (remove_subscriptions_backend, dict(streams_raw=delete))
+ (remove_subscriptions_backend, dict(streams_raw=delete)),
]
return compose_views(request, user_profile, method_kwarg_pairs)
@@ -324,7 +324,7 @@ def add_subscriptions_backend(
[('name', check_string)], optional_keys=[
('color', check_color),
('description', check_capped_string(Stream.MAX_DESCRIPTION_LENGTH)),
- ])
+ ]),
)),
invite_only: bool=REQ(validator=check_bool, default=False),
stream_post_policy: int=REQ(validator=check_int_in(
@@ -455,7 +455,7 @@ def add_subscriptions_backend(
stream=notifications_stream,
topic=topic,
content=content,
- )
+ ),
)
if not user_profile.realm.is_zephyr_mirror_realm and len(created_streams) > 0:
@@ -469,8 +469,8 @@ def add_subscriptions_backend(
topic=Realm.STREAM_EVENTS_NOTIFICATION_TOPIC,
content=_('Stream created by @_**%(user_name)s|%(user_id)d**.') % {
'user_name': user_profile.full_name,
- 'user_id': user_profile.id}
- )
+ 'user_id': user_profile.id},
+ ),
)
if len(notifications) > 0:
@@ -500,7 +500,7 @@ def get_streams_backend(
include_subscribed: bool=REQ(validator=check_bool, default=True),
include_all_active: bool=REQ(validator=check_bool, default=False),
include_default: bool=REQ(validator=check_bool, default=False),
- include_owner_subscribed: bool=REQ(validator=check_bool, default=False)
+ include_owner_subscribed: bool=REQ(validator=check_bool, default=False),
) -> HttpResponse:
streams = do_get_streams(user_profile, include_public=include_public,
@@ -593,8 +593,8 @@ def update_subscription_properties_backend(
validator=check_list(
check_dict([("stream_id", check_int),
("property", check_string),
- ("value", check_variable_type([check_string, check_bool]))])
- )
+ ("value", check_variable_type([check_string, check_bool]))]),
+ ),
),
) -> HttpResponse:
"""
diff --git a/zerver/views/submessage.py b/zerver/views/submessage.py
index 879bc13a1b..014cb80b90 100644
--- a/zerver/views/submessage.py
+++ b/zerver/views/submessage.py
@@ -12,7 +12,7 @@ from zerver.lib.message import access_message
from zerver.lib.validator import check_int
from zerver.lib.response import (
json_error,
- json_success
+ json_success,
)
from zerver.models import UserProfile
diff --git a/zerver/views/unsubscribe.py b/zerver/views/unsubscribe.py
index bc413a3ed3..4b5b561281 100644
--- a/zerver/views/unsubscribe.py
+++ b/zerver/views/unsubscribe.py
@@ -44,7 +44,7 @@ email_unsubscribers = {
"missed_messages": ("missed messages", do_missedmessage_unsubscribe),
"welcome": ("welcome", do_welcome_unsubscribe),
"digest": ("digest", do_digest_unsubscribe),
- "login": ("login", do_login_unsubscribe)
+ "login": ("login", do_login_unsubscribe),
}
# Login NOT required. These are for one-click unsubscribes.
diff --git a/zerver/views/user_groups.py b/zerver/views/user_groups.py
index 6b61a2a495..2aaddeda87 100644
--- a/zerver/views/user_groups.py
+++ b/zerver/views/user_groups.py
@@ -37,7 +37,7 @@ def get_user_group(request: HttpRequest, user_profile: UserProfile) -> HttpRespo
@has_request_variables
def edit_user_group(request: HttpRequest, user_profile: UserProfile,
user_group_id: int=REQ(validator=check_int),
- name: str=REQ(default=""), description: str=REQ(default="")
+ name: str=REQ(default=""), description: str=REQ(default=""),
) -> HttpResponse:
if not (name or description):
return json_error(_("No new data supplied"))
@@ -65,7 +65,7 @@ def delete_user_group(request: HttpRequest, user_profile: UserProfile,
def update_user_group_backend(request: HttpRequest, user_profile: UserProfile,
user_group_id: int=REQ(validator=check_int),
delete: List[int]=REQ(validator=check_list(check_int), default=[]),
- add: List[int]=REQ(validator=check_list(check_int), default=[])
+ add: List[int]=REQ(validator=check_list(check_int), default=[]),
) -> HttpResponse:
if not add and not delete:
return json_error(_('Nothing to do. Specify at least one of "add" or "delete".'))
@@ -74,7 +74,7 @@ def update_user_group_backend(request: HttpRequest, user_profile: UserProfile,
(add_members_to_group_backend,
dict(user_group_id=user_group_id, members=add)),
(remove_members_from_group_backend,
- dict(user_group_id=user_group_id, members=delete))
+ dict(user_group_id=user_group_id, members=delete)),
]
return compose_views(request, user_profile, method_kwarg_pairs)
diff --git a/zerver/views/user_settings.py b/zerver/views/user_settings.py
index 60ceed8010..86999d063a 100644
--- a/zerver/views/user_settings.py
+++ b/zerver/views/user_settings.py
@@ -83,7 +83,7 @@ def json_change_settings(request: HttpRequest, user_profile: UserProfile,
except RateLimited as e:
secs_to_freedom = int(float(str(e)))
return json_error(
- _("You're making too many attempts! Try again in %s seconds.") % (secs_to_freedom,)
+ _("You're making too many attempts! Try again in %s seconds.") % (secs_to_freedom,),
)
if not check_password_strength(new_password):
@@ -236,7 +236,7 @@ def set_avatar_backend(request: HttpRequest, user_profile: UserProfile) -> HttpR
user_avatar_url = avatar_url(user_profile)
json_result = dict(
- avatar_url = user_avatar_url
+ avatar_url = user_avatar_url,
)
return json_success(json_result)
@@ -248,7 +248,7 @@ def delete_avatar_backend(request: HttpRequest, user_profile: UserProfile) -> Ht
gravatar_url = avatar_url(user_profile)
json_result = dict(
- avatar_url = gravatar_url
+ avatar_url = gravatar_url,
)
return json_success(json_result)
@@ -258,7 +258,7 @@ def delete_avatar_backend(request: HttpRequest, user_profile: UserProfile) -> Ht
def regenerate_api_key(request: HttpRequest, user_profile: UserProfile) -> HttpResponse:
new_api_key = do_regenerate_api_key(user_profile, user_profile)
json_result = dict(
- api_key = new_api_key
+ api_key = new_api_key,
)
return json_success(json_result)
diff --git a/zerver/views/users.py b/zerver/views/users.py
index 547e582707..6e8af2d747 100644
--- a/zerver/views/users.py
+++ b/zerver/views/users.py
@@ -164,7 +164,7 @@ def patch_bot_backend(
service_interface: Optional[int]=REQ(validator=check_int, default=1),
default_sending_stream: Optional[str]=REQ(default=None),
default_events_register_stream: Optional[str]=REQ(default=None),
- default_all_public_streams: Optional[bool]=REQ(default=None, validator=check_bool)
+ default_all_public_streams: Optional[bool]=REQ(default=None, validator=check_bool),
) -> HttpResponse:
bot = access_bot_by_id(user_profile, bot_id)
@@ -244,7 +244,7 @@ def regenerate_bot_api_key(request: HttpRequest, user_profile: UserProfile, bot_
new_api_key = do_regenerate_api_key(bot, user_profile)
json_result = dict(
- api_key=new_api_key
+ api_key=new_api_key,
)
return json_success(json_result)
@@ -262,7 +262,7 @@ def add_bot_backend(
default_sending_stream_name: Optional[str]=REQ('default_sending_stream', default=None),
default_events_register_stream_name: Optional[str]=REQ('default_events_register_stream',
default=None),
- default_all_public_streams: Optional[bool]=REQ(validator=check_bool, default=None)
+ default_all_public_streams: Optional[bool]=REQ(validator=check_bool, default=None),
) -> HttpResponse:
short_name = check_short_name(short_name_raw)
if bot_type != UserProfile.INCOMING_WEBHOOK_BOT:
@@ -393,7 +393,7 @@ def get_bots_backend(request: HttpRequest, user_profile: UserProfile) -> HttpRes
def get_members_backend(request: HttpRequest, user_profile: UserProfile, user_id: Optional[int]=None,
include_custom_profile_fields: bool=REQ(validator=check_bool,
default=False),
- client_gravatar: bool=REQ(validator=check_bool, default=False)
+ client_gravatar: bool=REQ(validator=check_bool, default=False),
) -> HttpResponse:
'''
The client_gravatar field here is set to True if clients can compute
@@ -475,7 +475,7 @@ def get_profile_backend(request: HttpRequest, user_profile: UserProfile) -> Http
@has_request_variables
def get_subscription_backend(request: HttpRequest, user_profile: UserProfile,
user_id: int=REQ(validator=check_int, path_only=True),
- stream_id: int=REQ(validator=check_int, path_only=True)
+ stream_id: int=REQ(validator=check_int, path_only=True),
) -> HttpResponse:
target_user = access_user_by_id(user_profile, user_id, read_only=True)
(stream, recipient, sub) = access_stream_by_id(user_profile, stream_id)
diff --git a/zerver/views/video_calls.py b/zerver/views/video_calls.py
index f9574a8194..a1c43f084b 100644
--- a/zerver/views/video_calls.py
+++ b/zerver/views/video_calls.py
@@ -75,7 +75,7 @@ def register_zoom_user(request: HttpRequest) -> HttpResponse:
authorization_url, state = oauth.authorization_url(
"https://zoom.us/oauth/authorize",
state=json.dumps(
- {"realm": get_subdomain(request), "sid": get_zoom_sid(request)}
+ {"realm": get_subdomain(request), "sid": get_zoom_sid(request)},
),
)
return redirect(authorization_url)
diff --git a/zerver/webhooks/alertmanager/tests.py b/zerver/webhooks/alertmanager/tests.py
index 2b0b4de746..d64b923130 100644
--- a/zerver/webhooks/alertmanager/tests.py
+++ b/zerver/webhooks/alertmanager/tests.py
@@ -18,7 +18,7 @@ class AlertmanagerHookTests(WebhookTestCase):
'alert',
expected_topic,
expected_message,
- "application/json"
+ "application/json",
)
def test_single_error_issue_message(self) -> None:
@@ -31,5 +31,5 @@ class AlertmanagerHookTests(WebhookTestCase):
'single_alert',
expected_topic,
expected_message,
- "application/json"
+ "application/json",
)
diff --git a/zerver/webhooks/ansibletower/view.py b/zerver/webhooks/ansibletower/view.py
index 1526db92c2..b41329c8f5 100644
--- a/zerver/webhooks/ansibletower/view.py
+++ b/zerver/webhooks/ansibletower/view.py
@@ -52,7 +52,7 @@ def get_body(payload: Dict[str, Any]) -> str:
hoststatus = 'Success'
hosts_data.append({
'hostname': host,
- 'status': hoststatus
+ 'status': hoststatus,
})
if (payload['status'] == "successful"):
@@ -66,7 +66,7 @@ def get_body(payload: Dict[str, Any]) -> str:
id=payload['id'],
url=payload['url'],
status=status,
- hosts_final_data=get_hosts_content(hosts_data)
+ hosts_final_data=get_hosts_content(hosts_data),
)
else:
@@ -81,7 +81,7 @@ def get_body(payload: Dict[str, Any]) -> str:
"friendly_name": friendly_name,
"id": payload['id'],
"url": payload['url'],
- "status": status
+ "status": status,
}
return ANSIBLETOWER_DEFAULT_MESSAGE_TEMPLATE.format(**data)
@@ -92,6 +92,6 @@ def get_hosts_content(hosts_data: List[Dict[str, Any]]) -> str:
for host in hosts_data:
hosts_content += ANSIBLETOWER_JOB_HOST_ROW_TEMPLATE.format(
hostname=host.get('hostname'),
- status=host.get('status')
+ status=host.get('status'),
)
return hosts_content
diff --git a/zerver/webhooks/appveyor/view.py b/zerver/webhooks/appveyor/view.py
index a5903d74e6..9caadc9fe8 100644
--- a/zerver/webhooks/appveyor/view.py
+++ b/zerver/webhooks/appveyor/view.py
@@ -45,6 +45,6 @@ def get_body_for_http_request(payload: Dict[str, Any]) -> str:
"commit_message": event_data['commitMessage'],
"commit_id": event_data['commitId'],
"started": event_data['started'],
- "finished": event_data['finished']
+ "finished": event_data['finished'],
}
return APPVEYOR_MESSAGE_TEMPLATE.format(**data)
diff --git a/zerver/webhooks/basecamp/view.py b/zerver/webhooks/basecamp/view.py
index 4efd4f8906..8ba5412070 100644
--- a/zerver/webhooks/basecamp/view.py
+++ b/zerver/webhooks/basecamp/view.py
@@ -97,7 +97,7 @@ def get_questions_answer_body(event: str, payload: Dict[str, Any]) -> str:
verb=verb,
answer_url=get_subject_url(payload),
question_title=title,
- question_url=question['app_url']
+ question_url=question['app_url'],
)
def get_comment_body(event: str, payload: Dict[str, Any]) -> str:
@@ -110,7 +110,7 @@ def get_comment_body(event: str, payload: Dict[str, Any]) -> str:
verb=verb,
answer_url=get_subject_url(payload),
task_title=task['title'],
- task_url=task['app_url']
+ task_url=task['app_url'],
)
def get_questions_body(event: str, payload: Dict[str, Any]) -> str:
diff --git a/zerver/webhooks/beanstalk/view.py b/zerver/webhooks/beanstalk/view.py
index 2567bf102f..114642cdc3 100644
--- a/zerver/webhooks/beanstalk/view.py
+++ b/zerver/webhooks/beanstalk/view.py
@@ -20,7 +20,7 @@ from zerver.models import UserProfile
def build_message_from_gitlog(user_profile: UserProfile, name: str, ref: str,
commits: List[Dict[str, str]], before: str, after: str,
url: str, pusher: str, forced: Optional[str]=None,
- created: Optional[str]=None, deleted: Optional[bool]=False
+ created: Optional[str]=None, deleted: Optional[bool]=False,
) -> Tuple[str, str]:
short_ref = re.sub(r'^refs/heads/', '', ref)
subject = TOPIC_WITH_BRANCH_TEMPLATE.format(repo=name, branch=short_ref)
diff --git a/zerver/webhooks/beeminder/view.py b/zerver/webhooks/beeminder/view.py
index 45dcfac3ef..24faf86b5e 100644
--- a/zerver/webhooks/beeminder/view.py
+++ b/zerver/webhooks/beeminder/view.py
@@ -40,7 +40,7 @@ def api_beeminder_webhook(request: HttpRequest, user_profile: UserProfile,
time=time_remain,
limsum=limsum,
pledge=pledge,
- expression=expression
+ expression=expression,
)
check_send_webhook_message(request, user_profile, topic, body)
return json_success()
diff --git a/zerver/webhooks/bitbucket/view.py b/zerver/webhooks/bitbucket/view.py
index 57982e7847..583ef1ce71 100644
--- a/zerver/webhooks/bitbucket/view.py
+++ b/zerver/webhooks/bitbucket/view.py
@@ -27,7 +27,7 @@ def api_bitbucket_webhook(request: HttpRequest, user_profile: UserProfile,
'url': '{}{}commits/{}'.format(
payload.get('canon_url'),
repository.get('absolute_url'),
- commit.get('raw_node'))
+ commit.get('raw_node')),
}
for commit in payload['commits']
]
diff --git a/zerver/webhooks/bitbucket2/tests.py b/zerver/webhooks/bitbucket2/tests.py
index 4282e4b376..0f2ab83d24 100644
--- a/zerver/webhooks/bitbucket2/tests.py
+++ b/zerver/webhooks/bitbucket2/tests.py
@@ -109,14 +109,14 @@ class Bitbucket2HookTests(WebhookTestCase):
def test_bitbucket2_on_pull_request_created_event(self) -> None:
expected_message = "kolaszek created [PR #1](https://bitbucket.org/kolaszek/repository-name/pull-requests/1) (assigned to tkolek) from `new-branch` to `master`:\n\n~~~ quote\ndescription\n~~~"
kwargs = {
- "HTTP_X_EVENT_KEY": 'pullrequest:created'
+ "HTTP_X_EVENT_KEY": 'pullrequest:created',
}
self.send_and_test_stream_message('pull_request_created_or_updated', self.EXPECTED_TOPIC_PR_EVENTS, expected_message, **kwargs)
def test_bitbucket2_on_pull_request_created_without_reviewer_username_event(self) -> None:
expected_message = "kolaszek created [PR #1](https://bitbucket.org/kolaszek/repository-name/pull-requests/1) (assigned to Tomasz Kolek) from `new-branch` to `master`:\n\n~~~ quote\ndescription\n~~~"
kwargs = {
- "HTTP_X_EVENT_KEY": 'pullrequest:created'
+ "HTTP_X_EVENT_KEY": 'pullrequest:created',
}
self.send_and_test_stream_message('pull_request_created_or_updated_without_username',
self.EXPECTED_TOPIC_PR_EVENTS, expected_message, **kwargs)
@@ -126,21 +126,21 @@ class Bitbucket2HookTests(WebhookTestCase):
expected_topic = "notifications"
expected_message = "kolaszek created [PR #1 new commit](https://bitbucket.org/kolaszek/repository-name/pull-requests/1) (assigned to tkolek) from `new-branch` to `master`:\n\n~~~ quote\ndescription\n~~~"
kwargs = {
- "HTTP_X_EVENT_KEY": 'pullrequest:created'
+ "HTTP_X_EVENT_KEY": 'pullrequest:created',
}
self.send_and_test_stream_message('pull_request_created_or_updated', expected_topic, expected_message, **kwargs)
def test_bitbucket2_on_pull_request_updated_event(self) -> None:
expected_message = "kolaszek updated [PR #1](https://bitbucket.org/kolaszek/repository-name/pull-requests/1) (assigned to tkolek) from `new-branch` to `master`:\n\n~~~ quote\ndescription\n~~~"
kwargs = {
- "HTTP_X_EVENT_KEY": 'pullrequest:updated'
+ "HTTP_X_EVENT_KEY": 'pullrequest:updated',
}
self.send_and_test_stream_message('pull_request_created_or_updated', self.EXPECTED_TOPIC_PR_EVENTS, expected_message, **kwargs)
def test_bitbucket2_on_pull_request_approved_event(self) -> None:
expected_message = "kolaszek approved [PR #1](https://bitbucket.org/kolaszek/repository-name/pull-requests/1)."
kwargs = {
- "HTTP_X_EVENT_KEY": 'pullrequest:approved'
+ "HTTP_X_EVENT_KEY": 'pullrequest:approved',
}
self.send_and_test_stream_message('pull_request_approved_or_unapproved', self.EXPECTED_TOPIC_PR_EVENTS, expected_message, **kwargs)
@@ -149,35 +149,35 @@ class Bitbucket2HookTests(WebhookTestCase):
expected_topic = "notifications"
expected_message = "kolaszek approved [PR #1 new commit](https://bitbucket.org/kolaszek/repository-name/pull-requests/1)."
kwargs = {
- "HTTP_X_EVENT_KEY": 'pullrequest:approved'
+ "HTTP_X_EVENT_KEY": 'pullrequest:approved',
}
self.send_and_test_stream_message('pull_request_approved_or_unapproved', expected_topic, expected_message, **kwargs)
def test_bitbucket2_on_pull_request_unapproved_event(self) -> None:
expected_message = "kolaszek unapproved [PR #1](https://bitbucket.org/kolaszek/repository-name/pull-requests/1)."
kwargs = {
- "HTTP_X_EVENT_KEY": 'pullrequest:unapproved'
+ "HTTP_X_EVENT_KEY": 'pullrequest:unapproved',
}
self.send_and_test_stream_message('pull_request_approved_or_unapproved', self.EXPECTED_TOPIC_PR_EVENTS, expected_message, **kwargs)
def test_bitbucket2_on_pull_request_declined_event(self) -> None:
expected_message = "kolaszek rejected [PR #1](https://bitbucket.org/kolaszek/repository-name/pull-requests/1)."
kwargs = {
- "HTTP_X_EVENT_KEY": 'pullrequest:rejected'
+ "HTTP_X_EVENT_KEY": 'pullrequest:rejected',
}
self.send_and_test_stream_message('pull_request_fulfilled_or_rejected', self.EXPECTED_TOPIC_PR_EVENTS, expected_message, **kwargs)
def test_bitbucket2_on_pull_request_fulfilled_event(self) -> None:
expected_message = "kolaszek merged [PR #1](https://bitbucket.org/kolaszek/repository-name/pull-requests/1)."
kwargs = {
- "HTTP_X_EVENT_KEY": 'pullrequest:fulfilled'
+ "HTTP_X_EVENT_KEY": 'pullrequest:fulfilled',
}
self.send_and_test_stream_message('pull_request_fulfilled_or_rejected', self.EXPECTED_TOPIC_PR_EVENTS, expected_message, **kwargs)
def test_bitbucket2_on_pull_request_comment_created_event(self) -> None:
expected_message = "kolaszek [commented](https://bitbucket.org/kolaszek/repository-name/pull-requests/3/_/diff#comment-20576503) on [PR #1](https://bitbucket.org/kolaszek/repository-name/pull-requests/3):\n\n~~~ quote\nComment1\n~~~"
kwargs = {
- "HTTP_X_EVENT_KEY": 'pullrequest:comment_created'
+ "HTTP_X_EVENT_KEY": 'pullrequest:comment_created',
}
self.send_and_test_stream_message('pull_request_comment_action', self.EXPECTED_TOPIC_PR_EVENTS, expected_message, **kwargs)
@@ -186,14 +186,14 @@ class Bitbucket2HookTests(WebhookTestCase):
expected_topic = "notifications"
expected_message = "kolaszek [commented](https://bitbucket.org/kolaszek/repository-name/pull-requests/3/_/diff#comment-20576503) on [PR #1 new commit](https://bitbucket.org/kolaszek/repository-name/pull-requests/3):\n\n~~~ quote\nComment1\n~~~"
kwargs = {
- "HTTP_X_EVENT_KEY": 'pullrequest:comment_created'
+ "HTTP_X_EVENT_KEY": 'pullrequest:comment_created',
}
self.send_and_test_stream_message('pull_request_comment_action', expected_topic, expected_message, **kwargs)
def test_bitbucket2_on_pull_request_comment_updated_event(self) -> None:
expected_message = "kolaszek updated a [comment](https://bitbucket.org/kolaszek/repository-name/pull-requests/3/_/diff#comment-20576503) on [PR #1](https://bitbucket.org/kolaszek/repository-name/pull-requests/3):\n\n~~~ quote\nComment1\n~~~"
kwargs = {
- "HTTP_X_EVENT_KEY": 'pullrequest:comment_updated'
+ "HTTP_X_EVENT_KEY": 'pullrequest:comment_updated',
}
self.send_and_test_stream_message('pull_request_comment_action', self.EXPECTED_TOPIC_PR_EVENTS, expected_message, **kwargs)
@@ -202,14 +202,14 @@ class Bitbucket2HookTests(WebhookTestCase):
expected_topic = "notifications"
expected_message = "kolaszek updated a [comment](https://bitbucket.org/kolaszek/repository-name/pull-requests/3/_/diff#comment-20576503) on [PR #1 new commit](https://bitbucket.org/kolaszek/repository-name/pull-requests/3):\n\n~~~ quote\nComment1\n~~~"
kwargs = {
- "HTTP_X_EVENT_KEY": 'pullrequest:comment_updated'
+ "HTTP_X_EVENT_KEY": 'pullrequest:comment_updated',
}
self.send_and_test_stream_message('pull_request_comment_action', expected_topic, expected_message, **kwargs)
def test_bitbucket2_on_pull_request_comment_deleted_event(self) -> None:
expected_message = "kolaszek deleted a [comment](https://bitbucket.org/kolaszek/repository-name/pull-requests/3/_/diff#comment-20576503) on [PR #1](https://bitbucket.org/kolaszek/repository-name/pull-requests/3):\n\n~~~ quote\nComment1\n~~~"
kwargs = {
- "HTTP_X_EVENT_KEY": 'pullrequest:comment_deleted'
+ "HTTP_X_EVENT_KEY": 'pullrequest:comment_deleted',
}
self.send_and_test_stream_message('pull_request_comment_action', self.EXPECTED_TOPIC_PR_EVENTS, expected_message, **kwargs)
@@ -223,21 +223,21 @@ class Bitbucket2HookTests(WebhookTestCase):
def test_bitbucket2_on_push_one_tag_event(self) -> None:
expected_message = "kolaszek pushed tag [a](https://bitbucket.org/kolaszek/repository-name/commits/tag/a)."
kwargs = {
- "HTTP_X_EVENT_KEY": 'pullrequest:push'
+ "HTTP_X_EVENT_KEY": 'pullrequest:push',
}
self.send_and_test_stream_message('push_one_tag', self.EXPECTED_TOPIC, expected_message, **kwargs)
def test_bitbucket2_on_push_remove_tag_event(self) -> None:
expected_message = "kolaszek removed tag [a](https://bitbucket.org/kolaszek/repository-name/commits/tag/a)."
kwargs = {
- "HTTP_X_EVENT_KEY": 'pullrequest:push'
+ "HTTP_X_EVENT_KEY": 'pullrequest:push',
}
self.send_and_test_stream_message('push_remove_tag', self.EXPECTED_TOPIC, expected_message, **kwargs)
def test_bitbucket2_on_push_more_than_one_tag_event(self) -> None:
expected_message = "kolaszek pushed tag [{name}](https://bitbucket.org/kolaszek/repository-name/commits/tag/{name})."
kwargs = {
- "HTTP_X_EVENT_KEY": 'pullrequest:push'
+ "HTTP_X_EVENT_KEY": 'pullrequest:push',
}
self.send_and_test_stream_message('push_more_than_one_tag', **kwargs)
msg = self.get_last_message()
@@ -249,7 +249,7 @@ class Bitbucket2HookTests(WebhookTestCase):
def test_bitbucket2_on_more_than_one_push_event(self) -> None:
kwargs = {
- "HTTP_X_EVENT_KEY": 'pullrequest:push'
+ "HTTP_X_EVENT_KEY": 'pullrequest:push',
}
self.send_and_test_stream_message('more_than_one_push_event', **kwargs)
msg = self.get_second_to_last_message()
@@ -262,7 +262,7 @@ class Bitbucket2HookTests(WebhookTestCase):
def test_bitbucket2_on_more_than_one_push_event_filtered_by_branches(self) -> None:
self.url = self.build_webhook_url(branches='master,development')
kwargs = {
- "HTTP_X_EVENT_KEY": 'pullrequest:push'
+ "HTTP_X_EVENT_KEY": 'pullrequest:push',
}
self.send_and_test_stream_message('more_than_one_push_event', **kwargs)
msg = self.get_second_to_last_message()
@@ -275,7 +275,7 @@ class Bitbucket2HookTests(WebhookTestCase):
def test_bitbucket2_on_more_than_one_push_event_filtered_by_branches_ignore(self) -> None:
self.url = self.build_webhook_url(branches='changes,development')
kwargs = {
- "HTTP_X_EVENT_KEY": 'pullrequest:push'
+ "HTTP_X_EVENT_KEY": 'pullrequest:push',
}
expected_message = "kolaszek pushed tag [a](https://bitbucket.org/kolaszek/repository-name/commits/tag/a)."
self.send_and_test_stream_message('more_than_one_push_event',
diff --git a/zerver/webhooks/bitbucket2/view.py b/zerver/webhooks/bitbucket2/view.py
index 9e889af38c..1333b62f77 100644
--- a/zerver/webhooks/bitbucket2/view.py
+++ b/zerver/webhooks/bitbucket2/view.py
@@ -62,7 +62,7 @@ def api_bitbucket2_webhook(request: HttpRequest, user_profile: UserProfile,
if 'include_title' in signature(body_function).parameters:
body = body_function(
payload,
- include_title=user_specified_topic is not None
+ include_title=user_specified_topic is not None,
)
else:
body = body_function(payload)
@@ -81,7 +81,7 @@ def get_subject_for_branch_specified_events(payload: Dict[str, Any],
branch_name: Optional[str]=None) -> str:
return TOPIC_WITH_BRANCH_TEMPLATE.format(
repo=get_repository_name(payload['repository']),
- branch=get_branch_name_for_push_event(payload) if branch_name is None else branch_name
+ branch=get_branch_name_for_push_event(payload) if branch_name is None else branch_name,
)
def get_push_subjects(payload: Dict[str, Any]) -> List[str]:
@@ -108,14 +108,14 @@ def get_subject_based_on_type(payload: Dict[str, Any], type: str) -> Any:
repo=get_repository_name(payload['repository']),
type='PR',
id=payload['pullrequest']['id'],
- title=payload['pullrequest']['title']
+ title=payload['pullrequest']['title'],
)
if type.startswith('issue'):
return TOPIC_WITH_PR_OR_ISSUE_INFO_TEMPLATE.format(
repo=get_repository_name(payload['repository']),
type='Issue',
id=payload['issue']['id'],
- title=payload['issue']['title']
+ title=payload['issue']['title'],
)
if type == 'push':
return get_push_subjects(payload)
@@ -184,7 +184,7 @@ def get_force_push_body(payload: Dict[str, Any], change: Dict[str, Any]) -> str:
get_user_username(payload),
change['links']['html']['href'],
change['new']['name'],
- change['new']['target']['hash']
+ change['new']['target']['hash'],
)
def get_commit_author_name(commit: Dict[str, Any]) -> str:
@@ -205,7 +205,7 @@ def get_normal_push_body(payload: Dict[str, Any], change: Dict[str, Any]) -> str
change['links']['html']['href'],
change['new']['name'],
commits_data,
- is_truncated=change['truncated']
+ is_truncated=change['truncated'],
)
def get_fork_body(payload: Dict[str, Any]) -> str:
@@ -213,7 +213,7 @@ def get_fork_body(payload: Dict[str, Any]) -> str:
display_name=get_user_display_name(payload),
username=get_user_username(payload),
fork_name=get_repository_full_name(payload['fork']),
- fork_url=get_repository_url(payload['fork'])
+ fork_url=get_repository_url(payload['fork']),
)
def get_commit_comment_body(payload: Dict[str, Any]) -> str:
@@ -234,14 +234,14 @@ def get_commit_status_changed_body(payload: Dict[str, Any]) -> str:
commit_info = "[{short_commit_id}]({repo_url}/commits/{commit_id})".format(
repo_url=get_repository_url(payload['repository']),
short_commit_id=commit_id[:7],
- commit_id=commit_id
+ commit_id=commit_id,
)
return BITBUCKET_COMMIT_STATUS_CHANGED_BODY.format(
key=payload['commit_status']['key'],
system_url=payload['commit_status']['url'],
commit_info=commit_info,
- status=payload['commit_status']['state']
+ status=payload['commit_status']['state'],
)
def get_issue_commented_body(payload: Dict[str, Any],
@@ -266,7 +266,7 @@ def get_issue_action_body(payload: Dict[str, Any], action: str,
issue['id'],
message,
assignee,
- title=issue['title'] if include_title else None
+ title=issue['title'] if include_title else None,
)
def get_pull_request_action_body(payload: Dict[str, Any], action: str,
@@ -277,7 +277,7 @@ def get_pull_request_action_body(payload: Dict[str, Any], action: str,
action,
get_pull_request_url(pull_request),
pull_request.get('id'),
- title=pull_request['title'] if include_title else None
+ title=pull_request['title'] if include_title else None,
)
def get_pull_request_created_or_updated_body(payload: Dict[str, Any], action: str,
@@ -300,26 +300,26 @@ def get_pull_request_created_or_updated_body(payload: Dict[str, Any], action: st
base_branch=pull_request['destination']['branch']['name'],
message=pull_request['description'],
assignee=assignee,
- title=pull_request['title'] if include_title else None
+ title=pull_request['title'] if include_title else None,
)
def get_pull_request_comment_created_action_body(
payload: Dict[str, Any],
- include_title: Optional[bool]=False
+ include_title: Optional[bool]=False,
) -> str:
action = '[commented]({})'.format(payload['comment']['links']['html']['href'])
return get_pull_request_comment_action_body(payload, action, include_title)
def get_pull_request_deleted_or_updated_comment_action_body(
payload: Dict[str, Any], action: str,
- include_title: Optional[bool]=False
+ include_title: Optional[bool]=False,
) -> str:
action = "{} a [comment]({})".format(action, payload['comment']['links']['html']['href'])
return get_pull_request_comment_action_body(payload, action, include_title)
def get_pull_request_comment_action_body(
payload: Dict[str, Any], action: str,
- include_title: Optional[bool]=False
+ include_title: Optional[bool]=False,
) -> str:
action += ' on'
return get_pull_request_event_message(
@@ -328,7 +328,7 @@ def get_pull_request_comment_action_body(
payload['pullrequest']['links']['html']['href'],
payload['pullrequest']['id'],
message=payload['comment']['content']['raw'],
- title=payload['pullrequest']['title'] if include_title else None
+ title=payload['pullrequest']['title'] if include_title else None,
)
def get_push_tag_body(payload: Dict[str, Any], change: Dict[str, Any]) -> str:
@@ -343,7 +343,7 @@ def get_push_tag_body(payload: Dict[str, Any], change: Dict[str, Any]) -> str:
get_user_username(payload),
tag.get('name'),
tag_url=tag['links']['html'].get('href'),
- action=action
+ action=action,
)
def append_punctuation(title: str, message: str) -> str:
@@ -366,13 +366,13 @@ def get_repo_updated_body(payload: Dict[str, Any]) -> str:
if new and old:
message = BITBUCKET_REPO_UPDATED_CHANGED.format(
actor=actor, change=change, repo_name=repo_name,
- old=old, new=new
+ old=old, new=new,
)
message = append_punctuation(new, message) + '\n'
body += message
elif new and not old:
message = BITBUCKET_REPO_UPDATED_ADDED.format(
- actor=actor, change=change, repo_name=repo_name, new=new
+ actor=actor, change=change, repo_name=repo_name, new=new,
)
message = append_punctuation(new, message) + '\n'
body += message
diff --git a/zerver/webhooks/bitbucket3/view.py b/zerver/webhooks/bitbucket3/view.py
index 16a469ecd9..29dc805f03 100644
--- a/zerver/webhooks/bitbucket3/view.py
+++ b/zerver/webhooks/bitbucket3/view.py
@@ -51,7 +51,7 @@ def get_user_name(payload: Dict[str, Any]) -> str:
url=payload["actor"]["links"]["self"][0]["href"])
return user_name
-def ping_handler(payload: Dict[str, Any], include_title: Optional[str]=None
+def ping_handler(payload: Dict[str, Any], include_title: Optional[str]=None,
) -> List[Dict[str, str]]:
if include_title:
subject = include_title
@@ -74,7 +74,7 @@ def repo_comment_handler(payload: Dict[str, Any], action: str) -> List[Dict[str,
action=action,
commit_url=commit_url,
sha=sha,
- message=message
+ message=message,
)
return [{"subject": subject, "body": body}]
@@ -85,7 +85,7 @@ def repo_forked_handler(payload: Dict[str, Any]) -> List[Dict[str, str]]:
display_name=payload["actor"]["displayName"],
username=get_user_name(payload),
fork_name=payload["repository"]["name"],
- fork_url=payload["repository"]["links"]["self"][0]["href"]
+ fork_url=payload["repository"]["links"]["self"][0]["href"],
)
return [{"subject": subject, "body": body}]
@@ -97,7 +97,7 @@ def repo_modified_handler(payload: Dict[str, Any]) -> List[Dict[str, str]]:
change="name",
repo_name=payload["old"]["name"],
old=payload["old"]["name"],
- new=new_name
+ new=new_name,
) # As of writing this, the only change we'd be notified about is a name change.
punctuation = '.' if new_name[-1] not in string.punctuation else ''
body = f"{body}{punctuation}"
@@ -114,13 +114,13 @@ def repo_push_branch_data(payload: Dict[str, Any], change: Dict[str, Any]) -> Di
body = get_create_branch_event_message(
user_name=user_name,
url=None,
- branch_name=branch_name
+ branch_name=branch_name,
)
elif event_type == "UPDATE":
body = BRANCH_UPDATED_MESSAGE_TEMPLATE.format(
user_name=user_name,
branch_name=branch_name,
- head=branch_head
+ head=branch_head,
)
elif event_type == "DELETE":
body = get_remove_branch_event_message(user_name, branch_name)
@@ -148,7 +148,7 @@ def repo_push_tag_data(payload: Dict[str, Any], change: Dict[str, Any]) -> Dict[
body = get_push_tag_event_message(get_user_name(payload), tag_name, action=action)
return {"subject": subject, "body": body}
-def repo_push_handler(payload: Dict[str, Any], branches: Optional[str]=None
+def repo_push_handler(payload: Dict[str, Any], branches: Optional[str]=None,
) -> List[Dict[str, str]]:
data = []
for change in payload["changes"]:
@@ -190,7 +190,7 @@ def get_simple_pr_body(payload: Dict[str, Any], action: str, include_title: Opti
action=action,
url=pr["links"]["self"][0]["href"],
number=pr["id"],
- title=pr["title"] if include_title else None
+ title=pr["title"] if include_title else None,
)
def get_pr_opened_or_modified_body(payload: Dict[str, Any], action: str,
@@ -212,7 +212,7 @@ def get_pr_opened_or_modified_body(payload: Dict[str, Any], action: str,
"title": pr["title"] if include_title else None}
if include_title:
body = PULL_REQUEST_OPENED_OR_MODIFIED_TEMPLATE_WITH_REVIEWERS_WITH_TITLE.format(
- **parameters
+ **parameters,
)
else:
body = PULL_REQUEST_OPENED_OR_MODIFIED_TEMPLATE_WITH_REVIEWERS.format(**parameters)
@@ -230,7 +230,7 @@ def get_pr_opened_or_modified_body(payload: Dict[str, Any], action: str,
base_branch=pr["toRef"]["displayId"],
message=pr.get("description"),
assignee=assignees_string if assignees_string else None,
- title=pr["title"] if include_title else None
+ title=pr["title"] if include_title else None,
)
def get_pr_needs_work_body(payload: Dict[str, Any], include_title: Optional[bool]) -> str:
@@ -239,13 +239,13 @@ def get_pr_needs_work_body(payload: Dict[str, Any], include_title: Optional[bool
return PULL_REQUEST_MARKED_AS_NEEDS_WORK_TEMPLATE.format(
user_name=get_user_name(payload),
number=pr["id"],
- url=pr["links"]["self"][0]["href"]
+ url=pr["links"]["self"][0]["href"],
)
return PULL_REQUEST_MARKED_AS_NEEDS_WORK_TEMPLATE_WITH_TITLE.format(
user_name=get_user_name(payload),
number=pr["id"],
url=pr["links"]["self"][0]["href"],
- title=pr["title"]
+ title=pr["title"],
)
def get_pr_reassigned_body(payload: Dict[str, Any], include_title: Optional[bool]) -> str:
@@ -256,14 +256,14 @@ def get_pr_reassigned_body(payload: Dict[str, Any], include_title: Optional[bool
return PULL_REQUEST_REASSIGNED_TO_NONE_TEMPLATE.format(
user_name=get_user_name(payload),
number=pr["id"],
- url=pr["links"]["self"][0]["href"]
+ url=pr["links"]["self"][0]["href"],
)
punctuation = '.' if pr['title'][-1] not in string.punctuation else ''
message = PULL_REQUEST_REASSIGNED_TO_NONE_TEMPLATE_WITH_TITLE.format(
user_name=get_user_name(payload),
number=pr["id"],
url=pr["links"]["self"][0]["href"],
- title=pr["title"]
+ title=pr["title"],
)
message = f"{message}{punctuation}"
return message
@@ -272,14 +272,14 @@ def get_pr_reassigned_body(payload: Dict[str, Any], include_title: Optional[bool
user_name=get_user_name(payload),
number=pr["id"],
url=pr["links"]["self"][0]["href"],
- assignees=assignees_string
+ assignees=assignees_string,
)
return PULL_REQUEST_REASSIGNED_TEMPLATE_WITH_TITLE.format(
user_name=get_user_name(payload),
number=pr["id"],
url=pr["links"]["self"][0]["href"],
assignees=assignees_string,
- title=pr["title"]
+ title=pr["title"],
)
def pr_handler(payload: Dict[str, Any], action: str,
@@ -312,7 +312,7 @@ def pr_comment_handler(payload: Dict[str, Any], action: str,
url=pr["links"]["self"][0]["href"],
number=pr["id"],
message=message,
- title=pr["title"] if include_title else None
+ title=pr["title"] if include_title else None,
)
return [{"subject": subject, "body": body}]
@@ -351,7 +351,7 @@ def get_event_handler(eventkey: str) -> Callable[..., List[Dict[str, str]]]:
def api_bitbucket3_webhook(request: HttpRequest, user_profile: UserProfile,
payload: Dict[str, Any]=REQ(argument_type="body"),
branches: Optional[str]=REQ(default=None),
- user_specified_topic: Optional[str]=REQ("topic", default=None)
+ user_specified_topic: Optional[str]=REQ("topic", default=None),
) -> HttpResponse:
try:
eventkey = payload["eventKey"]
diff --git a/zerver/webhooks/buildbot/view.py b/zerver/webhooks/buildbot/view.py
index 4a7d514993..f455731233 100644
--- a/zerver/webhooks/buildbot/view.py
+++ b/zerver/webhooks/buildbot/view.py
@@ -31,14 +31,14 @@ def get_message(payload: Dict[str, Any]) -> str:
body = "Build [#{id}]({url}) for **{name}** started.".format(
id=payload["buildid"],
name=payload["buildername"],
- url=payload["url"]
+ url=payload["url"],
)
elif payload["event"] == "finished":
body = "Build [#{id}]({url}) (result: {status}) for **{name}** finished.".format(
id=payload["buildid"],
name=payload["buildername"],
url=payload["url"],
- status=status
+ status=status,
)
return body
diff --git a/zerver/webhooks/circleci/view.py b/zerver/webhooks/circleci/view.py
index 51ef8f8778..0a3d83d42d 100644
--- a/zerver/webhooks/circleci/view.py
+++ b/zerver/webhooks/circleci/view.py
@@ -33,7 +33,7 @@ def get_body(payload: Dict[str, Any]) -> str:
'build_url': payload['build_url'],
'username': payload['username'],
'branch': payload['branch'],
- 'status': get_status(payload)
+ 'status': get_status(payload),
}
return CIRCLECI_MESSAGE_TEMPLATE.format(**data)
diff --git a/zerver/webhooks/clubhouse/tests.py b/zerver/webhooks/clubhouse/tests.py
index f36972b5fa..72f802c430 100644
--- a/zerver/webhooks/clubhouse/tests.py
+++ b/zerver/webhooks/clubhouse/tests.py
@@ -14,7 +14,7 @@ class ClubhouseWebhookTest(WebhookTestCase):
expected_message = "New story [Add cool feature!](https://app.clubhouse.io/zulip/story/11) of type **feature** was created."
self.send_and_test_stream_message(
'story_create', "Add cool feature!",
- expected_message
+ expected_message,
)
def test_story_delete(self) -> None:
@@ -26,7 +26,7 @@ class ClubhouseWebhookTest(WebhookTestCase):
expected_message = "New story [An epic story!](https://app.clubhouse.io/zulip/story/23) was created and added to the epic **New Cool Epic!**."
self.send_and_test_stream_message(
'epic_create_story', "An epic story!",
- expected_message
+ expected_message,
)
def test_epic_delete(self) -> None:
diff --git a/zerver/webhooks/clubhouse/view.py b/zerver/webhooks/clubhouse/view.py
index 04c118b12e..68628753e9 100644
--- a/zerver/webhooks/clubhouse/view.py
+++ b/zerver/webhooks/clubhouse/view.py
@@ -129,7 +129,7 @@ def get_comment_added_body(payload: Dict[str, Any], entity: str) -> str:
elif action["entity_type"] == entity:
name_template = get_name_template(entity).format(
name=action["name"],
- app_url=action.get("app_url")
+ app_url=action.get("app_url"),
)
kwargs["name_template"] = name_template
@@ -145,8 +145,8 @@ def get_update_description_body(payload: Dict[str, Any], entity: str) -> str:
"old": desc["old"],
"name_template": get_name_template(entity).format(
name=action["name"],
- app_url=action.get("app_url")
- )
+ app_url=action.get("app_url"),
+ ),
}
if kwargs["new"] and kwargs["old"]:
@@ -165,7 +165,7 @@ def get_epic_update_state_body(payload: Dict[str, Any]) -> str:
"entity": "epic",
"new": state["new"],
"old": state["old"],
- "name_template": EPIC_NAME_TEMPLATE.format(name=action["name"])
+ "name_template": EPIC_NAME_TEMPLATE.format(name=action["name"]),
}
return STATE_CHANGED_TEMPLATE.format(**kwargs)
@@ -189,7 +189,7 @@ def get_story_update_state_body(payload: Dict[str, Any]) -> str:
"name_template": STORY_NAME_TEMPLATE.format(
name=action["name"],
app_url=action.get("app_url"),
- )
+ ),
}
return STATE_CHANGED_TEMPLATE.format(**kwargs)
@@ -203,8 +203,8 @@ def get_update_name_body(payload: Dict[str, Any], entity: str) -> str:
"old": name["old"],
"name_template": get_name_template(entity).format(
name=action["name"],
- app_url=action.get("app_url")
- )
+ app_url=action.get("app_url"),
+ ),
}
return NAME_CHANGED_TEMPLATE.format(**kwargs)
@@ -221,7 +221,7 @@ def get_update_archived_body(payload: Dict[str, Any], entity: str) -> str:
"entity": entity,
"name_template": get_name_template(entity).format(
name=primary_action["name"],
- app_url=primary_action.get("app_url")
+ app_url=primary_action.get("app_url"),
),
"action": action,
}
@@ -271,7 +271,7 @@ def get_story_update_epic_body(payload: Dict[str, Any]) -> str:
kwargs = {
"story_name_template": STORY_NAME_TEMPLATE.format(
name=action["name"],
- app_url=action["app_url"]
+ app_url=action["app_url"],
),
}
@@ -304,7 +304,7 @@ def get_story_update_estimate_body(payload: Dict[str, Any]) -> str:
kwargs = {
"story_name_template": STORY_NAME_TEMPLATE.format(
name=action["name"],
- app_url=action["app_url"]
+ app_url=action["app_url"],
),
}
@@ -356,8 +356,8 @@ def get_story_update_attachment_body(payload: Dict[str, Any]) -> Optional[str]:
kwargs = {
"name_template": STORY_NAME_TEMPLATE.format(
name=action["name"],
- app_url=action["app_url"]
- )
+ app_url=action["app_url"],
+ ),
}
file_ids_added = action["changes"]["file_ids"].get("adds")
@@ -381,8 +381,8 @@ def get_story_label_body(payload: Dict[str, Any]) -> Optional[str]:
kwargs = {
"name_template": STORY_NAME_TEMPLATE.format(
name=action["name"],
- app_url=action["app_url"]
- )
+ app_url=action["app_url"],
+ ),
}
label_ids_added = action["changes"]["label_ids"].get("adds")
@@ -411,8 +411,8 @@ def get_story_update_project_body(payload: Dict[str, Any]) -> str:
kwargs = {
"name_template": STORY_NAME_TEMPLATE.format(
name=action["name"],
- app_url=action["app_url"]
- )
+ app_url=action["app_url"],
+ ),
}
new_project_id = action["changes"]["project_id"]["new"]
@@ -430,10 +430,10 @@ def get_story_update_type_body(payload: Dict[str, Any]) -> str:
kwargs = {
"name_template": STORY_NAME_TEMPLATE.format(
name=action["name"],
- app_url=action["app_url"]
+ app_url=action["app_url"],
),
"new_type": action["changes"]["story_type"]["new"],
- "old_type": action["changes"]["story_type"]["old"]
+ "old_type": action["changes"]["story_type"]["old"],
}
return STORY_UPDATE_TYPE_TEMPLATE.format(**kwargs)
@@ -443,8 +443,8 @@ def get_story_update_owner_body(payload: Dict[str, Any]) -> str:
kwargs = {
"name_template": STORY_NAME_TEMPLATE.format(
name=action["name"],
- app_url=action["app_url"]
- )
+ app_url=action["app_url"],
+ ),
}
return STORY_UPDATE_OWNER_TEMPLATE.format(**kwargs)
@@ -517,7 +517,7 @@ IGNORED_EVENTS = {
@has_request_variables
def api_clubhouse_webhook(
request: HttpRequest, user_profile: UserProfile,
- payload: Optional[Dict[str, Any]]=REQ(argument_type='body')
+ payload: Optional[Dict[str, Any]]=REQ(argument_type='body'),
) -> HttpResponse:
# Clubhouse has a tendency to send empty POST requests to
diff --git a/zerver/webhooks/codeship/view.py b/zerver/webhooks/codeship/view.py
index 9e1edb9312..c17fd28deb 100644
--- a/zerver/webhooks/codeship/view.py
+++ b/zerver/webhooks/codeship/view.py
@@ -41,7 +41,7 @@ def get_body_for_http_request(payload: Dict[str, Any]) -> str:
build_url=payload['build_url'],
committer=payload['committer'],
branch=payload['branch'],
- status=get_status_message(payload)
+ status=get_status_message(payload),
)
diff --git a/zerver/webhooks/crashlytics/view.py b/zerver/webhooks/crashlytics/view.py
index def058a14a..2b9405bdc1 100644
--- a/zerver/webhooks/crashlytics/view.py
+++ b/zerver/webhooks/crashlytics/view.py
@@ -30,11 +30,11 @@ def api_crashlytics_webhook(request: HttpRequest, user_profile: UserProfile,
issue_body = payload['payload']
subject = CRASHLYTICS_TOPIC_TEMPLATE.format(
display_id=issue_body['display_id'],
- title=issue_body['title']
+ title=issue_body['title'],
)
body = CRASHLYTICS_MESSAGE_TEMPLATE.format(
impacted_devices_count=issue_body['impacted_devices_count'],
- url=issue_body['url']
+ url=issue_body['url'],
)
check_send_webhook_message(request, user_profile, subject, body)
diff --git a/zerver/webhooks/dialogflow/tests.py b/zerver/webhooks/dialogflow/tests.py
index 910262a32b..2781a95845 100644
--- a/zerver/webhooks/dialogflow/tests.py
+++ b/zerver/webhooks/dialogflow/tests.py
@@ -8,7 +8,7 @@ class DialogflowHookTests(WebhookTestCase):
self.url = self.build_webhook_url(
email="AARON@zulip.com",
username="aaron",
- user_ip="127.0.0.1"
+ user_ip="127.0.0.1",
)
expected_message = "Today the weather in Delhi: Sunny, And the tempreture is 65F"
self.send_and_test_private_message('default',
@@ -19,7 +19,7 @@ class DialogflowHookTests(WebhookTestCase):
self.url = self.build_webhook_url(
email="AARON@zulip.com",
username="aaron",
- user_ip="127.0.0.1"
+ user_ip="127.0.0.1",
)
expected_message = "The weather sure looks great !"
self.send_and_test_private_message('weather_app',
@@ -30,7 +30,7 @@ class DialogflowHookTests(WebhookTestCase):
self.url = self.build_webhook_url(
email="AARON@zulip.com",
username="aaron",
- user_ip="127.0.0.1"
+ user_ip="127.0.0.1",
)
expected_message = "Weather in New Delhi is nice!"
self.send_and_test_private_message('alternate_result',
@@ -41,7 +41,7 @@ class DialogflowHookTests(WebhookTestCase):
self.url = self.build_webhook_url(
email="AARON@zulip.com",
username="aaron",
- user_ip="127.0.0.1"
+ user_ip="127.0.0.1",
)
expected_message = "403 - Access Denied"
self.send_and_test_private_message('error_status',
@@ -52,7 +52,7 @@ class DialogflowHookTests(WebhookTestCase):
self.url = self.build_webhook_url(
email="AARON@zulip.com",
username="aaron",
- user_ip="127.0.0.1"
+ user_ip="127.0.0.1",
)
expected_message = "DialogFlow couldn't process your query."
self.send_and_test_private_message('exception',
diff --git a/zerver/webhooks/freshdesk/view.py b/zerver/webhooks/freshdesk/view.py
index 7cff69d77f..4156d64244 100644
--- a/zerver/webhooks/freshdesk/view.py
+++ b/zerver/webhooks/freshdesk/view.py
@@ -90,7 +90,7 @@ def format_freshdesk_note_message(ticket: TicketDict, event_info: List[str]) ->
email=ticket.requester_email,
note_type=note_type,
ticket_id=ticket.id,
- ticket_url=ticket.url
+ ticket_url=ticket.url,
)
return content
@@ -108,7 +108,7 @@ def format_freshdesk_property_change_message(ticket: TicketDict, event_info: Lis
ticket_url=ticket.url,
property_name=event_info[0].capitalize(),
old=event_info[1],
- new=event_info[2]
+ new=event_info[2],
)
return content
@@ -125,7 +125,7 @@ def format_freshdesk_ticket_creation_message(ticket: TicketDict) -> str:
description=cleaned_description,
type=ticket.type,
priority=ticket.priority,
- status=ticket.status
+ status=ticket.status,
)
return content
diff --git a/zerver/webhooks/front/view.py b/zerver/webhooks/front/view.py
index 819bb41b96..b61c808420 100644
--- a/zerver/webhooks/front/view.py
+++ b/zerver/webhooks/front/view.py
@@ -104,7 +104,7 @@ EVENT_FUNCTION_MAPPER = {
'trash': get_conversation_deleted_body,
'restore': get_conversation_restored_body,
'tag': get_conversation_tagged_body,
- 'untag': get_conversation_untagged_body
+ 'untag': get_conversation_untagged_body,
}
def get_body_based_on_event(event: str) -> Any:
diff --git a/zerver/webhooks/gci/view.py b/zerver/webhooks/gci/view.py
index 801235e95e..82d431a70c 100644
--- a/zerver/webhooks/gci/view.py
+++ b/zerver/webhooks/gci/view.py
@@ -108,7 +108,7 @@ def api_gci_webhook(request: HttpRequest, user_profile: UserProfile,
if event is not None:
body = get_body_based_on_event(event)(payload)
subject = GCI_TOPIC_TEMPLATE.format(
- student_name=payload['task_claimed_by']
+ student_name=payload['task_claimed_by'],
)
check_send_webhook_message(request, user_profile, subject, body)
diff --git a/zerver/webhooks/gitea/view.py b/zerver/webhooks/gitea/view.py
index 95f6b5d922..c001f4620a 100644
--- a/zerver/webhooks/gitea/view.py
+++ b/zerver/webhooks/gitea/view.py
@@ -24,7 +24,7 @@ def format_pull_request_event(payload: Dict[str, Any],
'target_branch': payload['pull_request']['head']['ref'],
'base_branch': payload['pull_request']['base']['ref'],
'title': payload['pull_request']['title'] if include_title else None,
- 'assignee': assignee['login'] if assignee else None
+ 'assignee': assignee['login'] if assignee else None,
}
if payload['pull_request']['merged']:
diff --git a/zerver/webhooks/github/view.py b/zerver/webhooks/github/view.py
index 603966201b..7fd1510f04 100644
--- a/zerver/webhooks/github/view.py
+++ b/zerver/webhooks/github/view.py
@@ -43,7 +43,7 @@ def get_opened_or_update_pull_request_body(payload: Dict[str, Any],
message=pull_request['body'],
assignee=assignee,
number=pull_request['number'],
- title=pull_request['title'] if include_title else None
+ title=pull_request['title'] if include_title else None,
)
def get_assigned_or_unassigned_pull_request_body(payload: Dict[str, Any],
@@ -58,7 +58,7 @@ def get_assigned_or_unassigned_pull_request_body(payload: Dict[str, Any],
payload['action'],
pull_request['html_url'],
number=pull_request['number'],
- title=pull_request['title'] if include_title else None
+ title=pull_request['title'] if include_title else None,
)
if assignee is not None:
return f"{base_message[:-1]} to {assignee}."
@@ -73,7 +73,7 @@ def get_closed_pull_request_body(payload: Dict[str, Any],
action,
pull_request['html_url'],
number=pull_request['number'],
- title=pull_request['title'] if include_title else None
+ title=pull_request['title'] if include_title else None,
)
def get_membership_body(payload: Dict[str, Any]) -> str:
@@ -87,7 +87,7 @@ def get_membership_body(payload: Dict[str, Any]) -> str:
username=member['login'],
html_url=member['html_url'],
preposition='from' if action == 'removed' else 'to',
- team_name=team_name
+ team_name=team_name,
)
def get_member_body(payload: Dict[str, Any]) -> str:
@@ -97,7 +97,7 @@ def get_member_body(payload: Dict[str, Any]) -> str:
payload['member']['login'],
payload['member']['html_url'],
get_repository_name(payload),
- payload['repository']['html_url']
+ payload['repository']['html_url'],
)
def get_issue_body(payload: Dict[str, Any],
@@ -112,7 +112,7 @@ def get_issue_body(payload: Dict[str, Any],
issue['number'],
issue['body'],
assignee=assignee['login'] if assignee else None,
- title=issue['title'] if include_title else None
+ title=issue['title'] if include_title else None,
)
def get_issue_comment_body(payload: Dict[str, Any],
@@ -133,7 +133,7 @@ def get_issue_comment_body(payload: Dict[str, Any],
issue['html_url'],
issue['number'],
comment['body'],
- title=issue['title'] if include_title else None
+ title=issue['title'] if include_title else None,
)
def get_fork_body(payload: Dict[str, Any]) -> str:
@@ -141,7 +141,7 @@ def get_fork_body(payload: Dict[str, Any]) -> str:
return "{} forked [{}]({}).".format(
get_sender_name(payload),
forkee['name'],
- forkee['html_url']
+ forkee['html_url'],
)
def get_deployment_body(payload: Dict[str, Any]) -> str:
@@ -158,7 +158,7 @@ def get_create_or_delete_body(payload: Dict[str, Any], action: str) -> str:
get_sender_name(payload),
action,
ref_type,
- payload['ref']
+ payload['ref'],
).rstrip()
def get_commit_comment_body(payload: Dict[str, Any]) -> str:
@@ -178,7 +178,7 @@ def get_push_tags_body(payload: Dict[str, Any]) -> str:
return get_push_tag_event_message(
get_sender_name(payload),
get_tag_name_from_ref(payload['ref']),
- action='pushed' if payload.get('created') else 'removed'
+ action='pushed' if payload.get('created') else 'removed',
)
def get_push_commits_body(payload: Dict[str, Any]) -> str:
@@ -187,14 +187,14 @@ def get_push_commits_body(payload: Dict[str, Any]) -> str:
commit.get('author').get('name')),
'sha': commit['id'],
'url': commit['url'],
- 'message': commit['message']
+ 'message': commit['message'],
} for commit in payload['commits']]
return get_push_commits_event_message(
get_sender_name(payload),
payload['compare'],
get_branch_name_from_ref(payload['ref']),
commits_data,
- deleted=payload['deleted']
+ deleted=payload['deleted'],
)
def get_public_body(payload: Dict[str, Any]) -> str:
@@ -217,20 +217,20 @@ def get_wiki_pages_body(payload: Dict[str, Any]) -> str:
def get_watch_body(payload: Dict[str, Any]) -> str:
return "{} starred [the repository]({}).".format(
get_sender_name(payload),
- payload['repository']['html_url']
+ payload['repository']['html_url'],
)
def get_repository_body(payload: Dict[str, Any]) -> str:
return "{} {} [the repository]({}).".format(
get_sender_name(payload),
payload.get('action'),
- payload['repository']['html_url']
+ payload['repository']['html_url'],
)
def get_add_team_body(payload: Dict[str, Any]) -> str:
return "[The repository]({}) was added to team {}.".format(
payload['repository']['html_url'],
- payload['team']['name']
+ payload['team']['name'],
)
def get_team_body(payload: Dict[str, Any]) -> str:
@@ -256,7 +256,7 @@ def get_release_body(payload: Dict[str, Any]) -> str:
'tagname': payload['release']['tag_name'],
# Not every GitHub release has a "name" set; if not there, use the tag name.
'release_name': payload['release']['name'] or payload['release']['tag_name'],
- 'url': payload['release']['html_url']
+ 'url': payload['release']['html_url'],
}
return get_release_event_message(**data)
@@ -273,26 +273,26 @@ def get_page_build_body(payload: Dict[str, Any]) -> str:
action = actions.get(status, f'is {status}')
action.format(
- CONTENT_MESSAGE_TEMPLATE.format(message=build['error']['message'])
+ CONTENT_MESSAGE_TEMPLATE.format(message=build['error']['message']),
)
return "Github Pages build, triggered by {}, {}.".format(
payload['build']['pusher']['login'],
- action
+ action,
)
def get_status_body(payload: Dict[str, Any]) -> str:
if payload['target_url']:
status = '[{}]({})'.format(
payload['state'],
- payload['target_url']
+ payload['target_url'],
)
else:
status = payload['state']
return "[{}]({}) changed its status to {}.".format(
payload['sha'][:7], # TODO
payload['commit']['html_url'],
- status
+ status,
)
def get_pull_request_ready_for_review_body(payload: Dict[str, Any],
@@ -302,21 +302,21 @@ def get_pull_request_ready_for_review_body(payload: Dict[str, Any],
return message.format(
sender = get_sender_name(payload),
pr_number = payload['pull_request']['number'],
- pr_url = payload['pull_request']['html_url']
+ pr_url = payload['pull_request']['html_url'],
)
def get_pull_request_review_body(payload: Dict[str, Any],
include_title: Optional[bool]=False) -> str:
title = "for #{} {}".format(
payload['pull_request']['number'],
- payload['pull_request']['title']
+ payload['pull_request']['title'],
)
return get_pull_request_event_message(
get_sender_name(payload),
'submitted',
payload['review']['html_url'],
type='PR Review',
- title=title if include_title else None
+ title=title if include_title else None,
)
def get_pull_request_review_comment_body(payload: Dict[str, Any],
@@ -328,7 +328,7 @@ def get_pull_request_review_comment_body(payload: Dict[str, Any],
title = "on #{} {}".format(
payload['pull_request']['number'],
- payload['pull_request']['title']
+ payload['pull_request']['title'],
)
return get_pull_request_event_message(
@@ -337,7 +337,7 @@ def get_pull_request_review_comment_body(payload: Dict[str, Any],
payload['comment']['html_url'],
message=message,
type='PR Review Comment',
- title=title if include_title else None
+ title=title if include_title else None,
)
def get_pull_request_review_requested_body(payload: Dict[str, Any],
@@ -375,7 +375,7 @@ def get_pull_request_review_requested_body(payload: Dict[str, Any],
reviewers=reviewers,
pr_number=pr_number,
pr_url=pr_url,
- title=payload['pull_request']['title'] if include_title else None
+ title=payload['pull_request']['title'] if include_title else None,
)
def get_check_run_body(payload: Dict[str, Any]) -> str:
@@ -390,9 +390,9 @@ Check [{name}]({html_url}) {status} ({conclusion}). ([{short_hash}]({commit_url}
'short_hash': payload['check_run']['head_sha'][:7],
'commit_url': "{}/commit/{}".format(
payload['repository']['html_url'],
- payload['check_run']['head_sha']
+ payload['check_run']['head_sha'],
),
- 'conclusion': payload['check_run']['conclusion']
+ 'conclusion': payload['check_run']['conclusion'],
}
return template.format(**kwargs)
@@ -401,7 +401,7 @@ def get_star_body(payload: Dict[str, Any]) -> str:
template = "{user} {action} the repository."
return template.format(
user=payload['sender']['login'],
- action='starred' if payload['action'] == 'created' else 'unstarred'
+ action='starred' if payload['action'] == 'created' else 'unstarred',
)
def get_ping_body(payload: Dict[str, Any]) -> str:
@@ -431,19 +431,19 @@ def get_subject_based_on_type(payload: Dict[str, Any], event: str) -> str:
repo=get_repository_name(payload),
type='PR',
id=payload['pull_request']['number'],
- title=payload['pull_request']['title']
+ title=payload['pull_request']['title'],
)
elif event.startswith('issue'):
return TOPIC_WITH_PR_OR_ISSUE_INFO_TEMPLATE.format(
repo=get_repository_name(payload),
type='Issue',
id=payload['issue']['number'],
- title=payload['issue']['title']
+ title=payload['issue']['title'],
)
elif event.startswith('deployment'):
return "{} / Deployment on {}".format(
get_repository_name(payload),
- payload['deployment']['environment']
+ payload['deployment']['environment'],
)
elif event == 'membership':
return "{} organization".format(payload['organization']['login'])
@@ -452,12 +452,12 @@ def get_subject_based_on_type(payload: Dict[str, Any], event: str) -> str:
elif event == 'push_commits':
return TOPIC_WITH_BRANCH_TEMPLATE.format(
repo=get_repository_name(payload),
- branch=get_branch_name_from_ref(payload['ref'])
+ branch=get_branch_name_from_ref(payload['ref']),
)
elif event == 'gollum':
return TOPIC_WITH_BRANCH_TEMPLATE.format(
repo=get_repository_name(payload),
- branch='Wiki Pages'
+ branch='Wiki Pages',
)
elif event == 'ping':
if payload.get('repository') is None:
@@ -525,7 +525,7 @@ def api_github_webhook(
if 'include_title' in signature(body_function).parameters:
body = body_function(
payload,
- include_title=user_specified_topic is not None
+ include_title=user_specified_topic is not None,
)
else:
body = body_function(payload)
diff --git a/zerver/webhooks/gitlab/tests.py b/zerver/webhooks/gitlab/tests.py
index 1769162f62..47f9d7edb8 100644
--- a/zerver/webhooks/gitlab/tests.py
+++ b/zerver/webhooks/gitlab/tests.py
@@ -425,7 +425,7 @@ class GitlabHookTests(WebhookTestCase):
'build_created',
expected_topic,
expected_message,
- HTTP_X_GITLAB_EVENT="Job Hook"
+ HTTP_X_GITLAB_EVENT="Job Hook",
)
def test_build_started_event_message(self) -> None:
@@ -436,7 +436,7 @@ class GitlabHookTests(WebhookTestCase):
'build_started',
expected_topic,
expected_message,
- HTTP_X_GITLAB_EVENT="Job Hook"
+ HTTP_X_GITLAB_EVENT="Job Hook",
)
def test_build_succeeded_event_message(self) -> None:
@@ -447,7 +447,7 @@ class GitlabHookTests(WebhookTestCase):
'build_succeeded',
expected_topic,
expected_message,
- HTTP_X_GITLAB_EVENT="Job Hook"
+ HTTP_X_GITLAB_EVENT="Job Hook",
)
def test_build_created_event_message_legacy_event_name(self) -> None:
@@ -458,7 +458,7 @@ class GitlabHookTests(WebhookTestCase):
'build_created',
expected_topic,
expected_message,
- HTTP_X_GITLAB_EVENT="Build Hook"
+ HTTP_X_GITLAB_EVENT="Build Hook",
)
def test_build_started_event_message_legacy_event_name(self) -> None:
@@ -469,7 +469,7 @@ class GitlabHookTests(WebhookTestCase):
'build_started',
expected_topic,
expected_message,
- HTTP_X_GITLAB_EVENT="Build Hook"
+ HTTP_X_GITLAB_EVENT="Build Hook",
)
def test_build_succeeded_event_message_legacy_event_name(self) -> None:
@@ -480,7 +480,7 @@ class GitlabHookTests(WebhookTestCase):
'build_succeeded',
expected_topic,
expected_message,
- HTTP_X_GITLAB_EVENT="Build Hook"
+ HTTP_X_GITLAB_EVENT="Build Hook",
)
def test_pipeline_succeeded_with_artifacts_event_message(self) -> None:
@@ -490,7 +490,7 @@ class GitlabHookTests(WebhookTestCase):
self.send_and_test_stream_message(
'pipeline_hook__pipline_succeeded_with_artifacts',
expected_topic,
- expected_message
+ expected_message,
)
def test_pipeline_succeeded_event_message(self) -> None:
@@ -500,7 +500,7 @@ class GitlabHookTests(WebhookTestCase):
self.send_and_test_stream_message(
'pipeline_hook__pipeline_succeeded',
expected_topic,
- expected_message
+ expected_message,
)
def test_pipeline_started_event_message(self) -> None:
@@ -510,7 +510,7 @@ class GitlabHookTests(WebhookTestCase):
self.send_and_test_stream_message(
'pipeline_hook__pipeline_started',
expected_topic,
- expected_message
+ expected_message,
)
def test_pipeline_pending_event_message(self) -> None:
@@ -520,7 +520,7 @@ class GitlabHookTests(WebhookTestCase):
self.send_and_test_stream_message(
'pipeline_hook__pipeline_pending',
expected_topic,
- expected_message
+ expected_message,
)
def test_issue_type_test_payload(self) -> None:
@@ -530,7 +530,7 @@ class GitlabHookTests(WebhookTestCase):
self.send_and_test_stream_message(
'test_hook__issue_test_payload',
expected_topic,
- expected_message
+ expected_message,
)
@patch('zerver.lib.webhooks.common.check_send_webhook_message')
diff --git a/zerver/webhooks/gitlab/view.py b/zerver/webhooks/gitlab/view.py
index e4c69d6356..80a6178070 100644
--- a/zerver/webhooks/gitlab/view.py
+++ b/zerver/webhooks/gitlab/view.py
@@ -35,7 +35,7 @@ def get_normal_push_event_body(payload: Dict[str, Any]) -> str:
compare_url = '{}/compare/{}...{}'.format(
get_project_homepage(payload),
payload['before'],
- payload['after']
+ payload['after'],
)
commits = [
@@ -43,7 +43,7 @@ def get_normal_push_event_body(payload: Dict[str, Any]) -> str:
'name': commit.get('author').get('name'),
'sha': commit.get('id'),
'message': commit.get('message'),
- 'url': commit.get('url')
+ 'url': commit.get('url'),
}
for commit in payload['commits']
]
@@ -52,20 +52,20 @@ def get_normal_push_event_body(payload: Dict[str, Any]) -> str:
get_user_name(payload),
compare_url,
get_branch_name(payload),
- commits
+ commits,
)
def get_remove_branch_event_body(payload: Dict[str, Any]) -> str:
return get_remove_branch_event_message(
get_user_name(payload),
- get_branch_name(payload)
+ get_branch_name(payload),
)
def get_tag_push_event_body(payload: Dict[str, Any]) -> str:
return get_push_tag_event_message(
get_user_name(payload),
get_tag_name(payload),
- action="pushed" if payload.get('checkout_sha') else "removed"
+ action="pushed" if payload.get('checkout_sha') else "removed",
)
def get_issue_created_event_body(payload: Dict[str, Any],
@@ -84,7 +84,7 @@ def get_issue_created_event_body(payload: Dict[str, Any],
description,
get_objects_assignee(payload),
payload.get('assignees'),
- title=payload['object_attributes'].get('title') if include_title else None
+ title=payload['object_attributes'].get('title') if include_title else None,
)
def get_issue_event_body(payload: Dict[str, Any], action: str,
@@ -94,7 +94,7 @@ def get_issue_event_body(payload: Dict[str, Any], action: str,
action,
get_object_url(payload),
payload['object_attributes'].get('iid'),
- title=payload['object_attributes'].get('title') if include_title else None
+ title=payload['object_attributes'].get('title') if include_title else None,
)
def get_merge_request_updated_event_body(payload: Dict[str, Any],
@@ -102,12 +102,12 @@ def get_merge_request_updated_event_body(payload: Dict[str, Any],
if payload['object_attributes'].get('oldrev'):
return get_merge_request_event_body(
payload, "added commit(s) to",
- include_title=include_title
+ include_title=include_title,
)
return get_merge_request_open_or_updated_body(
payload, "updated",
- include_title=include_title
+ include_title=include_title,
)
def get_merge_request_event_body(payload: Dict[str, Any], action: str,
@@ -119,7 +119,7 @@ def get_merge_request_event_body(payload: Dict[str, Any], action: str,
pull_request.get('url'),
pull_request.get('iid'),
type='MR',
- title=payload['object_attributes'].get('title') if include_title else None
+ title=payload['object_attributes'].get('title') if include_title else None,
)
def get_merge_request_open_or_updated_body(payload: Dict[str, Any], action: str,
@@ -135,7 +135,7 @@ def get_merge_request_open_or_updated_body(payload: Dict[str, Any], action: str,
pull_request.get('description'),
get_objects_assignee(payload),
type='MR',
- title=payload['object_attributes'].get('title') if include_title else None
+ title=payload['object_attributes'].get('title') if include_title else None,
)
def get_objects_assignee(payload: Dict[str, Any]) -> Optional[str]:
@@ -167,7 +167,7 @@ def get_commented_merge_request_event_body(payload: Dict[str, Any],
action = '[commented]({}) on'.format(comment['url'])
url = '{}/merge_requests/{}'.format(
payload['project'].get('web_url'),
- payload['merge_request'].get('iid')
+ payload['merge_request'].get('iid'),
)
return get_pull_request_event_message(
@@ -177,7 +177,7 @@ def get_commented_merge_request_event_body(payload: Dict[str, Any],
payload['merge_request'].get('iid'),
message=comment['note'],
type='MR',
- title=payload.get('merge_request').get('title') if include_title else None
+ title=payload.get('merge_request').get('title') if include_title else None,
)
def get_commented_issue_event_body(payload: Dict[str, Any],
@@ -186,7 +186,7 @@ def get_commented_issue_event_body(payload: Dict[str, Any],
action = '[commented]({}) on'.format(comment['url'])
url = '{}/issues/{}'.format(
payload['project'].get('web_url'),
- payload['issue'].get('iid')
+ payload['issue'].get('iid'),
)
return get_pull_request_event_message(
@@ -196,7 +196,7 @@ def get_commented_issue_event_body(payload: Dict[str, Any],
payload['issue'].get('iid'),
message=comment['note'],
type='Issue',
- title=payload.get('issue').get('title') if include_title else None
+ title=payload.get('issue').get('title') if include_title else None,
)
def get_commented_snippet_event_body(payload: Dict[str, Any],
@@ -205,7 +205,7 @@ def get_commented_snippet_event_body(payload: Dict[str, Any],
action = '[commented]({}) on'.format(comment['url'])
url = '{}/snippets/{}'.format(
payload['project'].get('web_url'),
- payload['snippet'].get('id')
+ payload['snippet'].get('id'),
)
return get_pull_request_event_message(
@@ -215,7 +215,7 @@ def get_commented_snippet_event_body(payload: Dict[str, Any],
payload['snippet'].get('id'),
message=comment['note'],
type='Snippet',
- title=payload.get('snippet').get('title') if include_title else None
+ title=payload.get('snippet').get('title') if include_title else None,
)
def get_wiki_page_event_body(payload: Dict[str, Any], action: str) -> str:
@@ -237,7 +237,7 @@ def get_build_hook_event_body(payload: Dict[str, Any]) -> str:
return "Build {} from {} stage {}.".format(
payload.get('build_name'),
payload.get('build_stage'),
- action
+ action,
)
def get_test_event_body(payload: Dict[str, Any]) -> str:
@@ -255,14 +255,14 @@ def get_pipeline_event_body(payload: Dict[str, Any]) -> str:
project_homepage = get_project_homepage(payload)
pipeline_url = '{}/pipelines/{}'.format(
project_homepage,
- payload['object_attributes'].get('id')
+ payload['object_attributes'].get('id'),
)
builds_status = ""
for build in payload['builds']:
build_url = '{}/-/jobs/{}'.format(
project_homepage,
- build.get('id')
+ build.get('id'),
)
artifact_filename = build.get('artifacts_file', {}).get('filename', None)
if artifact_filename:
@@ -275,13 +275,13 @@ def get_pipeline_event_body(payload: Dict[str, Any]) -> str:
build.get('name'),
build_url,
build.get('status'),
- artifact_string
+ artifact_string,
)
return "[Pipeline ({})]({}) {} with build(s):\n{}.".format(
payload['object_attributes'].get('id'),
pipeline_url,
action,
- builds_status[:-1]
+ builds_status[:-1],
)
def get_repo_name(payload: Dict[str, Any]) -> str:
@@ -356,7 +356,7 @@ def api_gitlab_webhook(request: HttpRequest, user_profile: UserProfile,
if 'include_title' in signature(event_body_function).parameters:
body = event_body_function(
payload,
- include_title=user_specified_topic is not None
+ include_title=user_specified_topic is not None,
)
else:
body = event_body_function(payload)
@@ -387,28 +387,28 @@ def get_subject_based_on_event(event: str, payload: Dict[str, Any]) -> str:
repo=get_repo_name(payload),
type='MR',
id=payload['object_attributes'].get('iid'),
- title=payload['object_attributes'].get('title')
+ title=payload['object_attributes'].get('title'),
)
elif event.startswith('Issue Hook') or event.startswith('Confidential Issue Hook'):
return TOPIC_WITH_PR_OR_ISSUE_INFO_TEMPLATE.format(
repo=get_repo_name(payload),
type='Issue',
id=payload['object_attributes'].get('iid'),
- title=payload['object_attributes'].get('title')
+ title=payload['object_attributes'].get('title'),
)
elif event == 'Note Hook Issue' or event == 'Confidential Note Hook Issue':
return TOPIC_WITH_PR_OR_ISSUE_INFO_TEMPLATE.format(
repo=get_repo_name(payload),
type='Issue',
id=payload['issue'].get('iid'),
- title=payload['issue'].get('title')
+ title=payload['issue'].get('title'),
)
elif event == 'Note Hook MergeRequest':
return TOPIC_WITH_PR_OR_ISSUE_INFO_TEMPLATE.format(
repo=get_repo_name(payload),
type='MR',
id=payload['merge_request'].get('iid'),
- title=payload['merge_request'].get('title')
+ title=payload['merge_request'].get('title'),
)
elif event == 'Note Hook Snippet':
@@ -416,7 +416,7 @@ def get_subject_based_on_event(event: str, payload: Dict[str, Any]) -> str:
repo=get_repo_name(payload),
type='Snippet',
id=payload['snippet'].get('id'),
- title=payload['snippet'].get('title')
+ title=payload['snippet'].get('title'),
)
return get_repo_name(payload)
diff --git a/zerver/webhooks/gocd/tests.py b/zerver/webhooks/gocd/tests.py
index 0a760ab35f..6ea9c8283c 100644
--- a/zerver/webhooks/gocd/tests.py
+++ b/zerver/webhooks/gocd/tests.py
@@ -18,7 +18,7 @@ class GocdHookTests(WebhookTestCase):
'pipeline',
self.TOPIC,
expected_message,
- content_type="application/x-www-form-urlencoded"
+ content_type="application/x-www-form-urlencoded",
)
def test_failed_message(self) -> None:
@@ -32,7 +32,7 @@ class GocdHookTests(WebhookTestCase):
'pipeline_failed',
self.TOPIC,
expected_message,
- content_type="application/x-www-form-urlencoded"
+ content_type="application/x-www-form-urlencoded",
)
def get_body(self, fixture_name: str) -> str:
diff --git a/zerver/webhooks/gocd/view.py b/zerver/webhooks/gocd/view.py
index f7a7e4a3e7..1a7407432e 100644
--- a/zerver/webhooks/gocd/view.py
+++ b/zerver/webhooks/gocd/view.py
@@ -44,7 +44,7 @@ def api_gocd_webhook(request: HttpRequest, user_profile: UserProfile,
result,
emoji,
build_link,
- modifications['comment']
+ modifications['comment'],
)
branch = material['description'].split(",")
topic = branch[0].split(" ")[1]
diff --git a/zerver/webhooks/gogs/view.py b/zerver/webhooks/gogs/view.py
index 16f9973589..e43f2b75ad 100644
--- a/zerver/webhooks/gogs/view.py
+++ b/zerver/webhooks/gogs/view.py
@@ -32,7 +32,7 @@ def format_push_event(payload: Dict[str, Any]) -> str:
'user_name': payload['sender']['username'],
'compare_url': payload['compare_url'],
'branch_name': payload['ref'].replace('refs/heads/', ''),
- 'commits_data': payload['commits']
+ 'commits_data': payload['commits'],
}
return get_push_commits_event_message(**data)
@@ -45,7 +45,7 @@ def format_new_branch_event(payload: Dict[str, Any]) -> str:
data = {
'user_name': payload['sender']['username'],
'url': url,
- 'branch_name': branch_name
+ 'branch_name': branch_name,
}
return get_create_branch_event_message(**data)
@@ -59,7 +59,7 @@ def format_pull_request_event(payload: Dict[str, Any],
'number': payload['pull_request']['number'],
'target_branch': payload['pull_request']['head_branch'],
'base_branch': payload['pull_request']['base_branch'],
- 'title': payload['pull_request']['title'] if include_title else None
+ 'title': payload['pull_request']['title'] if include_title else None,
}
if payload['pull_request']['merged']:
@@ -78,7 +78,7 @@ def format_issues_event(payload: Dict[str, Any], include_title: Optional[bool]=F
issue_nr,
payload['issue']['body'],
assignee=assignee['login'] if assignee else None,
- title=payload['issue']['title'] if include_title else None
+ title=payload['issue']['title'] if include_title else None,
)
def format_issue_comment_event(payload: Dict[str, Any], include_title: Optional[bool]=False) -> str:
@@ -98,7 +98,7 @@ def format_issue_comment_event(payload: Dict[str, Any], include_title: Optional[
get_issue_url(payload['repository']['html_url'], issue['number']),
issue['number'],
comment['body'],
- title=issue['title'] if include_title else None
+ title=issue['title'] if include_title else None,
)
def format_release_event(payload: Dict[str, Any], include_title: Optional[bool]=False) -> str:
@@ -107,7 +107,7 @@ def format_release_event(payload: Dict[str, Any], include_title: Optional[bool]=
'action': payload['action'],
'tagname': payload['release']['tag_name'],
'release_name': payload['release']['name'],
- 'url': payload['repository']['html_url']
+ 'url': payload['repository']['html_url'],
}
return get_release_event_message(**data)
@@ -136,56 +136,56 @@ def gogs_webhook_main(integration_name: str, http_header_name: str,
body = format_push_event(payload)
topic = TOPIC_WITH_BRANCH_TEMPLATE.format(
repo=repo,
- branch=branch
+ branch=branch,
)
elif event == 'create':
body = format_new_branch_event(payload)
topic = TOPIC_WITH_BRANCH_TEMPLATE.format(
repo=repo,
- branch=payload['ref']
+ branch=payload['ref'],
)
elif event == 'pull_request':
body = format_pull_request_event(
payload,
- include_title=user_specified_topic is not None
+ include_title=user_specified_topic is not None,
)
topic = TOPIC_WITH_PR_OR_ISSUE_INFO_TEMPLATE.format(
repo=repo,
type='PR',
id=payload['pull_request']['id'],
- title=payload['pull_request']['title']
+ title=payload['pull_request']['title'],
)
elif event == 'issues':
body = format_issues_event(
payload,
- include_title=user_specified_topic is not None
+ include_title=user_specified_topic is not None,
)
topic = TOPIC_WITH_PR_OR_ISSUE_INFO_TEMPLATE.format(
repo=repo,
type='Issue',
id=payload['issue']['number'],
- title=payload['issue']['title']
+ title=payload['issue']['title'],
)
elif event == 'issue_comment':
body = format_issue_comment_event(
payload,
- include_title=user_specified_topic is not None
+ include_title=user_specified_topic is not None,
)
topic = TOPIC_WITH_PR_OR_ISSUE_INFO_TEMPLATE.format(
repo=repo,
type='Issue',
id=payload['issue']['number'],
- title=payload['issue']['title']
+ title=payload['issue']['title'],
)
elif event == 'release':
body = format_release_event(
payload,
- include_title=user_specified_topic is not None
+ include_title=user_specified_topic is not None,
)
topic = TOPIC_WITH_RELEASE_TEMPLATE.format(
repo=repo,
tag=payload['release']['tag_name'],
- title=payload['release']['name']
+ title=payload['release']['name'],
)
else:
diff --git a/zerver/webhooks/gosquared/tests.py b/zerver/webhooks/gosquared/tests.py
index 1d3e1538ca..ddeef85640 100644
--- a/zerver/webhooks/gosquared/tests.py
+++ b/zerver/webhooks/gosquared/tests.py
@@ -20,7 +20,7 @@ class GoSquaredHookTests(WebhookTestCase):
expected_message = CHAT_MESSAGE_TEMPLATE.format(
status='visitor',
name='John Smith',
- content='Zulip is awesome!'
+ content='Zulip is awesome!',
)
self.send_and_test_stream_message('chat_message', expected_topic, expected_message,
diff --git a/zerver/webhooks/gosquared/view.py b/zerver/webhooks/gosquared/view.py
index 91ff5ffbb0..ec6aacd5a3 100644
--- a/zerver/webhooks/gosquared/view.py
+++ b/zerver/webhooks/gosquared/view.py
@@ -51,7 +51,7 @@ def api_gosquared_webhook(request: HttpRequest, user_profile: UserProfile,
body = CHAT_MESSAGE_TEMPLATE.format(
status=payload['person']['status'],
name=payload['person']['_anon']['name'],
- content=payload['message']['content']
+ content=payload['message']['content'],
)
check_send_webhook_message(request, user_profile, topic, body)
else:
diff --git a/zerver/webhooks/grafana/view.py b/zerver/webhooks/grafana/view.py
index a76669471b..9051d7aaec 100644
--- a/zerver/webhooks/grafana/view.py
+++ b/zerver/webhooks/grafana/view.py
@@ -16,7 +16,7 @@ GRAFANA_MESSAGE_TEMPLATE = '[{rule_name}]({rule_url})\n\n{alert_message}{eval_ma
@has_request_variables
def api_grafana_webhook(
request: HttpRequest, user_profile: UserProfile,
- payload: Dict[str, Any]=REQ(argument_type='body')
+ payload: Dict[str, Any]=REQ(argument_type='body'),
) -> HttpResponse:
topic = GRAFANA_TOPIC_TEMPLATE.format(alert_title=payload['title'])
diff --git a/zerver/webhooks/greenhouse/view.py b/zerver/webhooks/greenhouse/view.py
index 3f8dcb5d62..7e0462a0c4 100644
--- a/zerver/webhooks/greenhouse/view.py
+++ b/zerver/webhooks/greenhouse/view.py
@@ -50,7 +50,7 @@ def api_greenhouse_webhook(request: HttpRequest, user_profile: UserProfile,
candidate_id=str(candidate['id']),
role=application['jobs'][0]['name'],
emails=dict_list_to_string(application['candidate']['email_addresses']),
- attachments=dict_list_to_string(application['candidate']['attachments'])
+ attachments=dict_list_to_string(application['candidate']['attachments']),
)
topic = "{} - {}".format(action, str(candidate['id']))
diff --git a/zerver/webhooks/groove/view.py b/zerver/webhooks/groove/view.py
index b980d0faf2..76b508056f 100644
--- a/zerver/webhooks/groove/view.py
+++ b/zerver/webhooks/groove/view.py
@@ -39,7 +39,7 @@ def ticket_assigned_body(payload: Dict[str, Any]) -> Optional[str]:
'state': 'open' if state == 'opened' else state,
'number': payload['number'],
'title': payload['title'],
- 'app_url': payload['app_url']
+ 'app_url': payload['app_url'],
}
assignee = payload['assignee']
@@ -67,7 +67,7 @@ def replied_body(payload: Dict[str, Any], actor: str, action: str) -> str:
action=action,
number=number,
app_ticket_url=payload['app_ticket_url'],
- plain_text_body=payload['plain_text_body']
+ plain_text_body=payload['plain_text_body'],
)
return body
@@ -100,7 +100,7 @@ EVENTS_FUNCTION_MAPPER = {
'ticket_assigned': ticket_assigned_body,
'agent_replied': partial(replied_body, actor='agent', action='replied to'),
'customer_replied': partial(replied_body, actor='customer', action='replied to'),
- 'note_added': partial(replied_body, actor='agent', action='left a note on')
+ 'note_added': partial(replied_body, actor='agent', action='left a note on'),
}
fixture_to_headers = get_http_headers_from_filename("HTTP_X_GROOVE_EVENT")
diff --git a/zerver/webhooks/harbor/view.py b/zerver/webhooks/harbor/view.py
index e47774f150..64a6846cb7 100644
--- a/zerver/webhooks/harbor/view.py
+++ b/zerver/webhooks/harbor/view.py
@@ -17,7 +17,7 @@ IGNORED_EVENTS = [
"uploadChart",
"pullImage",
"deleteImage",
- "scanningFailed"
+ "scanningFailed",
]
@@ -75,7 +75,7 @@ def handle_scanning_completed_event(payload: Dict[str, Any],
return SCANNING_COMPLETED_TEMPLATE.format(
image_name=payload["event_data"]["repository"]["repo_full_name"],
image_tag=payload["event_data"]["resources"][0]["tag"],
- scan_results=scan_results
+ scan_results=scan_results,
)
diff --git a/zerver/webhooks/hellosign/view.py b/zerver/webhooks/hellosign/view.py
index 3a0c82852f..6dd775af05 100644
--- a/zerver/webhooks/hellosign/view.py
+++ b/zerver/webhooks/hellosign/view.py
@@ -25,12 +25,12 @@ def get_message_body(payload: Dict[str, Dict[str, Any]]) -> str:
recipients_text = ""
if recipients.get('awaiting_signature'):
recipients_text += IS_AWAITING_SIGNATURE.format(
- awaiting_recipients=get_recipients_text(recipients['awaiting_signature'])
+ awaiting_recipients=get_recipients_text(recipients['awaiting_signature']),
)
if recipients.get('signed'):
text = WAS_JUST_SIGNED_BY.format(
- signed_recipients=get_recipients_text(recipients['signed'])
+ signed_recipients=get_recipients_text(recipients['signed']),
)
if recipients_text:
diff --git a/zerver/webhooks/helloworld/view.py b/zerver/webhooks/helloworld/view.py
index 2a8df7a145..826291d375 100644
--- a/zerver/webhooks/helloworld/view.py
+++ b/zerver/webhooks/helloworld/view.py
@@ -14,7 +14,7 @@ from zerver.models import UserProfile
@has_request_variables
def api_helloworld_webhook(
request: HttpRequest, user_profile: UserProfile,
- payload: Dict[str, Iterable[Dict[str, Any]]]=REQ(argument_type='body')
+ payload: Dict[str, Iterable[Dict[str, Any]]]=REQ(argument_type='body'),
) -> HttpResponse:
# construct the body of the message
diff --git a/zerver/webhooks/insping/view.py b/zerver/webhooks/insping/view.py
index ef49bd41c6..152de3ad44 100644
--- a/zerver/webhooks/insping/view.py
+++ b/zerver/webhooks/insping/view.py
@@ -20,7 +20,7 @@ State changed to **{state}**:
@has_request_variables
def api_insping_webhook(
request: HttpRequest, user_profile: UserProfile,
- payload: Dict[str, Dict[str, Any]]=REQ(argument_type='body')
+ payload: Dict[str, Dict[str, Any]]=REQ(argument_type='body'),
) -> HttpResponse:
data = payload['webhook_event_data']
@@ -35,7 +35,7 @@ def api_insping_webhook(
body = MESSAGE_TEMPLATE.format(
state=state_name, url=url_tested,
- response_time=response_time, timestamp=time_formatted
+ response_time=response_time, timestamp=time_formatted,
)
topic = 'insping'
diff --git a/zerver/webhooks/intercom/tests.py b/zerver/webhooks/intercom/tests.py
index 62dceb3c63..3c27ff787d 100644
--- a/zerver/webhooks/intercom/tests.py
+++ b/zerver/webhooks/intercom/tests.py
@@ -26,7 +26,7 @@ New company **Kandra Labs** created:
self.send_and_test_stream_message(
'company_created',
expected_topic,
- expected_message
+ expected_message,
)
def test_contact_added_email(self) -> None:
@@ -35,7 +35,7 @@ New company **Kandra Labs** created:
self.send_and_test_stream_message(
'contact_added_email',
expected_topic,
- expected_message
+ expected_message,
)
def test_contact_created(self) -> None:
@@ -49,7 +49,7 @@ New contact created:
self.send_and_test_stream_message(
'contact_created',
expected_topic,
- expected_message
+ expected_message,
)
def test_contact_signed_up(self) -> None:
@@ -62,7 +62,7 @@ Contact signed up:
self.send_and_test_stream_message(
'contact_signed_up',
expected_topic,
- expected_message
+ expected_message,
)
def test_contact_tag_created(self) -> None:
@@ -71,7 +71,7 @@ Contact signed up:
self.send_and_test_stream_message(
'contact_tag_created',
expected_topic,
- expected_message
+ expected_message,
)
def test_contact_tag_deleted(self) -> None:
@@ -80,7 +80,7 @@ Contact signed up:
self.send_and_test_stream_message(
'contact_tag_deleted',
expected_topic,
- expected_message
+ expected_message,
)
def test_conversation_admin_assigned(self) -> None:
@@ -89,7 +89,7 @@ Contact signed up:
self.send_and_test_stream_message(
'conversation_admin_assigned',
expected_topic,
- expected_message
+ expected_message,
)
def test_conversation_admin_opened(self) -> None:
@@ -98,7 +98,7 @@ Contact signed up:
self.send_and_test_stream_message(
'conversation_admin_opened',
expected_topic,
- expected_message
+ expected_message,
)
def test_conversation_admin_closed(self) -> None:
@@ -107,7 +107,7 @@ Contact signed up:
self.send_and_test_stream_message(
'conversation_admin_closed',
expected_topic,
- expected_message
+ expected_message,
)
def test_conversation_admin_snoozed(self) -> None:
@@ -116,7 +116,7 @@ Contact signed up:
self.send_and_test_stream_message(
'conversation_admin_snoozed',
expected_topic,
- expected_message
+ expected_message,
)
def test_conversation_admin_unsnoozed(self) -> None:
@@ -125,7 +125,7 @@ Contact signed up:
self.send_and_test_stream_message(
'conversation_admin_unsnoozed',
expected_topic,
- expected_message
+ expected_message,
)
def test_conversation_admin_replied(self) -> None:
@@ -140,7 +140,7 @@ Hey Eeshan! How can I help?
self.send_and_test_stream_message(
'conversation_admin_replied',
expected_topic,
- expected_message
+ expected_message,
)
def test_conversation_admin_noted(self) -> None:
@@ -155,7 +155,7 @@ Talk to Tim about this user's query.
self.send_and_test_stream_message(
'conversation_admin_noted',
expected_topic,
- expected_message
+ expected_message,
)
def test_conversation_admin_single_created(self) -> None:
@@ -170,7 +170,7 @@ Hi Eeshan, What's up
self.send_and_test_stream_message(
'conversation_admin_single_created',
expected_topic,
- expected_message
+ expected_message,
)
def test_conversation_user_created(self) -> None:
@@ -185,7 +185,7 @@ Hello everyone!
self.send_and_test_stream_message(
'conversation_user_created',
expected_topic,
- expected_message
+ expected_message,
)
def test_conversation_user_replied(self) -> None:
@@ -200,7 +200,7 @@ Well, I need some help getting access to a developer account.
self.send_and_test_stream_message(
'conversation_user_replied',
expected_topic,
- expected_message
+ expected_message,
)
def test_event_created(self) -> None:
@@ -209,7 +209,7 @@ Well, I need some help getting access to a developer account.
self.send_and_test_stream_message(
'event_created',
expected_topic,
- expected_message
+ expected_message,
)
def test_user_created(self) -> None:
@@ -223,28 +223,28 @@ New user created:
self.send_and_test_stream_message(
'user_created',
expected_topic,
- expected_message
+ expected_message,
)
def test_user_deleted(self) -> None:
self.send_and_test_stream_message(
'user_deleted',
'User: jerryguitarist@gmail.com',
- 'User deleted.'
+ 'User deleted.',
)
def test_user_email_updated(self) -> None:
self.send_and_test_stream_message(
'user_email_updated',
'Contact: Azure Bus from St. John\'s',
- 'User\'s email was updated to aaron@zulip.com.'
+ 'User\'s email was updated to aaron@zulip.com.',
)
def test_user_tag_created(self) -> None:
self.send_and_test_stream_message(
'user_tag_created',
'User: eeshangarg',
- 'The tag `developer` was added to the user.'
+ 'The tag `developer` was added to the user.',
)
def test_user_tag_deleted(self) -> None:
@@ -254,14 +254,14 @@ New user created:
self.send_and_test_stream_message(
'user_tag_deleted',
expected_topic,
- expected_message
+ expected_message,
)
def test_user_unsubscribed(self) -> None:
self.send_and_test_stream_message(
'user_unsubscribed',
'Contact: Eeshan Garg',
- 'User unsubscribed from emails.'
+ 'User unsubscribed from emails.',
)
def get_body(self, fixture_name: str) -> str:
diff --git a/zerver/webhooks/intercom/view.py b/zerver/webhooks/intercom/view.py
index 3fd586bb1e..35960af125 100644
--- a/zerver/webhooks/intercom/view.py
+++ b/zerver/webhooks/intercom/view.py
@@ -85,7 +85,7 @@ def strip_tags(html: str) -> str:
def get_topic_for_contacts(user: Dict[str, Any]) -> str:
topic = "{type}: {name}".format(
type=user['type'].capitalize(),
- name=user.get('name') or user.get('pseudonym') or user.get('email')
+ name=user.get('name') or user.get('pseudonym') or user.get('email'),
)
return topic
@@ -106,8 +106,8 @@ def get_contact_created_message(payload: Dict[str, Any]) -> Tuple[str, str]:
name=contact.get('name') or contact.get('pseudonym'),
email=contact['email'],
location_info="{city_name}, {region_name}, {country_name}".format(
- **contact['location_data']
- )
+ **contact['location_data'],
+ ),
)
topic = get_topic_for_contacts(contact)
return (topic, body)
@@ -117,8 +117,8 @@ def get_contact_signed_up_message(payload: Dict[str, Any]) -> Tuple[str, str]:
body = CONTACT_SIGNED_UP.format(
email=contact['email'],
location_info="{city_name}, {region_name}, {country_name}".format(
- **contact['location_data']
- )
+ **contact['location_data'],
+ ),
)
topic = get_topic_for_contacts(contact)
return (topic, body)
@@ -143,20 +143,20 @@ def get_conversation_admin_assigned_message(payload: Dict[str, Any]) -> Tuple[st
def get_conversation_admin_message(
payload: Dict[str, Any],
- action: str
+ action: str,
) -> Tuple[str, str]:
assignee = payload['data']['item']['assignee']
user = payload['data']['item']['user']
body = CONVERSATION_ADMIN_TEMPLATE.format(
admin_name=assignee.get('name'),
- action=action
+ action=action,
)
topic = get_topic_for_contacts(user)
return (topic, body)
def get_conversation_admin_reply_message(
payload: Dict[str, Any],
- action: str
+ action: str,
) -> Tuple[str, str]:
assignee = payload['data']['item']['assignee']
user = payload['data']['item']['user']
@@ -165,7 +165,7 @@ def get_conversation_admin_reply_message(
body = CONVERSATION_ADMIN_REPLY_TEMPLATE.format(
admin_name=assignee.get('name'),
action=action,
- content=content
+ content=content,
)
topic = get_topic_for_contacts(user)
return (topic, body)
@@ -178,7 +178,7 @@ def get_conversation_admin_single_created_message(
content = strip_tags(conversation_body)
body = CONVERSATION_ADMIN_INITIATED_CONVERSATION.format(
admin_name=assignee.get('name'),
- content=content
+ content=content,
)
topic = get_topic_for_contacts(user)
return (topic, body)
@@ -189,7 +189,7 @@ def get_conversation_user_created_message(payload: Dict[str, Any]) -> Tuple[str,
content = strip_tags(conversation_body)
body = CONVERSATION_ADMIN_INITIATED_CONVERSATION.format(
admin_name=user.get('name'),
- content=content
+ content=content,
)
topic = get_topic_for_contacts(user)
return (topic, body)
@@ -201,7 +201,7 @@ def get_conversation_user_replied_message(payload: Dict[str, Any]) -> Tuple[str,
body = CONVERSATION_ADMIN_REPLY_TEMPLATE.format(
admin_name=user.get('name'),
action='replied to',
- content=content
+ content=content,
)
topic = get_topic_for_contacts(user)
return (topic, body)
@@ -230,14 +230,14 @@ def get_user_email_updated_message(payload: Dict[str, Any]) -> Tuple[str, str]:
def get_user_tagged_message(
payload: Dict[str, Any],
- action: str
+ action: str,
) -> Tuple[str, str]:
user = payload['data']['item']['user']
tag = payload['data']['item']['tag']
topic = get_topic_for_contacts(user)
body = 'The tag `{tag_name}` was {action} the user.'.format(
tag_name=tag['name'],
- action=action
+ action=action,
)
return (topic, body)
diff --git a/zerver/webhooks/jira/view.py b/zerver/webhooks/jira/view.py
index 73ede8e2f3..05f8c6aef7 100644
--- a/zerver/webhooks/jira/view.py
+++ b/zerver/webhooks/jira/view.py
@@ -253,7 +253,7 @@ def handle_created_issue_event(payload: Dict[str, Any], user_profile: UserProfil
author=get_issue_author(payload),
issue_string=get_issue_string(payload, with_title=True),
priority=get_in(payload, ['issue', 'fields', 'priority', 'name']),
- assignee=get_in(payload, ['issue', 'fields', 'assignee', 'displayName'], 'no one')
+ assignee=get_in(payload, ['issue', 'fields', 'assignee', 'displayName'], 'no one'),
)
def handle_deleted_issue_event(payload: Dict[str, Any], user_profile: UserProfile) -> str:
@@ -263,7 +263,7 @@ def handle_deleted_issue_event(payload: Dict[str, Any], user_profile: UserProfil
return template.format(
author=get_issue_author(payload),
issue_string=get_issue_string(payload, with_title=True),
- punctuation=punctuation
+ punctuation=punctuation,
)
def normalize_comment(comment: str) -> str:
@@ -279,7 +279,7 @@ def handle_comment_created_event(payload: Dict[str, Any], user_profile: UserProf
*\n``` quote\n{comment}\n```\n".format(
author = payload["comment"]["author"]["displayName"],
title = title,
- comment = normalize_comment(payload["comment"]["body"])
+ comment = normalize_comment(payload["comment"]["body"]),
)
def handle_comment_updated_event(payload: Dict[str, Any], user_profile: UserProfile) -> str:
@@ -288,7 +288,7 @@ def handle_comment_updated_event(payload: Dict[str, Any], user_profile: UserProf
*\n``` quote\n{comment}\n```\n".format(
author = payload["comment"]["author"]["displayName"],
title = title,
- comment = normalize_comment(payload["comment"]["body"])
+ comment = normalize_comment(payload["comment"]["body"]),
)
def handle_comment_deleted_event(payload: Dict[str, Any], user_profile: UserProfile) -> str:
@@ -297,7 +297,7 @@ def handle_comment_deleted_event(payload: Dict[str, Any], user_profile: UserProf
*\n``` quote\n~~{comment}~~\n```\n".format(
author = payload["comment"]["author"]["displayName"],
title = title,
- comment = normalize_comment(payload["comment"]["body"])
+ comment = normalize_comment(payload["comment"]["body"]),
)
JIRA_CONTENT_FUNCTION_MAPPER = {
diff --git a/zerver/webhooks/librato/view.py b/zerver/webhooks/librato/view.py
index 83788150af..d962911bdc 100644
--- a/zerver/webhooks/librato/view.py
+++ b/zerver/webhooks/librato/view.py
@@ -60,11 +60,11 @@ class LibratoWebhookHandler(LibratoWebhookParser):
super().__init__(payload, attachments)
self.payload_available_types = {
ALERT_CLEAR: self.handle_alert_clear_message,
- ALERT_VIOLATION: self.handle_alert_violation_message
+ ALERT_VIOLATION: self.handle_alert_violation_message,
}
self.attachments_available_types = {
- SNAPSHOT: self.handle_snapshots
+ SNAPSHOT: self.handle_snapshots,
}
def find_handle_method(self) -> Callable[[], str]:
diff --git a/zerver/webhooks/netlify/view.py b/zerver/webhooks/netlify/view.py
index 57e2bf55dd..1f06303fca 100644
--- a/zerver/webhooks/netlify/view.py
+++ b/zerver/webhooks/netlify/view.py
@@ -18,7 +18,7 @@ fixture_to_headers = get_http_headers_from_filename("HTTP_X_NETLIFY_EVENT")
@has_request_variables
def api_netlify_webhook(
request: HttpRequest, user_profile: UserProfile,
- payload: Dict[str, Iterable[Dict[str, Any]]]=REQ(argument_type='body')
+ payload: Dict[str, Iterable[Dict[str, Any]]]=REQ(argument_type='body'),
) -> HttpResponse:
message_template = get_template(request, payload)
diff --git a/zerver/webhooks/newrelic/view.py b/zerver/webhooks/newrelic/view.py
index 6760c38e8b..7848c811ab 100644
--- a/zerver/webhooks/newrelic/view.py
+++ b/zerver/webhooks/newrelic/view.py
@@ -31,7 +31,7 @@ Changelog:
@has_request_variables
def api_newrelic_webhook(request: HttpRequest, user_profile: UserProfile,
alert: Optional[Dict[str, Any]]=REQ(validator=check_dict([]), default=None),
- deployment: Optional[Dict[str, Any]]=REQ(validator=check_dict([]), default=None)
+ deployment: Optional[Dict[str, Any]]=REQ(validator=check_dict([]), default=None),
) -> HttpResponse:
if alert:
# Use the message as the subject because it stays the same for
diff --git a/zerver/webhooks/opbeat/tests.py b/zerver/webhooks/opbeat/tests.py
index 25eb674d63..677470c762 100644
--- a/zerver/webhooks/opbeat/tests.py
+++ b/zerver/webhooks/opbeat/tests.py
@@ -46,7 +46,7 @@ test summary'''
'unsupported_object',
expected_topic,
expected_message,
- content_type='application/json'
+ content_type='application/json',
)
def test_error_fixed(self) -> None:
diff --git a/zerver/webhooks/opbeat/view.py b/zerver/webhooks/opbeat/view.py
index 2a930bd4ca..c0256765bd 100644
--- a/zerver/webhooks/opbeat/view.py
+++ b/zerver/webhooks/opbeat/view.py
@@ -14,29 +14,29 @@ subject_types: Dict[str, List[List[str]]] = {
['name'], # Title
['html_url'], # Automatically put into title
['language'], # Other properties.
- ['framework']
+ ['framework'],
],
'base': [
['title'],
['html_url'],
['#summary'],
- ['subject']
+ ['subject'],
],
'comment': [
[''],
- ['subject']
+ ['subject'],
],
'errorgroup': [
['E#{}', 'number'],
['html_url'],
- ['last_occurrence:error']
+ ['last_occurrence:error'],
],
'error': [
[''],
['">**Most recent Occurrence**'],
['in {}', 'extra/pathname'],
- ['!message']
- ]
+ ['!message'],
+ ],
}
@@ -52,7 +52,7 @@ def get_value(_obj: Dict[str, Any], key: str) -> str:
def format_object(
obj: Dict[str, Any],
subject_type: str,
- message: str
+ message: str,
) -> str:
if subject_type not in subject_types.keys():
return message
diff --git a/zerver/webhooks/opsgenie/view.py b/zerver/webhooks/opsgenie/view.py
index f39ec8133c..77e4f18efb 100644
--- a/zerver/webhooks/opsgenie/view.py
+++ b/zerver/webhooks/opsgenie/view.py
@@ -29,47 +29,47 @@ def api_opsgenie_webhook(request: HttpRequest, user_profile: UserProfile,
if 'note' in payload['alert']:
info['additional_info'] += bullet_template.format(
key='Note',
- value=payload['alert']['note']
+ value=payload['alert']['note'],
)
if 'recipient' in payload['alert']:
info['additional_info'] += bullet_template.format(
key='Recipient',
- value=payload['alert']['recipient']
+ value=payload['alert']['recipient'],
)
if 'addedTags' in payload['alert']:
info['additional_info'] += bullet_template.format(
key='Tags added',
- value=payload['alert']['addedTags']
+ value=payload['alert']['addedTags'],
)
if 'team' in payload['alert']:
info['additional_info'] += bullet_template.format(
key='Team added',
- value=payload['alert']['team']
+ value=payload['alert']['team'],
)
if 'owner' in payload['alert']:
info['additional_info'] += bullet_template.format(
key='Assigned owner',
- value=payload['alert']['owner']
+ value=payload['alert']['owner'],
)
if 'escalationName' in payload:
info['additional_info'] += bullet_template.format(
key='Escalation',
- value=payload['escalationName']
+ value=payload['escalationName'],
)
if 'removedTags' in payload['alert']:
info['additional_info'] += bullet_template.format(
key='Tags removed',
- value=payload['alert']['removedTags']
+ value=payload['alert']['removedTags'],
)
if 'message' in payload['alert']:
info['additional_info'] += bullet_template.format(
key='Message',
- value=payload['alert']['message']
+ value=payload['alert']['message'],
)
if info['tags']:
info['additional_info'] += bullet_template.format(
key='Tags',
- value=info['tags']
+ value=info['tags'],
)
body_template = """
diff --git a/zerver/webhooks/papertrail/view.py b/zerver/webhooks/papertrail/view.py
index 9a71e8cd05..69f8f8b034 100644
--- a/zerver/webhooks/papertrail/view.py
+++ b/zerver/webhooks/papertrail/view.py
@@ -32,7 +32,7 @@ def api_papertrail_webhook(request: HttpRequest, user_profile: UserProfile,
matches = MATCHES_TEMPLATE.format(
name=payload["saved_search"]["name"],
url=payload["saved_search"]["html_search_url"],
- number=str(len(payload["events"]))
+ number=str(len(payload["events"])),
)
message = [matches]
@@ -41,7 +41,7 @@ def api_papertrail_webhook(request: HttpRequest, user_profile: UserProfile,
timestamp=event["display_received_at"],
source=event["source_name"],
query=payload["saved_search"]["query"],
- message=event["message"]
+ message=event["message"],
)
message.append(event_text)
diff --git a/zerver/webhooks/pingdom/view.py b/zerver/webhooks/pingdom/view.py
index d8b14527f6..1cb1ec5aed 100644
--- a/zerver/webhooks/pingdom/view.py
+++ b/zerver/webhooks/pingdom/view.py
@@ -65,7 +65,7 @@ def get_body_for_http_request(payload: Dict[str, Any]) -> str:
'service_url': payload['check_params']['hostname'],
'previous_state': previous_state,
'current_state': current_state,
- 'type': get_check_type(payload)
+ 'type': get_check_type(payload),
}
body = MESSAGE_TEMPLATE.format(**data)
if current_state == 'DOWN' and previous_state == 'UP':
diff --git a/zerver/webhooks/reviewboard/view.py b/zerver/webhooks/reviewboard/view.py
index 4d881053d9..e89d2122b1 100644
--- a/zerver/webhooks/reviewboard/view.py
+++ b/zerver/webhooks/reviewboard/view.py
@@ -165,7 +165,7 @@ RB_MESSAGE_FUNCTIONS = {
@has_request_variables
def api_reviewboard_webhook(
request: HttpRequest, user_profile: UserProfile,
- payload: Dict[str, Iterable[Dict[str, Any]]]=REQ(argument_type='body')
+ payload: Dict[str, Iterable[Dict[str, Any]]]=REQ(argument_type='body'),
) -> HttpResponse:
event_type = validate_extract_webhook_http_header(
request, 'X_REVIEWBOARD_EVENT', 'ReviewBoard')
diff --git a/zerver/webhooks/semaphore/view.py b/zerver/webhooks/semaphore/view.py
index b1bab46415..77b0979a86 100644
--- a/zerver/webhooks/semaphore/view.py
+++ b/zerver/webhooks/semaphore/view.py
@@ -124,7 +124,7 @@ def semaphore_classic(payload: Dict[str, Any]) -> Tuple[str, str, str]:
commit_hash=commit_id[:7],
commit_message=message,
commit_url=commit_url,
- email=author_email
+ email=author_email,
)
elif event == "deploy":
@@ -143,7 +143,7 @@ def semaphore_classic(payload: Dict[str, Any]) -> Tuple[str, str, str]:
commit_message=message,
commit_url=commit_url,
email=author_email,
- server_name=server_name
+ server_name=server_name,
)
else: # should never get here
@@ -162,7 +162,7 @@ def semaphore_2(payload: Dict[str, Any]) -> Tuple[str, str, Optional[str]]:
author_url=GITHUB_URL_TEMPLATES['user'].format(repo_url=repo_url, username=author_name),
pipeline_name=payload["pipeline"]["name"],
pipeline_result=payload["pipeline"]["result"],
- workflow_url=f'https://{organization_name}.semaphoreci.com/workflows/{workflow_id}'
+ workflow_url=f'https://{organization_name}.semaphoreci.com/workflows/{workflow_id}',
)
if payload["revision"]["reference_type"] == "branch": # push event
diff --git a/zerver/webhooks/sentry/view.py b/zerver/webhooks/sentry/view.py
index 706fc91dca..9d2aa7977c 100644
--- a/zerver/webhooks/sentry/view.py
+++ b/zerver/webhooks/sentry/view.py
@@ -94,7 +94,7 @@ def handle_event_payload(event: Dict[str, Any]) -> Tuple[str, str]:
"title": subject,
"level": event["level"],
"web_link": event["web_url"],
- "datetime": event["datetime"].split(".")[0].replace("T", " ")
+ "datetime": event["datetime"].split(".")[0].replace("T", " "),
}
if "exception" in event:
@@ -131,7 +131,7 @@ def handle_event_payload(event: Dict[str, Any]) -> Tuple[str, str]:
"filename": filename,
"pre_context": pre_context,
"context_line": context_line,
- "post_context": post_context
+ "post_context": post_context,
})
body = EXCEPTION_EVENT_TEMPLATE_WITH_TRACEBACK.format(**context)
@@ -170,14 +170,14 @@ def handle_issue_payload(action: str, issue: Dict[str, Any], actor: Dict[str, An
"title": subject,
"level": issue["level"],
"datetime": datetime,
- "assignee": assignee
+ "assignee": assignee,
}
body = ISSUE_CREATED_MESSAGE_TEMPLATE.format(**context)
elif action == "resolved":
context = {
"title": subject,
- "actor": actor["name"]
+ "actor": actor["name"],
}
body = ISSUE_RESOLVED_MESSAGE_TEMPLATE.format(**context)
@@ -185,14 +185,14 @@ def handle_issue_payload(action: str, issue: Dict[str, Any], actor: Dict[str, An
context = {
"title": subject,
"assignee": assignee,
- "actor": actor["name"]
+ "actor": actor["name"],
}
body = ISSUE_ASSIGNED_MESSAGE_TEMPLATE.format(**context)
elif action == "ignored":
context = {
"title": subject,
- "actor": actor["name"]
+ "actor": actor["name"],
}
body = ISSUE_IGNORED_MESSAGE_TEMPLATE.format(**context)
@@ -207,7 +207,7 @@ def handle_deprecated_payload(payload: Dict[str, Any]) -> Tuple[str, str]:
body = DEPRECATED_EXCEPTION_MESSAGE_TEMPLATE.format(
level=payload['level'].upper(),
url=payload.get('url'),
- message=payload.get('message')
+ message=payload.get('message'),
)
return (subject, body)
diff --git a/zerver/webhooks/slack_incoming/tests.py b/zerver/webhooks/slack_incoming/tests.py
index 9a0dc423b7..137737235b 100644
--- a/zerver/webhooks/slack_incoming/tests.py
+++ b/zerver/webhooks/slack_incoming/tests.py
@@ -15,7 +15,7 @@ Hello, world.
self.send_and_test_stream_message(
'text',
expected_topic,
- expected_message
+ expected_message,
)
def test_message_as_www_urlencoded(self) -> None:
@@ -28,7 +28,7 @@ Hello, world.
'urlencoded_text',
expected_topic,
expected_message,
- content_type="application/x-www-form-urlencoded"
+ content_type="application/x-www-form-urlencoded",
)
def test_message_with_actions(self) -> None:
@@ -43,7 +43,7 @@ Danny Torrence left the following review for your property:
self.send_and_test_stream_message(
'actions',
expected_topic,
- expected_message
+ expected_message,
)
def test_message_with_blocks(self) -> None:
@@ -58,7 +58,7 @@ Danny Torrence left the following review for your property:
self.send_and_test_stream_message(
'blocks',
expected_topic,
- expected_message
+ expected_message,
)
def test_message_with_attachment(self) -> None:
@@ -88,7 +88,7 @@ Danny Torrence left the following review for your property:
self.send_and_test_stream_message(
'attachment',
expected_topic,
- expected_message
+ expected_message,
)
def get_body(self, fixture_name: str) -> str:
diff --git a/zerver/webhooks/solano/view.py b/zerver/webhooks/solano/view.py
index 7fd9518a16..de29519695 100644
--- a/zerver/webhooks/solano/view.py
+++ b/zerver/webhooks/solano/view.py
@@ -57,7 +57,7 @@ def api_solano_webhook(request: HttpRequest, user_profile: UserProfile,
body = MESSAGE_TEMPLATE.format(
author=author, build_log_url=build_log,
commit_id=commit_id[:7], commit_url=commit_url,
- status=status, emoji=emoji
+ status=status, emoji=emoji,
)
check_send_webhook_message(request, user_profile, topic, body)
diff --git a/zerver/webhooks/splunk/view.py b/zerver/webhooks/splunk/view.py
index 85960598f0..b9983ab9dc 100644
--- a/zerver/webhooks/splunk/view.py
+++ b/zerver/webhooks/splunk/view.py
@@ -38,7 +38,7 @@ def api_splunk_webhook(request: HttpRequest, user_profile: UserProfile,
# construct the message body
body = MESSAGE_TEMPLATE.format(
search=search_name, link=results_link,
- host=host, source=source, raw=raw
+ host=host, source=source, raw=raw,
)
# send the message
diff --git a/zerver/webhooks/stripe/tests.py b/zerver/webhooks/stripe/tests.py
index 76ba0054a3..d2c74db9b3 100644
--- a/zerver/webhooks/stripe/tests.py
+++ b/zerver/webhooks/stripe/tests.py
@@ -134,7 +134,7 @@ Amount due: 0.00 INR
'invoiceitem_created',
expected_topic,
expected_message,
- content_type="application/x-www-form-urlencoded"
+ content_type="application/x-www-form-urlencoded",
)
def test_invoice_paid(self) -> None:
@@ -144,7 +144,7 @@ Amount due: 0.00 INR
'invoice_updated__paid',
expected_topic,
expected_message,
- content_type="application/x-www-form-urlencoded"
+ content_type="application/x-www-form-urlencoded",
)
def test_refund_event(self) -> None:
diff --git a/zerver/webhooks/stripe/view.py b/zerver/webhooks/stripe/view.py
index 489aafc7a6..57d542f748 100644
--- a/zerver/webhooks/stripe/view.py
+++ b/zerver/webhooks/stripe/view.py
@@ -103,7 +103,7 @@ def topic_and_body(payload: Dict[str, Any]) -> Tuple[str, str]:
resource=linkified_id(object_['id'], lower=True),
charge=linkified_id(object_['charge'], lower=True),
amount=object_['amount'],
- currency=object_['currency'].upper()
+ currency=object_['currency'].upper(),
)
if category == 'checkout_beta': # nocoverage
# Not sure what this is
@@ -127,7 +127,7 @@ def topic_and_body(payload: Dict[str, Any]) -> Tuple[str, str]:
body = 'Discount {verbed} ([{coupon_name}]({coupon_url})).'.format(
verbed=event.replace('_', ' '),
coupon_name=object_['coupon']['name'],
- coupon_url='https://dashboard.stripe.com/{}/{}'.format('coupons', object_['coupon']['id'])
+ coupon_url='https://dashboard.stripe.com/{}/{}'.format('coupons', object_['coupon']['id']),
)
if resource == 'source': # nocoverage
body = default_body()
diff --git a/zerver/webhooks/taiga/view.py b/zerver/webhooks/taiga/view.py
index ca7c299bab..d4f61a7ef9 100644
--- a/zerver/webhooks/taiga/view.py
+++ b/zerver/webhooks/taiga/view.py
@@ -93,7 +93,7 @@ templates = {
' to {new}.',
'set_estimated_finish': '[{user}]({user_link}) set estimated finish of sprint {subject}'
' to {new}.',
- 'delete': '[{user}]({user_link}) deleted sprint {subject}.'
+ 'delete': '[{user}]({user_link}) deleted sprint {subject}.',
},
'task': {
'create': '[{user}]({user_link}) created task {subject}.',
@@ -143,7 +143,7 @@ templates = {
'unblocked': '[{user}]({user_link}) unblocked issue {subject}.',
},
'webhook_test': {
- 'test': '[{user}]({user_link}) triggered a test of the Taiga integration.'
+ 'test': '[{user}]({user_link}) triggered a test of the Taiga integration.',
},
}
@@ -165,8 +165,8 @@ def parse_comment(message: Mapping[str, Any]) -> Dict[str, Any]:
'values': {
'user': get_owner_name(message),
'user_link': get_owner_link(message),
- 'subject': get_subject(message)
- }
+ 'subject': get_subject(message),
+ },
}
def parse_create_or_delete(message: Mapping[str, Any]) -> Dict[str, Any]:
@@ -180,7 +180,7 @@ def parse_create_or_delete(message: Mapping[str, Any]) -> Dict[str, Any]:
'user_link': get_owner_link(message),
'epic_subject': get_epic_subject(message),
'userstory_subject': get_userstory_subject(message),
- }
+ },
}
return {
@@ -190,7 +190,7 @@ def parse_create_or_delete(message: Mapping[str, Any]) -> Dict[str, Any]:
'user': get_owner_name(message),
'user_link': get_owner_link(message),
'subject': get_subject(message),
- }
+ },
}
@@ -200,7 +200,7 @@ def parse_change_event(change_type: str, message: Mapping[str, Any]) -> Optional
values: Dict[str, Any] = {
'user': get_owner_name(message),
'user_link': get_owner_link(message),
- 'subject': get_subject(message)
+ 'subject': get_subject(message),
}
if change_type in ["description_diff", "points"]:
@@ -271,8 +271,8 @@ def parse_webhook_test(message: Mapping[str, Any]) -> Dict[str, Any]:
"values": {
"user": get_owner_name(message),
"user_link": get_owner_link(message),
- "end_type": "test"
- }
+ "end_type": "test",
+ },
}
diff --git a/zerver/webhooks/teamcity/tests.py b/zerver/webhooks/teamcity/tests.py
index 5a4d64c22a..268c90d078 100644
--- a/zerver/webhooks/teamcity/tests.py
+++ b/zerver/webhooks/teamcity/tests.py
@@ -46,7 +46,7 @@ class TeamcityHookTests(WebhookTestCase):
def test_non_generic_payload_ignore_pm_notification(self) -> None:
expected_message = MISCONFIGURED_PAYLOAD_TYPE_ERROR_MESSAGE.format(
bot_name=get_user_by_delivery_email('webhook-bot@zulip.com', get_realm('zulip')).full_name,
- support_email=FromAddress.SUPPORT
+ support_email=FromAddress.SUPPORT,
).strip()
payload = self.get_body('slack_non_generic_payload')
self.client_post(self.url, payload, content_type="application/json")
diff --git a/zerver/webhooks/teamcity/view.py b/zerver/webhooks/teamcity/view.py
index 7356ce09f2..2dc4dcecf7 100644
--- a/zerver/webhooks/teamcity/view.py
+++ b/zerver/webhooks/teamcity/view.py
@@ -92,7 +92,7 @@ def api_teamcity_webhook(request: HttpRequest, user_profile: UserProfile,
build_id=build_number,
status=status,
changes_url=changes_url,
- log_url=build_url
+ log_url=build_url,
)
if 'branchDisplayName' in message:
diff --git a/zerver/webhooks/thinkst/tests.py b/zerver/webhooks/thinkst/tests.py
index c19ae640a4..24b524e1fb 100644
--- a/zerver/webhooks/thinkst/tests.py
+++ b/zerver/webhooks/thinkst/tests.py
@@ -19,7 +19,7 @@ class ThinkstHookTests(WebhookTestCase):
'canary_alert',
'canary alert - 0000000testnode',
expected_message,
- content_type="application/x-www-form-urlencoded"
+ content_type="application/x-www-form-urlencoded",
)
def test_canary_alert_no_reverse_dns(self) -> None:
@@ -35,7 +35,7 @@ class ThinkstHookTests(WebhookTestCase):
'canary_alert_no_reverse_dns',
'canary alert - 0000000testnode',
expected_message,
- content_type="application/x-www-form-urlencoded"
+ content_type="application/x-www-form-urlencoded",
)
def test_canary_alert_with_specific_topic(self) -> None:
@@ -52,7 +52,7 @@ class ThinkstHookTests(WebhookTestCase):
'canary_alert',
'foo',
expected_message,
- content_type="application/x-www-form-urlencoded"
+ content_type="application/x-www-form-urlencoded",
)
def test_canarytoken_new(self) -> None:
@@ -67,7 +67,7 @@ class ThinkstHookTests(WebhookTestCase):
'canarytoken_new',
'canarytoken alert',
expected_message,
- content_type="application/x-www-form-urlencoded"
+ content_type="application/x-www-form-urlencoded",
)
def test_canarytoken_real(self) -> None:
@@ -82,7 +82,7 @@ class ThinkstHookTests(WebhookTestCase):
'canarytoken_real',
'canarytoken alert',
expected_message,
- content_type="application/x-www-form-urlencoded"
+ content_type="application/x-www-form-urlencoded",
)
def test_canarytoken_with_specific_topic(self) -> None:
@@ -98,5 +98,5 @@ class ThinkstHookTests(WebhookTestCase):
'canarytoken_real',
'foo',
expected_message,
- content_type="application/x-www-form-urlencoded"
+ content_type="application/x-www-form-urlencoded",
)
diff --git a/zerver/webhooks/travis/tests.py b/zerver/webhooks/travis/tests.py
index abb34fb670..6ecd2d701f 100644
--- a/zerver/webhooks/travis/tests.py
+++ b/zerver/webhooks/travis/tests.py
@@ -25,7 +25,7 @@ class TravisHookTests(WebhookTestCase):
'build',
self.TOPIC,
expected_message,
- content_type="application/x-www-form-urlencoded"
+ content_type="application/x-www-form-urlencoded",
)
def test_ignore_travis_pull_request_by_default(self) -> None:
@@ -33,7 +33,7 @@ class TravisHookTests(WebhookTestCase):
result = self.client_post(
self.url,
self.get_body('pull_request'),
- content_type="application/x-www-form-urlencoded"
+ content_type="application/x-www-form-urlencoded",
)
self.assert_json_success(result)
msg = self.get_last_message()
@@ -50,7 +50,7 @@ class TravisHookTests(WebhookTestCase):
'pull_request',
self.TOPIC,
expected_message,
- content_type="application/x-www-form-urlencoded"
+ content_type="application/x-www-form-urlencoded",
)
def get_body(self, fixture_name: str) -> str:
diff --git a/zerver/webhooks/travis/view.py b/zerver/webhooks/travis/view.py
index 54c856e501..804a78269a 100644
--- a/zerver/webhooks/travis/view.py
+++ b/zerver/webhooks/travis/view.py
@@ -48,7 +48,7 @@ def api_travis_webhook(request: HttpRequest, user_profile: UserProfile,
message_status,
emoji,
message['compare_url'],
- message['build_url']
+ message['build_url'],
)
topic = 'builds'
diff --git a/zerver/webhooks/trello/view/board_actions.py b/zerver/webhooks/trello/view/board_actions.py
index 7d3172f20a..36a457c790 100644
--- a/zerver/webhooks/trello/view/board_actions.py
+++ b/zerver/webhooks/trello/view/board_actions.py
@@ -20,7 +20,7 @@ ACTIONS_TO_MESSAGE_MAPPER = {
REMOVE_MEMBER: 'removed {member_name} from {board_url_template}.',
ADD_MEMBER: 'added {member_name} to {board_url_template}.',
CREATE_LIST: 'added {list_name} list to {board_url_template}.',
- CHANGE_NAME: 'renamed the board from {old_name} to {board_url_template}.'
+ CHANGE_NAME: 'renamed the board from {old_name} to {board_url_template}.',
}
def process_board_action(payload: Mapping[str, Any],
@@ -64,7 +64,7 @@ def get_create_list_body(payload: Mapping[str, Any], action_type: str) -> str:
def get_change_name_body(payload: Mapping[str, Any], action_type: str) -> str:
data = {
- 'old_name': get_action_data(payload)['old']['name']
+ 'old_name': get_action_data(payload)['old']['name'],
}
return fill_appropriate_message_content(payload, action_type, data)
@@ -97,5 +97,5 @@ ACTIONS_TO_FILL_BODY_MAPPER = {
REMOVE_MEMBER: get_managed_member_body,
ADD_MEMBER: get_managed_member_body,
CREATE_LIST: get_create_list_body,
- CHANGE_NAME: get_change_name_body
+ CHANGE_NAME: get_change_name_body,
}
diff --git a/zerver/webhooks/trello/view/card_actions.py b/zerver/webhooks/trello/view/card_actions.py
index 4f779eb7d7..c15442bee6 100644
--- a/zerver/webhooks/trello/view/card_actions.py
+++ b/zerver/webhooks/trello/view/card_actions.py
@@ -61,7 +61,7 @@ ACTIONS_TO_MESSAGE_MAPPER = {
ADD_ATTACHMENT: 'added [{attachment_name}]({attachment_url}) to {card_url_template}.',
ADD_CHECKLIST: 'added the {checklist_name} checklist to {card_url_template}.',
COMMENT: 'commented on {card_url_template}:\n~~~ quote\n{text}\n~~~\n',
- UPDATE_CHECK_ITEM_STATE: '{action} **{item_name}** in **{checklist_name}** ({card_url_template}).'
+ UPDATE_CHECK_ITEM_STATE: '{action} **{item_name}** in **{checklist_name}** ({card_url_template}).',
}
def prettify_date(date_string: str) -> str:
@@ -164,7 +164,7 @@ def get_added_label_body(payload: Mapping[str, Any], action_type: str) -> str:
def get_managed_member_body(payload: Mapping[str, Any], action_type: str) -> str:
data = {
- 'member_name': payload['action']['member'].get('fullName')
+ 'member_name': payload['action']['member'].get('fullName'),
}
return fill_appropriate_message_content(payload, action_type, data)
@@ -176,27 +176,27 @@ def get_comment_body(payload: Mapping[str, Any], action_type: str) -> str:
def get_managed_due_date_body(payload: Mapping[str, Any], action_type: str) -> str:
data = {
- 'due_date': prettify_date(get_action_data(payload)['card'].get('due'))
+ 'due_date': prettify_date(get_action_data(payload)['card'].get('due')),
}
return fill_appropriate_message_content(payload, action_type, data)
def get_changed_due_date_body(payload: Mapping[str, Any], action_type: str) -> str:
data = {
'due_date': prettify_date(get_action_data(payload)['card'].get('due')),
- 'old_due_date': prettify_date(get_action_data(payload)['old'].get('due'))
+ 'old_due_date': prettify_date(get_action_data(payload)['old'].get('due')),
}
return fill_appropriate_message_content(payload, action_type, data)
def get_managed_desc_body(payload: Mapping[str, Any], action_type: str) -> str:
data = {
- 'desc': prettify_date(get_action_data(payload)['card']['desc'])
+ 'desc': prettify_date(get_action_data(payload)['card']['desc']),
}
return fill_appropriate_message_content(payload, action_type, data)
def get_changed_desc_body(payload: Mapping[str, Any], action_type: str) -> str:
data = {
'desc': prettify_date(get_action_data(payload)['card']['desc']),
- 'old_desc': prettify_date(get_action_data(payload)['old']['desc'])
+ 'old_desc': prettify_date(get_action_data(payload)['old']['desc']),
}
return fill_appropriate_message_content(payload, action_type, data)
diff --git a/zerver/webhooks/updown/view.py b/zerver/webhooks/updown/view.py
index 968e32d8c0..8151518822 100644
--- a/zerver/webhooks/updown/view.py
+++ b/zerver/webhooks/updown/view.py
@@ -58,7 +58,7 @@ def get_body_for_down_event(event: Dict[str, Any]) -> str:
@has_request_variables
def api_updown_webhook(
request: HttpRequest, user_profile: UserProfile,
- payload: List[Dict[str, Any]]=REQ(argument_type='body')
+ payload: List[Dict[str, Any]]=REQ(argument_type='body'),
) -> HttpResponse:
for event in payload:
send_message_for_event(request, user_profile, event)
@@ -66,7 +66,7 @@ def api_updown_webhook(
EVENT_TYPE_BODY_MAPPER = {
'up': get_body_for_up_event,
- 'down': get_body_for_down_event
+ 'down': get_body_for_down_event,
}
def get_event_type(event: Dict[str, Any]) -> str:
diff --git a/zerver/webhooks/yo/tests.py b/zerver/webhooks/yo/tests.py
index aef2caf5df..94da2892bd 100644
--- a/zerver/webhooks/yo/tests.py
+++ b/zerver/webhooks/yo/tests.py
@@ -16,7 +16,7 @@ class YoHookTests(WebhookTestCase):
self.url = self.build_webhook_url(
email=cordelia.email,
username="IAGO",
- user_ip="127.0.0.1"
+ user_ip="127.0.0.1",
)
expected_message = "Yo from IAGO"
self.send_and_test_private_message('', expected_message=expected_message,
diff --git a/zerver/webhooks/zabbix/tests.py b/zerver/webhooks/zabbix/tests.py
index d406390833..3144306687 100644
--- a/zerver/webhooks/zabbix/tests.py
+++ b/zerver/webhooks/zabbix/tests.py
@@ -28,7 +28,7 @@ class ZabbixHookTests(WebhookTestCase):
expected_message = MISCONFIGURED_PAYLOAD_ERROR_MESSAGE.format(
bot_name=self.test_user.full_name,
- support_email=FromAddress.SUPPORT
+ support_email=FromAddress.SUPPORT,
).strip()
msg = self.get_last_message()
diff --git a/zerver/webhooks/zabbix/view.py b/zerver/webhooks/zabbix/view.py
index cecc95371b..846dcc4bbd 100644
--- a/zerver/webhooks/zabbix/view.py
+++ b/zerver/webhooks/zabbix/view.py
@@ -65,6 +65,6 @@ def get_body_for_http_request(payload: Dict[str, Any]) -> str:
"status": status,
"item": item,
"trigger": trigger,
- "link": link
+ "link": link,
}
return ZABBIX_MESSAGE_TEMPLATE.format(**data)
diff --git a/zerver/webhooks/zapier/view.py b/zerver/webhooks/zapier/view.py
index 0c5102d81d..859e50c548 100644
--- a/zerver/webhooks/zapier/view.py
+++ b/zerver/webhooks/zapier/view.py
@@ -21,7 +21,7 @@ def api_zapier_webhook(request: HttpRequest, user_profile: UserProfile,
return json_success({
'full_name': user_profile.full_name,
'email': user_profile.email,
- 'id': user_profile.id
+ 'id': user_profile.id,
})
topic = payload.get('topic')
diff --git a/zerver/worker/queue_processors.py b/zerver/worker/queue_processors.py
index 0d87f6171c..1aa7cb202f 100644
--- a/zerver/worker/queue_processors.py
+++ b/zerver/worker/queue_processors.py
@@ -65,7 +65,7 @@ class WorkerDeclarationException(Exception):
ConcreteQueueWorker = TypeVar('ConcreteQueueWorker', bound='QueueProcessingWorker')
def assign_queue(
- queue_name: str, enabled: bool=True, queue_type: str="consumer"
+ queue_name: str, enabled: bool=True, queue_type: str="consumer",
) -> Callable[[Type[ConcreteQueueWorker]], Type[ConcreteQueueWorker]]:
def decorate(clazz: Type[ConcreteQueueWorker]) -> Type[ConcreteQueueWorker]:
clazz.queue_name = queue_name
@@ -100,7 +100,7 @@ def check_and_send_restart_signal() -> None:
pass
def retry_send_email_failures(
- func: Callable[[ConcreteQueueWorker, Dict[str, Any]], None]
+ func: Callable[[ConcreteQueueWorker, Dict[str, Any]], None],
) -> Callable[['QueueProcessingWorker', Dict[str, Any]], None]:
@wraps(func)
@@ -560,7 +560,7 @@ class FetchLinksEmbedData(QueueProcessingWorker):
return
if message.content is not None:
query = UserMessage.objects.filter(
- message=message.id
+ message=message.id,
)
message_user_ids = set(query.values_list('user_profile_id', flat=True))
@@ -627,7 +627,7 @@ class EmbeddedBotWorker(QueueProcessingWorker):
assert message['content'] is not None
bot_handler.handle_message(
message=message,
- bot_handler=self.get_bot_api_client(user_profile)
+ bot_handler=self.get_bot_api_client(user_profile),
)
except EmbeddedBotQuitException as e:
logging.warning(str(e))
@@ -668,7 +668,7 @@ class DeferredWorker(QueueProcessingWorker):
delete_after_upload=True)
except Exception:
export_event.extra_data = ujson.dumps(dict(
- failed_timestamp=timezone_now().timestamp()
+ failed_timestamp=timezone_now().timestamp(),
))
export_event.save(update_fields=['extra_data'])
logging.error(
@@ -693,7 +693,7 @@ class DeferredWorker(QueueProcessingWorker):
realm=user_profile.realm,
sender=get_system_bot(settings.NOTIFICATION_BOT),
recipient_user=user_profile,
- content=content
+ content=content,
)
# For future frontend use, also notify administrator
diff --git a/zilencer/management/commands/add_mock_conversation.py b/zilencer/management/commands/add_mock_conversation.py
index de97aef81a..69f40877e2 100644
--- a/zilencer/management/commands/add_mock_conversation.py
+++ b/zilencer/management/commands/add_mock_conversation.py
@@ -79,7 +79,7 @@ From image editing program:
messages = [internal_prep_stream_message(
realm, message['sender'], stream,
- 'message formatting', message['content']
+ 'message formatting', message['content'],
) for message in staged_messages]
message_ids = do_send_messages(messages)
diff --git a/zilencer/management/commands/populate_db.py b/zilencer/management/commands/populate_db.py
index f74ebfdae0..86c3421ad8 100644
--- a/zilencer/management/commands/populate_db.py
+++ b/zilencer/management/commands/populate_db.py
@@ -44,7 +44,7 @@ settings.TORNADO_SERVER = None
# from `run-dev.py`.
default_cache = settings.CACHES['default']
settings.CACHES['default'] = {
- 'BACKEND': 'django.core.cache.backends.locmem.LocMemCache'
+ 'BACKEND': 'django.core.cache.backends.locmem.LocMemCache',
}
def clear_database() -> None:
@@ -312,7 +312,7 @@ class Command(BaseCommand):
aaron = get_user_by_delivery_email("AARON@zulip.com", zulip_realm)
zulip_outgoing_bots = [
- ("Outgoing Webhook", "outgoing-webhook@zulip.com")
+ ("Outgoing Webhook", "outgoing-webhook@zulip.com"),
]
create_users(zulip_realm, zulip_outgoing_bots,
bot_type=UserProfile.OUTGOING_WEBHOOK_BOT, bot_owner=aaron)
@@ -330,7 +330,7 @@ class Command(BaseCommand):
"Denmark": {"description": "A Scandinavian country"},
"Scotland": {"description": "Located in the United Kingdom"},
"Venice": {"description": "A northeastern Italian city"},
- "Rome": {"description": "Yet another Italian city", "is_web_public": True}
+ "Rome": {"description": "Yet another Italian city", "is_web_public": True},
}
bulk_create_streams(zulip_realm, stream_dict)
@@ -543,7 +543,7 @@ class Command(BaseCommand):
"social": {"description": "For socializing"},
"test": {"description": "For testing `code`"},
"errors": {"description": "For errors"},
- "sales": {"description": "For sales discussion"}
+ "sales": {"description": "For sales discussion"},
}
# Calculate the maximum number of digits in any extra stream's
diff --git a/zilencer/management/commands/profile_request.py b/zilencer/management/commands/profile_request.py
index b2e1d86df7..4a806dd338 100644
--- a/zilencer/management/commands/profile_request.py
+++ b/zilencer/management/commands/profile_request.py
@@ -27,7 +27,7 @@ class MockRequest(HttpRequest):
self.REQUEST = {
"anchor": anchor,
"num_before": 1200,
- "num_after": 200
+ "num_after": 200,
}
self.GET: Dict[Any, Any] = {}
self.session = MockSession()
diff --git a/zilencer/management/commands/render_messages.py b/zilencer/management/commands/render_messages.py
index be193e1c95..b01e6364d0 100644
--- a/zilencer/management/commands/render_messages.py
+++ b/zilencer/management/commands/render_messages.py
@@ -56,7 +56,7 @@ class Command(BaseCommand):
break
result.write(ujson.dumps({
'id': message.id,
- 'content': render_markdown(message, content)
+ 'content': render_markdown(message, content),
}))
if message.id != latest:
result.write(',')
diff --git a/zilencer/views.py b/zilencer/views.py
index c39b9b697c..fc137a4149 100644
--- a/zilencer/views.py
+++ b/zilencer/views.py
@@ -140,13 +140,13 @@ def remote_server_notify_push(request: HttpRequest, entity: Union[UserProfile, R
android_devices = list(RemotePushDeviceToken.objects.filter(
user_id=user_id,
kind=RemotePushDeviceToken.GCM,
- server=server
+ server=server,
))
apple_devices = list(RemotePushDeviceToken.objects.filter(
user_id=user_id,
kind=RemotePushDeviceToken.APNS,
- server=server
+ server=server,
))
if android_devices:
diff --git a/zproject/backends.py b/zproject/backends.py
index 04cfcfdd83..56e6b11fe4 100644
--- a/zproject/backends.py
+++ b/zproject/backends.py
@@ -467,7 +467,7 @@ class ZulipLDAPAuthBackendBase(ZulipAuthMixin, LDAPBackend):
# we want to return. Otherwise, raise an exception.
error_message = "No ldap user matching django_to_ldap_username result: {}. Input username: {}"
raise ZulipLDAPExceptionNoMatchingLDAPUser(
- error_message.format(result, username)
+ error_message.format(result, username),
)
return result
@@ -870,7 +870,7 @@ def query_ldap(email: str) -> List[str]:
ldap_attrs = _LDAPUser(backend, ldap_username).attrs
for django_field, ldap_field in settings.AUTH_LDAP_USER_ATTR_MAP.items():
- value = ldap_attrs.get(ldap_field, ["LDAP field not present", ])[0]
+ value = ldap_attrs.get(ldap_field, ["LDAP field not present"])[0]
if django_field == "avatar":
if isinstance(value, bytes):
value = "(An avatar image file)"
@@ -1316,7 +1316,7 @@ def social_auth_finish(backend: Any,
multiuse_object_key=multiuse_object_key,
full_name_validated=full_name_validated,
mobile_flow_otp=mobile_flow_otp,
- desktop_flow_otp=desktop_flow_otp
+ desktop_flow_otp=desktop_flow_otp,
)
if user_profile is None:
data_dict.update(dict(full_name=full_name, email=email_address))
@@ -1461,7 +1461,7 @@ class GitHubAuthBackend(SocialAuthMixin, GithubOAuth2):
if team_id is None and org_name is None:
# I believe this can't raise AuthFailed, so we don't try to catch it here.
return super().user_data(
- access_token, *args, **kwargs
+ access_token, *args, **kwargs,
)
elif team_id is not None:
backend = GithubTeamOAuth2(self.strategy, self.redirect_uri)
@@ -1885,7 +1885,7 @@ class SAMLAuthBackend(SocialAuthMixin, SAMLAuth):
settings.SOCIAL_AUTH_SAML_ORG_INFO,
settings.SOCIAL_AUTH_SAML_TECHNICAL_CONTACT,
settings.SOCIAL_AUTH_SAML_SUPPORT_CONTACT,
- settings.SOCIAL_AUTH_SAML_ENABLED_IDPS
+ settings.SOCIAL_AUTH_SAML_ENABLED_IDPS,
]
if any(not setting for setting in obligatory_saml_settings_list):
return redirect_to_config_error("saml")
diff --git a/zproject/computed_settings.py b/zproject/computed_settings.py
index 6901a82a84..7b2be1e10b 100644
--- a/zproject/computed_settings.py
+++ b/zproject/computed_settings.py
@@ -278,7 +278,7 @@ DATABASES: Dict[str, Dict[str, Any]] = {"default": {
'SCHEMA': 'zulip',
'CONN_MAX_AGE': 600,
'OPTIONS': {
- 'connection_factory': TimeTrackingConnection
+ 'connection_factory': TimeTrackingConnection,
},
}}
@@ -286,12 +286,12 @@ if DEVELOPMENT:
LOCAL_DATABASE_PASSWORD = get_secret("local_database_password")
DATABASES["default"].update({
'PASSWORD': LOCAL_DATABASE_PASSWORD,
- 'HOST': 'localhost'
+ 'HOST': 'localhost',
})
elif REMOTE_POSTGRES_HOST != '':
DATABASES['default'].update({
'HOST': REMOTE_POSTGRES_HOST,
- 'PORT': REMOTE_POSTGRES_PORT
+ 'PORT': REMOTE_POSTGRES_PORT,
})
if get_secret("postgres_password") is not None:
DATABASES['default'].update({
@@ -335,7 +335,7 @@ CACHES = {
'OPTIONS': {
'tcp_nodelay': True,
'retry_timeout': 1,
- }
+ },
},
'database': {
'BACKEND': 'django.core.cache.backends.db.DatabaseCache',
@@ -347,7 +347,7 @@ CACHES = {
'OPTIONS': {
'MAX_ENTRIES': 100000000,
'CULL_FREQUENCY': 10,
- }
+ },
},
'in-memory': {
'BACKEND': 'django.core.cache.backends.locmem.LocMemCache',
@@ -416,7 +416,7 @@ if DEVELOPMENT:
# PRODUCTION. Saves a bunch of time.
PASSWORD_HASHERS = (
'django.contrib.auth.hashers.SHA1PasswordHasher',
- 'django.contrib.auth.hashers.PBKDF2PasswordHasher'
+ 'django.contrib.auth.hashers.PBKDF2PasswordHasher',
)
# Also we auto-generate passwords for the default users which you
# can query using ./manage.py print_initial_password
@@ -483,7 +483,7 @@ REALM_INTERNAL_BOTS: List[Dict[str, str]] = []
DISABLED_REALM_INTERNAL_BOTS = [
{'var_name': 'REMINDER_BOT',
'email_template': 'reminder-bot@%s',
- 'name': 'Reminder Bot'}
+ 'name': 'Reminder Bot'},
]
if PRODUCTION:
@@ -559,7 +559,7 @@ WEBPACK_LOADER = {
'CACHE': not DEBUG,
'BUNDLE_DIR_NAME': '../webpack/' if DEBUG else 'webpack-bundles/',
'STATS_FILE': os.path.join(DEPLOY_ROOT, WEBPACK_STATS_FILE),
- }
+ },
}
########################################################################
@@ -708,7 +708,7 @@ LOGGING: Dict[str, Any] = {
'formatters': {
'default': {
'()': 'zerver.lib.logging_util.ZulipFormatter',
- }
+ },
},
'filters': {
'ZulipLimiter': {
@@ -747,7 +747,7 @@ LOGGING: Dict[str, Any] = {
'class': 'zerver.logging_handlers.AdminNotifyHandler',
'filters': (['ZulipLimiter', 'require_debug_false', 'require_really_deployed']
if not DEBUG_ERROR_REPORTING else []),
- 'formatter': 'default'
+ 'formatter': 'default',
},
'auth_file': {
'level': 'DEBUG',
@@ -758,7 +758,7 @@ LOGGING: Dict[str, Any] = {
'console': {
'level': 'DEBUG',
'class': 'logging.StreamHandler',
- 'formatter': 'default'
+ 'formatter': 'default',
},
'file': {
'level': 'DEBUG',
@@ -931,7 +931,7 @@ LOGGING: Dict[str, Any] = {
'handlers': ['file', 'errors_file'],
'propagate': False,
},
- }
+ },
}
if DEVELOPMENT:
diff --git a/zproject/dev_settings.py b/zproject/dev_settings.py
index 412a5929e4..3cd628a886 100644
--- a/zproject/dev_settings.py
+++ b/zproject/dev_settings.py
@@ -29,7 +29,7 @@ if external_host_env is None:
# Serve the main dev realm at the literal name "localhost",
# so it works out of the box even when not on the Internet.
REALM_HOSTS = {
- 'zulip': 'localhost:9991'
+ 'zulip': 'localhost:9991',
}
else:
EXTERNAL_HOST = external_host_env
diff --git a/zproject/email_backends.py b/zproject/email_backends.py
index 4b86e1c885..0215694353 100644
--- a/zproject/email_backends.py
+++ b/zproject/email_backends.py
@@ -71,7 +71,7 @@ class EmailLogBackEnd(BaseEmailBackend):
'from_email': email.from_email,
'recipients': email.to,
'body': email.body,
- 'html_message': html_message
+ 'html_message': html_message,
}
new_email = loader.render_to_string('zerver/email.html', context)
diff --git a/zproject/jinja2/__init__.py b/zproject/jinja2/__init__.py
index 593d7f0a85..138a4ae683 100644
--- a/zproject/jinja2/__init__.py
+++ b/zproject/jinja2/__init__.py
@@ -18,7 +18,7 @@ def environment(**options: Any) -> Environment:
'default_page_params': {
'debug_mode': False,
'webpack_public_path': staticfiles_storage.url(
- settings.WEBPACK_LOADER['DEFAULT']['BUNDLE_DIR_NAME']
+ settings.WEBPACK_LOADER['DEFAULT']['BUNDLE_DIR_NAME'],
),
},
'static': staticfiles_storage.url,
diff --git a/zproject/prod_settings_template.py b/zproject/prod_settings_template.py
index e483c7656c..5c77165c7a 100644
--- a/zproject/prod_settings_template.py
+++ b/zproject/prod_settings_template.py
@@ -224,7 +224,7 @@ SOCIAL_AUTH_SAML_ORG_INFO = {
"displayname": "Example, Inc. Zulip",
"name": "zulip",
"url": "%s%s" % ('https://', EXTERNAL_HOST),
- }
+ },
}
SOCIAL_AUTH_SAML_ENABLED_IDPS = {
# The fields are explained in detail here:
@@ -259,7 +259,7 @@ SOCIAL_AUTH_SAML_ENABLED_IDPS = {
# If you want this IdP to only be enabled for authentication
# to certain subdomains, uncomment and edit the setting below.
# "limit_to_subdomains": ["subdomain1", "subdomain2"],
- }
+ },
}
SOCIAL_AUTH_SAML_SECURITY_CONFIG = {
diff --git a/zproject/test_extra_settings.py b/zproject/test_extra_settings.py
index cb1308d247..6a6bfd2753 100644
--- a/zproject/test_extra_settings.py
+++ b/zproject/test_extra_settings.py
@@ -98,8 +98,8 @@ CACHES['database'] = {
'TIMEOUT': 3600,
'CONN_MAX_AGE': 600,
'OPTIONS': {
- 'MAX_ENTRIES': 100000
- }
+ 'MAX_ENTRIES': 100000,
+ },
}
# Disable caching on sessions to make query counts consistent
@@ -119,7 +119,7 @@ AUTORELOAD = False
if not CASPER_TESTS:
# Use local memory cache for backend tests.
CACHES['default'] = {
- 'BACKEND': 'django.core.cache.backends.locmem.LocMemCache'
+ 'BACKEND': 'django.core.cache.backends.locmem.LocMemCache',
}
def set_loglevel(logger_name: str, level: str) -> None:
@@ -206,12 +206,12 @@ SOCIAL_AUTH_SAML_ORG_INFO = {
"name": "example",
"displayname": "Example Inc.",
"url": "%s%s" % ('http://', EXTERNAL_HOST),
- }
+ },
}
SOCIAL_AUTH_SAML_TECHNICAL_CONTACT = {
"givenName": "Tech Gal",
- "emailAddress": "technical@example.com"
+ "emailAddress": "technical@example.com",
}
SOCIAL_AUTH_SAML_SUPPORT_CONTACT = {
@@ -230,7 +230,7 @@ SOCIAL_AUTH_SAML_ENABLED_IDPS = {
"attr_username": "email",
"attr_email": "email",
"display_name": "Test IdP",
- }
+ },
}
RATE_LIMITING_RULES: Dict[str, List[Tuple[int, int]]] = {
diff --git a/zproject/urls.py b/zproject/urls.py
index a130f980c2..a3f6bc1ba7 100644
--- a/zproject/urls.py
+++ b/zproject/urls.py
@@ -580,7 +580,7 @@ i18n_urls = [
url(r'^privacy/$', zerver.views.portico.privacy_view, name='privacy'),
url(r'^config-error/(?P[\w,-]+)$', zerver.views.auth.config_error_view,
name='config_error'),
- url(r'^config-error/remoteuser/(?P[\w,-]+)$', zerver.views.auth.config_error_view)
+ url(r'^config-error/remoteuser/(?P[\w,-]+)$', zerver.views.auth.config_error_view),
]
diff --git a/zthumbor/loaders/zloader.py b/zthumbor/loaders/zloader.py
index b9d6497b51..98bd506d77 100644
--- a/zthumbor/loaders/zloader.py
+++ b/zthumbor/loaders/zloader.py
@@ -8,7 +8,7 @@ from tc_aws.loaders import s3_loader
from thumbor.context import Context
from .helpers import (
separate_url_and_source_type,
- THUMBOR_S3_TYPE, THUMBOR_LOCAL_FILE_TYPE, THUMBOR_EXTERNAL_TYPE
+ THUMBOR_S3_TYPE, THUMBOR_LOCAL_FILE_TYPE, THUMBOR_EXTERNAL_TYPE,
)
from typing import Any, Callable
