From 543ba03ff66a5bfccc3fdbde1f6aa0a6ce6b04b7 Mon Sep 17 00:00:00 2001 From: Tim Abbott Date: Mon, 30 Sep 2013 15:53:49 -0400 Subject: [PATCH] gather_subscriptions: Fix confusing overwriting of local variable stream. (imported from commit cfe369869de5f13579ff0e0b91ec0a735e2fe81c) --- zerver/lib/actions.py | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/zerver/lib/actions.py b/zerver/lib/actions.py index 7de09218bd..7f035b31bb 100644 --- a/zerver/lib/actions.py +++ b/zerver/lib/actions.py @@ -1457,18 +1457,18 @@ def gather_subscriptions(user_profile): if stream.invite_only and not sub.active: subscribers = None - stream = {'name': stream.name, - 'in_home_view': sub.in_home_view, - 'invite_only': stream.invite_only, - 'color': sub.color, - 'notifications': sub.notifications, - 'email_address': encode_email_address(stream)} + stream_dict = {'name': stream.name, + 'in_home_view': sub.in_home_view, + 'invite_only': stream.invite_only, + 'color': sub.color, + 'notifications': sub.notifications, + 'email_address': encode_email_address(stream)} if subscribers is not None: - stream['subscribers'] = subscribers + stream_dict['subscribers'] = subscribers if sub.active: - subscribed.append(stream) + subscribed.append(stream_dict) else: - unsubscribed.append(stream) + unsubscribed.append(stream_dict) return (sorted(subscribed), sorted(unsubscribed))