From b3bfbdfc0ae7ada0bdbc90d48646e5e1db349c00 Mon Sep 17 00:00:00 2001
From: palewire <ben.welsh@gmail.com>
Date: Sat, 15 Jul 2017 22:49:12 -0700
Subject: [PATCH] Slight trims

---
 .../management/commands/loadballotmeasurecontests.py          | 4 ++--
 .../management/commands/loadretentioncontests.py              | 3 +++
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/calaccess_processed/management/commands/loadballotmeasurecontests.py b/calaccess_processed/management/commands/loadballotmeasurecontests.py
index 52d52b50..428a532f 100644
--- a/calaccess_processed/management/commands/loadballotmeasurecontests.py
+++ b/calaccess_processed/management/commands/loadballotmeasurecontests.py
@@ -45,6 +45,7 @@ def get_scraped_props(self, scraped_elec):
 
         Return QuerySet.
         """
+        # Recalls are being excluded so they can be loaded in a separate command.
         return scraped_elec.propositions.exclude(name__icontains='RECALL')
 
     def get_or_create_election(self, scraped_elec):
@@ -110,13 +111,12 @@ def create_contest(self, scraped_prop, ocd_elec):
         else:
             classification = 'ballot measure'
         # Create the object
-        ocd_contest = BallotMeasureContest.objects.create(
+        return BallotMeasureContest.objects.create(
             election=ocd_elec,
             division=self.state_division,
             name=scraped_prop.name,
             classification=classification,
         )
-        return ocd_contest
 
     def load(self):
         """
diff --git a/calaccess_processed/management/commands/loadretentioncontests.py b/calaccess_processed/management/commands/loadretentioncontests.py
index 337ec779..eff3edd8 100644
--- a/calaccess_processed/management/commands/loadretentioncontests.py
+++ b/calaccess_processed/management/commands/loadretentioncontests.py
@@ -63,12 +63,14 @@ def create_contest(self, scraped_prop, ocd_elec):
                 raise Exception(
                     "Unknown Incumbent in %s." % scraped_prop.name
                 )
+
         # get or create person and post objects
         person = self.get_or_create_person(
             incumbent.name,
             filer_id=incumbent.scraped_id,
         )[0]
         post = self.get_or_create_post(incumbent.office_name)[0]
+
         # get or create membership object
         membership = Membership.objects.get_or_create(
             person=person,
@@ -77,6 +79,7 @@ def create_contest(self, scraped_prop, ocd_elec):
             organization=post.organization,
             person_name=person.sort_name,
         )[0]
+
         # set the start_date and end_date for Governor Gray Davis
         if scraped_prop.name == '2003 RECALL QUESTION':
             membership.start_date = '1999'