From f7582f00503a5d17c7a723ea09856d6c775f9067 Mon Sep 17 00:00:00 2001 From: AZtheAsian Date: Wed, 30 Nov 2016 22:16:45 -0700 Subject: [PATCH] pep8: Fix E124 violations --- tools/lint-all | 2 +- zerver/models.py | 2 +- zerver/tests/test_messages.py | 2 +- zerver/tests/test_signup.py | 10 +++++----- zerver/tests/test_subs.py | 2 +- zerver/tests/tests.py | 6 +++--- zerver/tornado/application.py | 2 +- zerver/views/__init__.py | 2 +- zerver/views/auth.py | 2 +- zerver/views/streams.py | 2 +- zproject/urls.py | 2 +- 11 files changed, 17 insertions(+), 17 deletions(-) diff --git a/tools/lint-all b/tools/lint-all index 5d0574f5dd..9838881cd9 100755 --- a/tools/lint-all +++ b/tools/lint-all @@ -82,7 +82,7 @@ def check_pep8(files): # type: (List[str]) -> bool failed = False ignored_rules = [ - 'E402', 'E501', 'W503', 'E711', 'E201', 'E203', 'E202', 'E128', 'E226', 'E124', + 'E402', 'E501', 'W503', 'E711', 'E201', 'E203', 'E202', 'E128', 'E226', 'E126', 'E121', 'E122', 'E123', 'E266', 'E265', 'E261', 'E221', 'E303', 'E241', 'E712', 'E702', 'E401', 'E115', 'E114', 'E111', 'E731', 'E302', 'E129', 'E741', 'E714', 'W391', 'E713', 'E502', 'E131', 'E305', 'E251', 'E306', diff --git a/zerver/models.py b/zerver/models.py index 292dd3db75..9090a2c9b3 100644 --- a/zerver/models.py +++ b/zerver/models.py @@ -1157,7 +1157,7 @@ def get_owned_bot_dicts(user_profile, include_all_realm_bots_if_admin=True): 'default_all_public_streams': botdict['default_all_public_streams'], 'owner': botdict['bot_owner__email'], 'avatar_url': get_avatar_url(botdict['avatar_source'], botdict['email']), - } + } for botdict in result] def get_prereg_user_by_email(email): diff --git a/zerver/tests/test_messages.py b/zerver/tests/test_messages.py index fcf88ec074..67722b75c0 100644 --- a/zerver/tests/test_messages.py +++ b/zerver/tests/test_messages.py @@ -294,7 +294,7 @@ class PersonalMessagesTest(ZulipTestCase): user_message = most_recent_usermessage(user_profile) self.assertEqual(str(user_message), u'' - ) + ) @slow("checks several profiles") def test_personal_to_self(self): diff --git a/zerver/tests/test_signup.py b/zerver/tests/test_signup.py index 52b0faebbe..17af722702 100644 --- a/zerver/tests/test_signup.py +++ b/zerver/tests/test_signup.py @@ -79,7 +79,7 @@ class PublicURLTest(ZulipTestCase): "/api/v1/streams", ], 404: ["/help/nonexistent"], - } + } post_urls = {200: ["/accounts/login/"], 302: ["/accounts/logout/"], 401: ["/json/messages", @@ -96,9 +96,9 @@ class PublicURLTest(ZulipTestCase): 400: ["/api/v1/external/github", "/api/v1/fetch_api_key", ], - } + } put_urls = {401: ["/json/users/me/pointer"], - } + } for status_code, url_set in six.iteritems(get_urls): self.fetch("get", url_set, status_code) for status_code, url_set in six.iteritems(post_urls): @@ -112,7 +112,7 @@ class PublicURLTest(ZulipTestCase): resp = self.client_get("/api/v1/fetch_google_client_id") self.assertEquals(400, resp.status_code, msg="Expected 400, received %d for GET /api/v1/fetch_google_client_id" % resp.status_code, - ) + ) data = ujson.loads(resp.content) self.assertEqual('error', data['result']) @@ -122,7 +122,7 @@ class PublicURLTest(ZulipTestCase): resp = self.client_get("/api/v1/fetch_google_client_id") self.assertEquals(200, resp.status_code, msg="Expected 200, received %d for GET /api/v1/fetch_google_client_id" % resp.status_code, - ) + ) data = ujson.loads(resp.content) self.assertEqual('success', data['result']) self.assertEqual('ABCD', data['google_client_id']) diff --git a/zerver/tests/test_subs.py b/zerver/tests/test_subs.py index ff148ebdef..108a97c975 100644 --- a/zerver/tests/test_subs.py +++ b/zerver/tests/test_subs.py @@ -1828,7 +1828,7 @@ class SubscriptionAPITest(ZulipTestCase): self.assertEqual(str(subscription), u'> -> recip>' - ) + ) self.assertTrue(subscription.desktop_notifications) self.assertTrue(subscription.audible_notifications) diff --git a/zerver/tests/tests.py b/zerver/tests/tests.py index 445e74444d..f11577fb97 100644 --- a/zerver/tests/tests.py +++ b/zerver/tests/tests.py @@ -802,7 +802,7 @@ class BotTest(ZulipTestCase): default_events_register_stream=None, default_all_public_streams=False, owner='hamlet@zulip.com', - ) + ) ), event['event'] ) @@ -956,7 +956,7 @@ class BotTest(ZulipTestCase): default_events_register_stream=None, default_all_public_streams=False, owner='hamlet@zulip.com', - ) + ) ), event['event'] ) @@ -1019,7 +1019,7 @@ class BotTest(ZulipTestCase): default_events_register_stream='Denmark', default_all_public_streams=False, owner='hamlet@zulip.com', - ) + ) ), event['event'] ) diff --git a/zerver/tornado/application.py b/zerver/tornado/application.py index 633eaccd6d..274d3e9fd0 100644 --- a/zerver/tornado/application.py +++ b/zerver/tornado/application.py @@ -13,7 +13,7 @@ def create_tornado_application(): urls = (r"/notify_tornado", r"/json/events", r"/api/v1/events", - ) + ) # Application is an instance of Django's standard wsgi handler. return tornado.web.Application([(url, AsyncDjangoHandler) for url in urls] diff --git a/zerver/views/__init__.py b/zerver/views/__init__.py index f10e5a47bc..2afb021904 100644 --- a/zerver/views/__init__.py +++ b/zerver/views/__init__.py @@ -273,7 +273,7 @@ def accounts_register(request): 'creating_new_team': realm_creation, 'realms_have_subdomains': settings.REALMS_HAVE_SUBDOMAINS, 'password_auth_enabled': password_auth_enabled(realm), - }, + }, request=request) @zulip_login_required diff --git a/zerver/views/auth.py b/zerver/views/auth.py index 5ce5ffb5f3..0a1da0ee7f 100644 --- a/zerver/views/auth.py +++ b/zerver/views/auth.py @@ -434,7 +434,7 @@ def api_get_auth_backends(request): return json_success({"password": password_auth_enabled(None), "dev": dev_auth_enabled(), "google": google_auth_enabled(), - }) + }) @authenticated_json_post_view @has_request_variables diff --git a/zerver/views/streams.py b/zerver/views/streams.py index cbae91bee6..e3f1448062 100644 --- a/zerver/views/streams.py +++ b/zerver/views/streams.py @@ -378,7 +378,7 @@ def add_subscriptions_backend(request, user_profile, " **invite-only**" if private_streams[subscriptions[0]] else "", subscriptions[0], stream_link(subscriptions[0]), - )) + )) else: msg = ("Hi there! We thought you'd like to know that %s just " "subscribed you to the following streams: \n\n" diff --git a/zproject/urls.py b/zproject/urls.py index 0f85491cec..b901775c03 100644 --- a/zproject/urls.py +++ b/zproject/urls.py @@ -73,7 +73,7 @@ i18n_urls = [ 'template_name': 'zerver/reset.html', 'email_template_name': 'registration/password_reset_email.txt', 'password_reset_form': zerver.forms.ZulipPasswordResetForm, - }, name='django.contrib.auth.views.password_reset'), + }, name='django.contrib.auth.views.password_reset'), url(r'^accounts/password/reset/done/$', password_reset_done, {'template_name': 'zerver/reset_emailed.html'}), url(r'^accounts/password/reset/(?P[0-9A-Za-z]+)/(?P.+)/$',