paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-10 00:46:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

pep8: Fix E203 violations

Browse Source
This commit is contained in:
AZtheAsian
2016-12-01 16:08:34 -07:00
committed by Tim Abbott
parent e6369fc29b
commit 1ba150fa85
11 changed files with 39 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
analytics/lib/counts.py
View File

@@ -135,9 +135,9 @@ def do_aggregate_to_summary_table(stat, end_time, interval):
%(analytics_table)s.interval = '%(interval)s'
)
GROUP BY zerver_realm.id, %(analytics_table)s.subgroup
""" % {'analytics_table' : analytics_table._meta.db_table,
'property' : stat.property,
'interval' : interval}
""" % {'analytics_table': analytics_table._meta.db_table,
'property': stat.property,
'interval': interval}
start = time.time()
cursor.execute(realmcount_query, {'end_time': end_time})
end = time.time()
@@ -180,10 +180,10 @@ def do_pull_from_zerver(stat, start_time, end_time, interval):
# We do string replacement here because passing join_args as a param
# may result in problems when running cursor.execute; we do
# the string formatting prior so that cursor.execute runs it as sql
query_ = stat.zerver_count_query.query % {'zerver_table' : zerver_table,
'property' : stat.property,
'interval' : interval,
'join_args' : join_args,
query_ = stat.zerver_count_query.query % {'zerver_table': zerver_table,
'property': stat.property,
'interval': interval,
'join_args': join_args,
'subgroup': subgroup,
'group_by_clause': group_by_clause}
cursor = connection.cursor()

8
bots/zephyr_mirror_backend.py
View File

@@ -386,10 +386,10 @@ def process_notice(notice, log):
if options.forward_class_messages and notice.opcode.lower() == "crypt":
body = decrypt_zephyr(zephyr_class, notice.instance.lower(), body)
zeph = { 'time' : str(notice.time),
'sender' : notice.sender,
'zsig' : zsig, # logged here but not used by app
'content' : body }
zeph = { 'time': str(notice.time),
'sender': notice.sender,
'zsig': zsig, # logged here but not used by app
'content': body }
if is_huddle:
zeph['type'] = 'private'
zeph['recipient'] = huddle_recipients

2
tools/lib/css_parser.py
View File

@@ -127,7 +127,7 @@ def parse_selectors_section(tokens):
assert pre_fluff == ''
i = start
text = ''
while i < len(tokens) and tokens[i].s != '{' :
while i < len(tokens) and tokens[i].s != '{':
s = tokens[i].s
text += s
i += 1

2
tools/lint-all
View File

@@ -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',
'E402', 'E501', 'W503', 'E711', 'E201', 'E202', 'E128', 'E226',
'E126', 'E121', 'E122', 'E123', 'E266', 'E265', 'E261', 'E221', 'E303',
'E241', 'E712', 'E702', 'E401', 'E115', 'E114', 'E731', 'E302', 'E129',
'E741', 'E714', 'W391', 'E713', 'E502', 'E131', 'E305', 'E251', 'E306',

22
zerver/lib/actions.py
View File

@@ -2896,21 +2896,21 @@ def get_status_dict(requesting_user_profile):
def get_realm_user_dicts(user_profile):
# type: (UserProfile) -> List[Dict[str, text_type]]
return [{'email' : userdict['email'],
'user_id' : userdict['id'],
'is_admin' : userdict['is_realm_admin'],
'is_bot' : userdict['is_bot'],
'full_name' : userdict['full_name']}
return [{'email': userdict['email'],
'user_id': userdict['id'],
'is_admin': userdict['is_realm_admin'],
'is_bot': userdict['is_bot'],
'full_name': userdict['full_name']}
for userdict in get_active_user_dicts_in_realm(user_profile.realm)]
def get_cross_realm_dicts():
# type: () -> List[Dict[str, Any]]
users = [get_user_profile_by_email(email) for email in get_cross_realm_emails()]
return [{'email' : user.email,
'user_id' : user.id,
'is_admin' : user.is_realm_admin,
'is_bot' : user.is_bot,
'full_name' : user.full_name}
return [{'email': user.email,
'user_id': user.id,
'is_admin': user.is_realm_admin,
'is_bot': user.is_bot,
'full_name': user.full_name}
for user in users]
# Fetch initial data. When event_types is not specified, clients want
@@ -3410,7 +3410,7 @@ def do_refer_friend(user_profile, email):
subject = "Zulip referral: %s" % (email,)
from_email = '"%s" <%s>' % (user_profile.full_name, 'referrals@zulip.com')
to_email = '"Zulip Referrals" <zulip+referrals@zulip.com>'
headers = {'Reply-To' : '"%s" <%s>' % (user_profile.full_name, user_profile.email,)}
headers = {'Reply-To': '"%s" <%s>' % (user_profile.full_name, user_profile.email,)}
msg = EmailMessage(subject, content, from_email, [to_email], headers=headers)
msg.send()

4
zerver/tests/test_auth_backends.py
View File

@@ -1510,7 +1510,7 @@ class TestAdminSetBackends(ZulipTestCase):
# Log in as admin
self.login("iago@zulip.com")
result = self.client_patch("/json/realm", {
'authentication_methods' : ujson.dumps({u'Email': False, u'Dev': False})})
'authentication_methods': ujson.dumps({u'Email': False, u'Dev': False})})
self.assert_json_error(result, 'At least one authentication method must be enabled.', status_code=403)
realm = get_realm_by_string_id('zulip')
self.assertTrue(password_auth_enabled(realm))
@@ -1522,7 +1522,7 @@ class TestAdminSetBackends(ZulipTestCase):
self.login("iago@zulip.com")
# Set some supported and unsupported backends
result = self.client_patch("/json/realm", {
'authentication_methods' : ujson.dumps({u'Email': False, u'Dev': True, u'GitHub': False})})
'authentication_methods': ujson.dumps({u'Email': False, u'Dev': True, u'GitHub': False})})
self.assert_json_success(result)
realm = get_realm_by_string_id('zulip')
# Check that unsupported backend is not enabled

