From f7c2437f24f66a9eeddd1a1a64b823969dc81bf1 Mon Sep 17 00:00:00 2001 From: bsimpson63 Date: Tue, 4 Dec 2012 10:51:24 -0500 Subject: [PATCH] Adweight uses Link fullname as 'link' field. --- r2/r2/lib/promote.py | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/r2/r2/lib/promote.py b/r2/r2/lib/promote.py index 291107e55..daeea4f2c 100644 --- a/r2/r2/lib/promote.py +++ b/r2/r2/lib/promote.py @@ -559,7 +559,7 @@ def get_scheduled(offset=0): for l, campaign, weight in accepted_campaigns(offset=offset): try: if authorize.is_charged_transaction(campaign.trans_id, campaign._id): - adweight = AdWeight(l, weight, campaign._fullname) + adweight = AdWeight(l._fullname, weight, campaign._fullname) by_sr.setdefault(campaign.sr_name, []).append(adweight) links.add(l) except Exception, e: # could happen if campaign things have corrupt data @@ -691,17 +691,6 @@ def make_daily_promotions(offset=0, test=False): all_links = set([l._fullname for l in links]) srs = Subreddit._by_name(by_srname.keys()) - # convert AdWeights to use fullname (lost from weight_schedule) - for sr, adweights in by_srname.iteritems(): - fixed_adweights = [] - for a in adweights: - if isinstance(a.link, Link): - fixed_a = AdWeight(a.link._fullname, a.weight, a.campaign) - fixed_adweights.append(fixed_a) - else: - fixed_adweights.append(a) - by_srname[sr] = fixed_adweights - # over18 check for srname, adweights in by_srname.iteritems(): if srname: