paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-06 23:13:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

lint: Clean up W503 PEP-8 warning.

Browse Source
This commit is contained in:
Tim Abbott
2017-01-23 20:50:04 -08:00
parent bde2da7dfd
commit 22d1aa396b
22 changed files with 94 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
api/zulip/__init__.py
View File

@@ -79,9 +79,9 @@ class CountingBackoff(object):
def _check_success_timeout(self): def _check_success_timeout(self):
# type: () -> None # type: () -> None
if (self.timeout_success_equivalent is not None if (self.timeout_success_equivalent is not None and
and self.last_attempt_time != 0 self.last_attempt_time != 0 and
and time.time() - self.last_attempt_time > self.timeout_success_equivalent): time.time() - self.last_attempt_time > self.timeout_success_equivalent):
self.number_of_retries = 0 self.number_of_retries = 0
class RandomExponentialBackoff(CountingBackoff): class RandomExponentialBackoff(CountingBackoff):

22
bots/jabber_mirror_backend.py
View File

@@ -75,9 +75,9 @@ def jid_to_zulip(jid):
def zulip_to_jid(email, jabber_domain): def zulip_to_jid(email, jabber_domain):
# type: (str, str) -> JID # type: (str, str) -> JID
jid = JID(email, domain=jabber_domain) jid = JID(email, domain=jabber_domain)
if (options.zulip_email_suffix if (options.zulip_email_suffix and
and options.zulip_email_suffix in jid.username options.zulip_email_suffix in jid.username and
and not jid.username.endswith("-bot")): not jid.username.endswith("-bot")):
jid.username = jid.username.rpartition(options.zulip_email_suffix)[0] jid.username = jid.username.rpartition(options.zulip_email_suffix)[0]
return jid return jid
@@ -366,10 +366,10 @@ option does not affect login credentials.'''.replace("\n", " "))
default=None, default=None,
action='store', action='store',
help="Your Jabber JID. If a resource is specified, " help="Your Jabber JID. If a resource is specified, "
+ "it will be used as the nickname when joining MUCs. " "it will be used as the nickname when joining MUCs. "
+ "Specifying the nickname is mostly useful if you want " "Specifying the nickname is mostly useful if you want "
+ "to run the public mirror from a regular user instead of " "to run the public mirror from a regular user instead of "
+ "from a dedicated account.") "from a dedicated account.")
jabber_group.add_option('--jabber-password', jabber_group.add_option('--jabber-password',
default=None, default=None,
action='store', action='store',
@@ -378,7 +378,7 @@ option does not affect login credentials.'''.replace("\n", " "))
default=None, default=None,
action='store', action='store',
help="Your Jabber conference domain (E.g. conference.jabber.example.com). " help="Your Jabber conference domain (E.g. conference.jabber.example.com). "
+ "If not specifed, \"conference.\" will be prepended to your JID's domain.") "If not specifed, \"conference.\" will be prepended to your JID's domain.")
jabber_group.add_option('--no-use-tls', jabber_group.add_option('--no-use-tls',
default=None, default=None,
action='store_true') action='store_true')
@@ -413,8 +413,8 @@ option does not affect login credentials.'''.replace("\n", " "))
pass pass
for option in ("jid", "jabber_password", "conference_domain", "mode", "zulip_email_suffix", for option in ("jid", "jabber_password", "conference_domain", "mode", "zulip_email_suffix",
"jabber_server_address", "jabber_server_port"): "jabber_server_address", "jabber_server_port"):
if (getattr(options, option) is None if (getattr(options, option) is None and
and config.has_option("jabber_mirror", option)): config.has_option("jabber_mirror", option)):
setattr(options, option, config.get("jabber_mirror", option)) setattr(options, option, config.get("jabber_mirror", option))
for option in ("no_use_tls",): for option in ("no_use_tls",):
@@ -435,7 +435,7 @@ option does not affect login credentials.'''.replace("\n", " "))
if None in (options.jid, options.jabber_password): if None in (options.jid, options.jabber_password):
config_error("You must specify your Jabber JID and Jabber password either " config_error("You must specify your Jabber JID and Jabber password either "
+ "in the Zulip configuration file or on the commandline") "in the Zulip configuration file or on the commandline")
zulipToJabber = ZulipToJabberBot(zulip.init_from_options(options, "JabberMirror/" + __version__)) zulipToJabber = ZulipToJabberBot(zulip.init_from_options(options, "JabberMirror/" + __version__))
# This won't work for open realms that don't have a consistent domain # This won't work for open realms that don't have a consistent domain