16
zerver/tornado/event_queue.py
View File

@@ -564,13 +564,13 @@ def request_event_queue(user_profile, user_client, apply_markdown,
narrow=[]):
# type: (UserProfile, Client, bool, int, Optional[Iterable[str]], bool, Iterable[Sequence[text_type]]) -> Optional[str]
if settings.TORNADO_SERVER:
req = {'dont_block' : 'true',
req = {'dont_block': 'true',
'apply_markdown': ujson.dumps(apply_markdown),
'all_public_streams': ujson.dumps(all_public_streams),
'client' : 'internal',
'user_client' : user_client.name,
'narrow' : ujson.dumps(narrow),
'lifespan_secs' : queue_lifespan_secs}
'client': 'internal',
'user_client': user_client.name,
'narrow': ujson.dumps(narrow),
'lifespan_secs': queue_lifespan_secs}
if event_types is not None:
req['event_types'] = ujson.dumps(event_types)
resp = requests_client.get(settings.TORNADO_SERVER + '/api/v1/events',
@@ -590,10 +590,10 @@ def get_user_events(user_profile, queue_id, last_event_id):
resp = requests_client.get(settings.TORNADO_SERVER + '/api/v1/events',
auth=requests.auth.HTTPBasicAuth(
user_profile.email, user_profile.api_key),
params={'queue_id' : queue_id,
params={'queue_id': queue_id,
'last_event_id': last_event_id,
'dont_block' : 'true',
'client' : 'internal'})
'dont_block': 'true',
'client': 'internal'})
resp.raise_for_status()

2
zerver/views/__init__.py
View File

@@ -673,7 +673,7 @@ def home_real(request):
request._log_data['extra'] = "[%s]" % (register_ret["queue_id"],)
response = render_to_response('zerver/index.html',
{'user_profile': user_profile,
'page_params' : simplejson.encoder.JSONEncoderForHTML().encode(page_params),
'page_params': simplejson.encoder.JSONEncoderForHTML().encode(page_params),
'nofontface': is_buggy_ua(request.META.get("HTTP_USER_AGENT", "Unspecified")),
'avatar_url': avatar_url(user_profile),
'show_debug':

2
zerver/views/users.py
View File

@@ -121,7 +121,7 @@ def get_stream_name(stream):
# type: (Stream) -> Optional[text_type]
if stream:
name = stream.name
else :
else:
name = None
return name

2
zerver/worker/queue_processors.py
View File

@@ -258,7 +258,7 @@ class FeedbackBot(QueueProcessingWorker):
subject = "Zulip feedback from %s" % (event["sender_email"],)
content = event["content"]
from_email = '"%s" <%s>' % (event["sender_full_name"], settings.ZULIP_ADMINISTRATOR)
headers = {'Reply-To' : '"%s" <%s>' % (event["sender_full_name"], event["sender_email"])}
headers = {'Reply-To': '"%s" <%s>' % (event["sender_full_name"], event["sender_email"])}
msg = EmailMessage(subject, content, from_email, [to_email], headers=headers)
msg.send()
else:

4
zproject/urls.py
View File

@@ -78,9 +78,9 @@ i18n_urls = [
{'template_name': 'zerver/reset_emailed.html'}),
url(r'^accounts/password/reset/(?P<uidb64>[0-9A-Za-z]+)/(?P<token>.+)/$',
password_reset_confirm,
{'post_reset_redirect' : '/accounts/password/done/',
{'post_reset_redirect': '/accounts/password/done/',
'template_name': 'zerver/reset_confirm.html',
'set_password_form' : zerver.forms.LoggingSetPasswordForm},
'set_password_form': zerver.forms.LoggingSetPasswordForm},
name='django.contrib.auth.views.password_reset_confirm'),
url(r'^accounts/password/done/$', password_reset_complete,
{'template_name': 'zerver/reset_done.html'}),