Skip to content
This repository was archived by the owner on Jun 16, 2018. It is now read-only.

Commit 2d05080

Browse files
committed
Removed 2012 hacks from TopOfTicket class __init__
1 parent 8b2534c commit 2d05080

1 file changed

Lines changed: 5 additions & 16 deletions

File tree

elections/ap.py

Lines changed: 5 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -778,23 +778,12 @@ class TopOfTicket(BaseAPResultCollection):
778778
"""
779779
ap_number_template = '%(number)s-%(state)s'
780780

781-
def __init__(self, client, name='20121106', results=True, delegates=False):
781+
def __init__(self, client, name='20141104', results=True, delegates=False):
782782
d = {'name': name}
783-
# This means you're in a primary election with delegates at stake
784-
if name and name != '20121106':
785-
self.results_file_path = \
786-
"/Delegate_Tracking/US/flat/US_%(name)s.txt" % d
787-
self.delegates_file_path = \
788-
"/Delegate_Tracking/US/flat/US_%(name)s_d.txt" % d
789-
self.race_file_path = "/inits/US/US_%(name)s_race.txt" % d
790-
self.reporting_unit_file_path = "/inits/US/US_%(name)s_ru.txt" % d
791-
self.candidate_file_path = "/inits/US/US_%(name)s_pol.txt" % d
792-
# Otherwise we're on to general election 2012 as the default
793-
else:
794-
self.results_file_path = "/US_topofticket/flat/US.txt"
795-
self.race_file_path = "/inits/US/US_%(name)s_race.txt" % d
796-
self.reporting_unit_file_path = "/inits/US/US_%(name)s_ru.txt" % d
797-
self.candidate_file_path = "/inits/US/US_%(name)s_pol.txt" % d
783+
self.results_file_path = "/US_topofticket/flat/US.txt"
784+
self.race_file_path = "/inits/US/US_%(name)s_race.txt" % d
785+
self.reporting_unit_file_path = "/inits/US/US_%(name)s_ru.txt" % d
786+
self.candidate_file_path = "/inits/US/US_%(name)s_pol.txt" % d
798787
super(TopOfTicket, self).__init__(client, name, results, delegates)
799788

800789
@property

0 commit comments

Comments
 (0)