4
bots/zephyr_mirror_backend.py
View File

@@ -104,8 +104,8 @@ def unwrap_lines(body):
previous_line = lines[0] previous_line = lines[0]
for line in lines[1:]: for line in lines[1:]:
line = line.rstrip() line = line.rstrip()
if (re.match(r'^\W', line, flags=re.UNICODE) if (re.match(r'^\W', line, flags=re.UNICODE) and
and re.match(r'^\W', previous_line, flags=re.UNICODE)): re.match(r'^\W', previous_line, flags=re.UNICODE)):
result += previous_line + "\n" result += previous_line + "\n"
elif (line == "" or elif (line == "" or
previous_line == "" or previous_line == "" or

16
contrib_bots/bots/commute_bot/commute_bot.py
View File

@@ -171,16 +171,16 @@ class CommuteHandler(object):
# determines if fare information is available # determines if fare information is available
try: try:
fare = ('Fare: ' + variable_list["fare"]["currency"] fare = ('Fare: ' + variable_list["fare"]["currency"] +
+ variable_list["fare"]["text"]) variable_list["fare"]["text"])
output += '\n' + fare output += '\n' + fare
except (KeyError, IndexError): except (KeyError, IndexError):
pass pass
# determines if traffic duration information is available # determines if traffic duration information is available
try: try:
traffic_duration = ('Duration in traffic: ' traffic_duration = ('Duration in traffic: ' +
+ variable_list["duration_in_traffic"] variable_list["duration_in_traffic"]
["text"]) ["text"])
output += '\n' + traffic_duration output += '\n' + traffic_duration
except (KeyError, IndexError): except (KeyError, IndexError):
@@ -208,13 +208,13 @@ class CommuteHandler(object):
return request.json() return request.json()
else: else:
self.send_info(message, self.send_info(message,
"Something went wrong. Please try again." "Something went wrong. Please try again." +
+ " Error: {error_num}.\n{error_text}" " Error: {error_num}.\n{error_text}"
.format(error_num=request.status_code, .format(error_num=request.status_code,
error_text=request.text), client) error_text=request.text), client)
return return
r = requests.get('https://maps.googleapis.com/maps/api/' r = requests.get('https://maps.googleapis.com/maps/api/' +
+ 'distancematrix/json', params=params) 'distancematrix/json', params=params)
result = validate_requests(r) result = validate_requests(r)
return result return result

6
contrib_bots/bots/foursquare/foursquare.py
View File

@@ -120,9 +120,9 @@ Example Inputs:
return return
if received_json['meta']['code'] == 200: if received_json['meta']['code'] == 200:
response_msg = ('Food nearby ' + params['near'] response_msg = ('Food nearby ' + params['near'] +
+ ' coming right up:\n' ' coming right up:\n' +
+ self.format_json(received_json['response']['venues'])) self.format_json(received_json['response']['venues']))
self.send_info(message, response_msg, client) self.send_info(message, response_msg, client)
return return

24
scripts/lib/zulip_tools.py
View File

@@ -67,18 +67,18 @@ def get_deployment_lock(error_rerun_script):
got_lock = True got_lock = True
break break
except OSError: except OSError:
print(WARNING + "Another deployment in progress; waiting for lock... " print(WARNING + "Another deployment in progress; waiting for lock... " +
+ "(If no deployment is running, rmdir %s)" % (LOCK_DIR,) + ENDC) "(If no deployment is running, rmdir %s)" % (LOCK_DIR,) + ENDC)
sys.stdout.flush() sys.stdout.flush()
time.sleep(3) time.sleep(3)
if not got_lock: if not got_lock:
print(FAIL + "Deployment already in progress. Please run\n" print(FAIL + "Deployment already in progress. Please run\n" +
+ " %s\n" % (error_rerun_script,) " %s\n" % (error_rerun_script,) +
+ "manually when the previous deployment finishes, or run\n" "manually when the previous deployment finishes, or run\n" +
+ " rmdir %s\n" % (LOCK_DIR,) " rmdir %s\n" % (LOCK_DIR,) +
+ "if the previous deployment crashed." "if the previous deployment crashed." +
+ ENDC) ENDC)
sys.exit(1) sys.exit(1)
def release_deployment_lock(): def release_deployment_lock():
@@ -98,9 +98,9 @@ def run(args, **kwargs):
subprocess.check_call(args, **kwargs) subprocess.check_call(args, **kwargs)
except subprocess.CalledProcessError: except subprocess.CalledProcessError:
print() print()
print(WHITEONRED + "Error running a subcommand of %s: %s" % (sys.argv[0], " ".join(args)) print(WHITEONRED + "Error running a subcommand of %s: %s" % (sys.argv[0], " ".join(args)) +
+ ENDC) ENDC)
print(WHITEONRED + "Actual error output for the subcommand is just above this." print(WHITEONRED + "Actual error output for the subcommand is just above this." +
+ ENDC) ENDC)
print() print()
raise raise

8
tools/check-templates
View File

@@ -83,14 +83,14 @@ def check_html_templates(templates, modified_only, all_dups):
if ids in IGNORE_IDS and len(fns) > 1} if ids in IGNORE_IDS and len(fns) > 1}
for ids, fns in ignorable_ids_dict.items(): for ids, fns in ignorable_ids_dict.items():
logging.warning("Duplicate ID(s) detected :Id '" + ids logging.warning("Duplicate ID(s) detected :Id '" + ids +
+ "' present at following files:") "' present at following files:")
for fn in fns: for fn in fns:
print(fn) print(fn)
for ids, fns in bad_ids_dict.items(): for ids, fns in bad_ids_dict.items():
logging.error("Duplicate ID(s) detected :Id '" + ids logging.error("Duplicate ID(s) detected :Id '" + ids +
+ "' present at following files:") "' present at following files:")
for fn in fns: for fn in fns:
print(fn) print(fn)

