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

Partially apply Python 3 libmodernize.fixes.fix_dict_six.

Browse Source 
Refer to #256
This commit is contained in:
Eklavya Sharma
2016-03-11 15:27:29 +05:30
committed by Tim Abbott
parent 176c507b0a
commit 9e3c3e14f5
17 changed files with 38 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
zerver/views/streams.py
View File

@@ -26,6 +26,7 @@ import ujson
from six.moves import urllib
from zerver.lib.rest import rest_dispatch as _rest_dispatch
import six
rest_dispatch = csrf_exempt((lambda request, *args, **kwargs: _rest_dispatch(request, globals(), *args, **kwargs)))
def list_to_streams(streams_raw, user_profile, autocreate=False, invite_only=False):
@@ -296,7 +297,7 @@ def add_subscriptions_backend(request, user_profile,
# or if a new stream was created with the "announce" option.
notifications = []
if principals and result["subscribed"]:
for email, subscriptions in result["subscribed"].iteritems():
for email, subscriptions in six.iteritems(result["subscribed"]):
if email == user_profile.email:
# Don't send a Zulip if you invited yourself.
continue