From f61587c7af24b2a719ae00bc79a04e9e2d830ded Mon Sep 17 00:00:00 2001 From: bsimpson63 Date: Wed, 30 Jan 2013 16:03:21 -0500 Subject: [PATCH] Cleanup in get_promotion_list. --- r2/r2/lib/promote.py | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/r2/r2/lib/promote.py b/r2/r2/lib/promote.py index 65dcd9502..612018ea9 100644 --- a/r2/r2/lib/promote.py +++ b/r2/r2/lib/promote.py @@ -806,17 +806,14 @@ PromoTuple = namedtuple('PromoTuple', ['link', 'weight', 'campaign']) def get_promotion_list(user, site): - # site is specified, pick an ad from that site if not isinstance(site, FakeSubreddit): srids = set([site._id]) elif isinstance(site, MultiReddit): srids = set(site.sr_ids) - # site is Fake, user is not. Pick based on their subscriptions. elif user and not isinstance(user, FakeAccount): srids = set(Subreddit.reverse_subscriber_ids(user) + [""]) - # both site and user are "fake" -- get the default subscription list else: - srids = set(Subreddit.user_subreddits(None, True) + [""]) + srids = set(Subreddit.user_subreddits(None, ids=True) + [""]) tuples = get_promotion_list_cached(srids) return [PromoTuple(*t) for t in tuples]