8
tools/compile-handlebars-templates
View File

@@ -24,10 +24,10 @@ def get_templates():
def run(): def run():
# type: () -> None # type: () -> None
subprocess.check_call(['node', 'node_modules/.bin/handlebars'] subprocess.check_call(['node', 'node_modules/.bin/handlebars'] +
+ get_templates() get_templates() +
+ ['--output', os.path.join(STATIC_PATH, 'templates/compiled.js'), ['--output', os.path.join(STATIC_PATH, 'templates/compiled.js'),
'--known', 'if,unless,each,with']) '--known', 'if,unless,each,with'])
def run_forever(): def run_forever():
# type: () -> None # type: () -> None

5
tools/lint-all
View File

@@ -87,7 +87,6 @@ def check_pep8(files):
# ignored. It either doesn't fit with the style of the project or should # ignored. It either doesn't fit with the style of the project or should
# actually be cleaned up. # actually be cleaned up.
# #
'W503',
'E114', 'E115', 'E121', 'E123', 'E126', 'E226', 'E241', 'E261', 'E302', 'E114', 'E115', 'E121', 'E123', 'E126', 'E226', 'E241', 'E261', 'E302',
'E305', 'E306', 'E401', 'E501', 'E702', 'E711', 'E712', 'E713', 'E714', 'E305', 'E306', 'E401', 'E501', 'E702', 'E711', 'E712', 'E713', 'E714',
'E741', 'E741',
@@ -622,8 +621,8 @@ def run():
# type: () -> int # type: () -> int
if len(by_lang['js']) == 0: if len(by_lang['js']) == 0:
return 0 return 0
result = subprocess.call(['node', 'node_modules/.bin/eslint', '--quiet'] result = subprocess.call(['node', 'node_modules/.bin/eslint', '--quiet'] +
+ by_lang['js']) by_lang['js'])
return result return result
@lint @lint

