sync-public-streams: Fix for Python 3.

bytes are not JSON serializable.

Signed-off-by: Anders Kaseorg <anders@zulip.com>
This commit is contained in:
Anders Kaseorg 2021-04-06 14:44:46 -07:00 committed by Tim Abbott
parent 42aecf683e
commit 15c46dce46

View file

@ -13,7 +13,7 @@ import zulip
from typing import Set, Optional from typing import Set, Optional
def fetch_public_streams() -> Optional[Set[bytes]]: def fetch_public_streams() -> Optional[Set[str]]:
public_streams = set() public_streams = set()
try: try:
@ -31,10 +31,10 @@ def fetch_public_streams() -> Optional[Set[bytes]]:
stream_name = stream["name"] stream_name = stream["name"]
# Zephyr class names are canonicalized by first applying NFKC # Zephyr class names are canonicalized by first applying NFKC
# normalization and then lower-casing server-side # normalization and then lower-casing server-side
canonical_cls = unicodedata.normalize("NFKC", stream_name).lower().encode("utf-8") canonical_cls = unicodedata.normalize("NFKC", stream_name).lower()
if canonical_cls in [b'security', b'login', b'network', b'ops', b'user_locate', if canonical_cls in ['security', 'login', 'network', 'ops', 'user_locate',
b'mit', b'moof', b'wsmonitor', b'wg_ctl', b'winlogger', 'mit', 'moof', 'wsmonitor', 'wg_ctl', 'winlogger',
b'hm_ctl', b'hm_stat', b'zephyr_admin', b'zephyr_ctl']: 'hm_ctl', 'hm_stat', 'zephyr_admin', 'zephyr_ctl']:
# These zephyr classes cannot be subscribed to by us, due # These zephyr classes cannot be subscribed to by us, due
# to MIT's Zephyr access control settings # to MIT's Zephyr access control settings
continue continue