From 0e3017788fc082679c9ced8a5f5d9f738910a888 Mon Sep 17 00:00:00 2001 From: bsimpson63 Date: Thu, 25 Apr 2013 10:54:40 -0400 Subject: [PATCH] Let promote.get_total_run figure out dates for get_traffic_dates. --- r2/r2/lib/pages/trafficpages.py | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/r2/r2/lib/pages/trafficpages.py b/r2/r2/lib/pages/trafficpages.py index 2af363833..c592bc397 100644 --- a/r2/r2/lib/pages/trafficpages.py +++ b/r2/r2/lib/pages/trafficpages.py @@ -458,19 +458,7 @@ def get_traffic_dates(thing): """Retrieve the start and end of a Promoted Link or PromoCampaign.""" now = datetime.datetime.now(g.tz).replace(minute=0, second=0, microsecond=0) - - if isinstance(thing, Link): - start, end = promote.get_total_run(thing) - start, end = start.replace(tzinfo=g.tz), end.replace(tzinfo=g.tz) - elif isinstance(thing, PromoCampaign): - # PromoCampaigns store their dates as UTC, promote changes occur - # at UTC-5 - promo_tz = pytz.timezone("US/Eastern") - start = (thing.start_date.replace(tzinfo=promo_tz) - .astimezone(pytz.utc)) - end = (thing.end_date.replace(tzinfo=promo_tz) - .astimezone(pytz.utc)) - + start, end = promote.get_total_run(thing) end = min(now, end) return start, end