4
tools/minify-js
View File

@@ -109,8 +109,8 @@ for js_group, filespec in six.iteritems(JS_SPECS):
for filename in filespec.get('minifed_source_filenames', [])] for filename in filespec.get('minifed_source_filenames', [])]
out_file = os.path.join(MIN_DIR, os.path.basename(filespec['output_filename'])) out_file = os.path.join(MIN_DIR, os.path.basename(filespec['output_filename']))
map_file = os.path.join(MAP_DIR, os.path.basename(filespec['output_filename']) map_file = os.path.join(MAP_DIR, os.path.basename(filespec['output_filename']) +
+ '.map') '.map')
if (not 'force_minify' in filespec) and \ if (not 'force_minify' in filespec) and \
(prev_deploy and len(set(in_files) & changed_files) == 0): (prev_deploy and len(set(in_files) & changed_files) == 0):

4
tools/update-prod-static
View File

@@ -32,8 +32,8 @@ fp = open('var/log/update-prod-static.log', 'w')
setup_node_modules(npm_args=['--production'], stdout=fp, stderr=fp) setup_node_modules(npm_args=['--production'], stdout=fp, stderr=fp)
# Compile Handlebars templates and minify JavaScript. # Compile Handlebars templates and minify JavaScript.
subprocess.check_call(['./tools/minify-js'] subprocess.check_call(['./tools/minify-js'] +
+ (['--prev-deploy', prev_deploy] if prev_deploy else []), (['--prev-deploy', prev_deploy] if prev_deploy else []),
stdout=fp, stderr=fp) stdout=fp, stderr=fp)
# Build emoji # Build emoji

24
zerver/decorator.py
View File

@@ -94,9 +94,9 @@ def require_post(func):
@wraps(func) @wraps(func)
def wrapper(request, *args, **kwargs): def wrapper(request, *args, **kwargs):
# type: (HttpRequest, *Any, **Any) -> HttpResponse # type: (HttpRequest, *Any, **Any) -> HttpResponse
if (request.method != "POST" if (request.method != "POST" and
and not (request.method == "SOCKET" not (request.method == "SOCKET" and
and request.META['zulip.emulated_method'] == "POST")): request.META['zulip.emulated_method'] == "POST")):
if request.method == "SOCKET": if request.method == "SOCKET":
err_method = "SOCKET/%s" % (request.META['zulip.emulated_method'],) err_method = "SOCKET/%s" % (request.META['zulip.emulated_method'],)
else: else:
@@ -191,11 +191,11 @@ def validate_api_key(request, role, api_key, is_webhook=False):
except AttributeError: except AttributeError:
# Deployment objects don't have realms # Deployment objects don't have realms
pass pass
if (not check_subdomain(get_subdomain(request), profile.realm.subdomain) if (not check_subdomain(get_subdomain(request), profile.realm.subdomain) and
# Allow access to localhost for Tornado # Allow access to localhost for Tornado
and not (settings.RUNNING_INSIDE_TORNADO and not (settings.RUNNING_INSIDE_TORNADO and
request.META["SERVER_NAME"] == "127.0.0.1" and request.META["SERVER_NAME"] == "127.0.0.1" and
request.META["REMOTE_ADDR"] == "127.0.0.1")): request.META["REMOTE_ADDR"] == "127.0.0.1")):
logging.warning("User %s attempted to access API on wrong subdomain %s" % ( logging.warning("User %s attempted to access API on wrong subdomain %s" % (
profile.email, get_subdomain(request))) profile.email, get_subdomain(request)))
raise JsonableError(_("Account is not associated with this subdomain")) raise JsonableError(_("Account is not associated with this subdomain"))
@@ -486,17 +486,17 @@ def is_local_addr(addr):
# secret, and also the originating IP (for now). # secret, and also the originating IP (for now).
def authenticate_notify(request): def authenticate_notify(request):
# type: (HttpRequest) -> bool # type: (HttpRequest) -> bool
return (is_local_addr(request.META['REMOTE_ADDR']) return (is_local_addr(request.META['REMOTE_ADDR']) and
and request.POST.get('secret') == settings.SHARED_SECRET) request.POST.get('secret') == settings.SHARED_SECRET)
def client_is_exempt_from_rate_limiting(request): def client_is_exempt_from_rate_limiting(request):
# type: (HttpRequest) -> bool # type: (HttpRequest) -> bool
# Don't rate limit requests from Django that come from our own servers, # Don't rate limit requests from Django that come from our own servers,
# and don't rate-limit dev instances # and don't rate-limit dev instances
return ((request.client and request.client.name.lower() == 'internal') return ((request.client and request.client.name.lower() == 'internal') and
and (is_local_addr(request.META['REMOTE_ADDR']) or (is_local_addr(request.META['REMOTE_ADDR']) or
settings.DEBUG_RATE_LIMITING)) settings.DEBUG_RATE_LIMITING))
def internal_notify_view(view_func): def internal_notify_view(view_func):
# type: (ViewFuncT) -> ViewFuncT # type: (ViewFuncT) -> ViewFuncT

