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

refactor: Remove dict_with_str_keys().

Browse Source 
This function is no longer needed in python3, as it was decoding
keys that already came for a JSON-decoded string.
This commit is contained in:
Steve Howell
2017-11-04 11:22:54 -07:00
committed by Tim Abbott
parent b0bb09cdb8
commit 8eaeba8615
2 changed files with 1 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
zerver/lib/message.py
View File

@@ -15,7 +15,6 @@ from zerver.lib.cache import (
to_dict_cache_key_id, to_dict_cache_key_id,
) )
from zerver.lib.request import JsonableError from zerver.lib.request import JsonableError
from zerver.lib.str_utils import dict_with_str_keys
from zerver.lib.stream_subscription import ( from zerver.lib.stream_subscription import (
get_stream_subscriptions_for_user, get_stream_subscriptions_for_user,
) )
@@ -111,7 +110,7 @@ def sew_messages_and_reactions(messages, reactions):
def extract_message_dict(message_bytes): def extract_message_dict(message_bytes):
# type: (bytes) -> Dict[str, Any] # type: (bytes) -> Dict[str, Any]
return dict_with_str_keys(ujson.loads(zlib.decompress(message_bytes).decode("utf-8"))) return ujson.loads(zlib.decompress(message_bytes).decode("utf-8"))
def stringify_message_dict(message_dict): def stringify_message_dict(message_dict):
# type: (Dict[str, Any]) -> bytes # type: (Dict[str, Any]) -> bytes

5
zerver/lib/str_utils.py
View File

@@ -66,11 +66,6 @@ def force_str(s, encoding='utf-8'):
else: else:
raise TypeError("force_str expects a string type") raise TypeError("force_str expects a string type")
def dict_with_str_keys(dct, encoding='utf-8'):
# type: (Mapping[NonBinaryStr, Any], str) -> Dict[str, Any]
"""applies force_str on the keys of a dict (non-recursively)"""
return {force_str(key, encoding): value for key, value in dct.items()}
class ModelReprMixin: class ModelReprMixin:
""" """
This mixin provides a python 2 and 3 compatible way of handling string representation of a model. This mixin provides a python 2 and 3 compatible way of handling string representation of a model.