8
zerver/lib/actions.py
View File

@@ -122,8 +122,8 @@ def log_event(event):
os.mkdir(settings.EVENT_LOG_DIR) os.mkdir(settings.EVENT_LOG_DIR)
template = os.path.join(settings.EVENT_LOG_DIR, template = os.path.join(settings.EVENT_LOG_DIR,
'%s.' + platform.node() '%s.' + platform.node() +
+ datetime.datetime.now().strftime('.%Y-%m-%d')) datetime.datetime.now().strftime('.%Y-%m-%d'))
with lockfile(template % ('lock',)): with lockfile(template % ('lock',)):
with open(template % ('events',), 'a') as log: with open(template % ('events',), 'a') as log:
@@ -1128,8 +1128,8 @@ def recipient_for_emails(emails, not_forged_mirror_message,
# If the private message is just between the sender and # If the private message is just between the sender and
# another person, force it to be a personal internally # another person, force it to be a personal internally
if (len(recipient_profile_ids) == 2 if (len(recipient_profile_ids) == 2 and
and sender.id in recipient_profile_ids): sender.id in recipient_profile_ids):
recipient_profile_ids.remove(sender.id) recipient_profile_ids.remove(sender.id)
if len(recipient_profile_ids) > 1: if len(recipient_profile_ids) > 1:

12
zerver/lib/migrate.py
View File

@@ -55,12 +55,12 @@ def add_bool_columns(db, table, cols):
coltype = 'boolean' coltype = 'boolean'
val = 'false' val = 'false'
stmt = (('ALTER TABLE %s ' % (table,)) stmt = (('ALTER TABLE %s ' % (table,)) +
+ ', '.join(['ADD %s %s' % (col, coltype) for col in cols])) ', '.join(['ADD %s %s' % (col, coltype) for col in cols]))
timed_ddl(db, stmt) timed_ddl(db, stmt)
stmt = (('ALTER TABLE %s ' % (table,)) stmt = (('ALTER TABLE %s ' % (table,)) +
+ ', '.join(['ALTER %s SET DEFAULT %s' % (col, val) for col in cols])) ', '.join(['ALTER %s SET DEFAULT %s' % (col, val) for col in cols]))
timed_ddl(db, stmt) timed_ddl(db, stmt)
vals = [val] * len(cols) vals = [val] * len(cols)
@@ -69,8 +69,8 @@ def add_bool_columns(db, table, cols):
stmt = 'ANALYZE %s' % (table,) stmt = 'ANALYZE %s' % (table,)
timed_ddl(db, stmt) timed_ddl(db, stmt)
stmt = (('ALTER TABLE %s ' % (table,)) stmt = (('ALTER TABLE %s ' % (table,)) +
+ ', '.join(['ALTER %s SET NOT NULL' % (col,) for col in cols])) ', '.join(['ALTER %s SET NOT NULL' % (col,) for col in cols]))
timed_ddl(db, stmt) timed_ddl(db, stmt)
def create_index_if_nonexistant(db, table, col, index): def create_index_if_nonexistant(db, table, col, index):

4
zerver/lib/rest.py
View File

@@ -84,8 +84,8 @@ def rest_dispatch(request, **kwargs):
# for some special views (e.g. serving a file that has been # for some special views (e.g. serving a file that has been
# uploaded), we support using the same url for web and API clients. # uploaded), we support using the same url for web and API clients.
if ('override_api_url_scheme' in view_flags if ('override_api_url_scheme' in view_flags and
and request.META.get('HTTP_AUTHORIZATION', None) is not None): request.META.get('HTTP_AUTHORIZATION', None) is not None):
# This request API based authentication. # This request API based authentication.
target_function = authenticated_rest_api_view()(target_function) target_function = authenticated_rest_api_view()(target_function)
# /json views (web client) validate with a session token (cookie) # /json views (web client) validate with a session token (cookie)

4
zerver/middleware.py
View File

@@ -350,8 +350,8 @@ class SessionHostDomainMiddleware(SessionMiddleware):
def process_response(self, request, response): def process_response(self, request, response):
# type: (HttpRequest, HttpResponse) -> HttpResponse # type: (HttpRequest, HttpResponse) -> HttpResponse
if settings.REALMS_HAVE_SUBDOMAINS: if settings.REALMS_HAVE_SUBDOMAINS:
if (not request.path.startswith("/static/") and not request.path.startswith("/api/") if (not request.path.startswith("/static/") and not request.path.startswith("/api/") and
and not request.path.startswith("/json/")): not request.path.startswith("/json/")):
subdomain = get_subdomain(request) subdomain = get_subdomain(request)
if (request.get_host() == "127.0.0.1:9991" or request.get_host() == "localhost:9991"): if (request.get_host() == "127.0.0.1:9991" or request.get_host() == "localhost:9991"):
return redirect("%s%s" % (settings.EXTERNAL_URI_SCHEME, return redirect("%s%s" % (settings.EXTERNAL_URI_SCHEME,

4
zerver/tests/test_narrow.py
View File

@@ -470,8 +470,8 @@ class GetOldMessagesTest(ZulipTestCase):
return ','.join(sorted(set([r['email'] for r in dr] + [me]))) return ','.join(sorted(set([r['email'] for r in dr] + [me])))
personals = [m for m in get_user_messages(get_user_profile_by_email(me)) personals = [m for m in get_user_messages(get_user_profile_by_email(me))
if m.recipient.type == Recipient.PERSONAL if m.recipient.type == Recipient.PERSONAL or
or m.recipient.type == Recipient.HUDDLE] m.recipient.type == Recipient.HUDDLE]
if not personals: if not personals:
# FIXME: This is bad. We should use test data that is guaranteed # FIXME: This is bad. We should use test data that is guaranteed
# to contain some personals for every user. See #617. # to contain some personals for every user. See #617.

4
zerver/tornado/application.py
View File

@@ -16,8 +16,8 @@ def create_tornado_application():
) )
# Application is an instance of Django's standard wsgi handler. # Application is an instance of Django's standard wsgi handler.
return tornado.web.Application([(url, AsyncDjangoHandler) for url in urls] return tornado.web.Application(([(url, AsyncDjangoHandler) for url in urls] +
+ get_sockjs_router().urls, get_sockjs_router().urls),
debug=settings.DEBUG, debug=settings.DEBUG,
# Disable Tornado's own request logging, since we have our own # Disable Tornado's own request logging, since we have our own
log_function=lambda x: None) log_function=lambda x: None)

8
zerver/tornado/event_queue.py
View File

@@ -169,8 +169,8 @@ class ClientDescriptor(object):
if not hasattr(self, 'queue_timeout'): if not hasattr(self, 'queue_timeout'):
self.queue_timeout = IDLE_EVENT_QUEUE_TIMEOUT_SECS self.queue_timeout = IDLE_EVENT_QUEUE_TIMEOUT_SECS
return (self.current_handler_id is None return (self.current_handler_id is None and
and now - self.last_connection_time >= self.queue_timeout) now - self.last_connection_time >= self.queue_timeout)
def connect_handler(self, handler_id, client_name): def connect_handler(self, handler_id, client_name):
# type: (int, Text) -> None # type: (int, Text) -> None
@@ -408,8 +408,8 @@ def gc_event_queues():
# not have a current handler. # not have a current handler.
do_gc_event_queues(to_remove, affected_users, affected_realms) do_gc_event_queues(to_remove, affected_users, affected_realms)
logging.info(('Tornado removed %d idle event queues owned by %d users in %.3fs.' logging.info(('Tornado removed %d idle event queues owned by %d users in %.3fs.' +
+ ' Now %d active queues, %s') ' Now %d active queues, %s')
% (len(to_remove), len(affected_users), time.time() - start, % (len(to_remove), len(affected_users), time.time() - start,
len(clients), handler_stats_string())) len(clients), handler_stats_string()))
statsd.gauge('tornado.active_queues', len(clients)) statsd.gauge('tornado.active_queues', len(clients))

6
zerver/views/messages.py
View File

@@ -373,9 +373,9 @@ def narrow_parameter(json):
# We have to support a legacy tuple format. # We have to support a legacy tuple format.
if isinstance(elem, list): if isinstance(elem, list):
if (len(elem) != 2 if (len(elem) != 2 or
or any(not isinstance(x, str) and not isinstance(x, Text) any(not isinstance(x, str) and not isinstance(x, Text)
for x in elem)): for x in elem)):
raise ValueError("element is not a string pair") raise ValueError("element is not a string pair")
return dict(operator=elem[0], operand=elem[1]) return dict(operator=elem[0], operand=elem[1])

4
zerver/views/streams.py
View File

@@ -121,8 +121,8 @@ def principal_to_user_profile(agent, principal):
except UserProfile.DoesNotExist: except UserProfile.DoesNotExist:
principal_doesnt_exist = True principal_doesnt_exist = True
if (principal_doesnt_exist if (principal_doesnt_exist or
or agent.realm != principal_user_profile.realm): agent.realm != principal_user_profile.realm):
# We have to make sure we don't leak information about which users # We have to make sure we don't leak information about which users
# are registered for Zulip in a different realm. We could do # are registered for Zulip in a different realm. We could do
# something a little more clever and check the domain part of the # something a little more clever and check the domain part of the

4
zproject/local_settings.py
View File

@@ -22,8 +22,8 @@ PRODUCTION = config_file.has_option('machine', 'deploy_type')
# Zulip run by Zulip, Inc. We will eventually be able to get rid of # Zulip run by Zulip, Inc. We will eventually be able to get rid of
# them and just have the PRODUCTION flag, but we need them for now. # them and just have the PRODUCTION flag, but we need them for now.
ZULIP_COM_STAGING = PRODUCTION and config_file.get('machine', 'deploy_type') == 'zulip.com-staging' ZULIP_COM_STAGING = PRODUCTION and config_file.get('machine', 'deploy_type') == 'zulip.com-staging'
ZULIP_COM = ((PRODUCTION and config_file.get('machine', 'deploy_type') == 'zulip.com-prod') ZULIP_COM = ((PRODUCTION and config_file.get('machine', 'deploy_type') == 'zulip.com-prod') or
or ZULIP_COM_STAGING) ZULIP_COM_STAGING)
if not ZULIP_COM: if not ZULIP_COM:
raise Exception("You should create your own local settings from prod_settings_template.") raise Exception("You should create your own local settings from prod_settings_template.")