Fix most flake8 errors

Author: maclover7

elex/api/delegates.py

@@ -203,13 +203,10 @@ def get_report_id(self, reports, key):
         """
 
         for report in reports:
-            if (
-                key == 'delSum' and
-                report.get('title') == 'Delegates / delsum'
-            ) or (
-                key == 'delSuper' and
-                report.get('title') == 'Delegates / delsuper'
-            ):
+            delsum = key == 'delSum' and report.get('title') == 'Delegates / delsum'
+            delsuper = key == 'delSuper' and report.get('title') == 'Delegates / delsuper'
+
+            if delsum or delsuper:
                 id = report.get('id').rsplit('/', 1)[-1]
                 return id
 

elex/api/models.py

@@ -894,7 +894,7 @@ def set_id_field(self):
         self.id = self.electiondate
 
     def get(self, path, **params):
-        """
+        r"""
         Farms out request to api_request.
         Could possibly handle choosing which
         parser backend to use -- API-only right now.
@@ -947,7 +947,7 @@ def get_uniques(self, candidate_reporting_units):
         return candidates, ballot_measures
 
     def get_raw_races(self, **params):
-        """
+        r"""
         Convenience method for fetching races by election date.
         Accepts an AP formatting date string, e.g., YYYY-MM-DD.
         Accepts any number of URL params as kwargs.

elex/api/trends.py

@@ -105,10 +105,7 @@ def get_report_id(self, reports, key):
         organization-specific report ID.
         """
         for report in reports:
-            if (
-                key == self.office_code and
-                report.get('title') in [self.api_report_id, self.api_test_report_id]
-            ):
+            if (key == self.office_code and report.get('title') in [self.api_report_id, self.api_test_report_id]):
                 id = report.get('id').rsplit('/', 1)[-1]
                 return id
         return None

elex/api/utils.py

@@ -69,7 +69,7 @@ def write_recording(payload):
 
 
 def api_request(path, **params):
-    """
+    r"""
     Function wrapping Python-requests
     for making a request to the AP's
     elections API.

elex/cli/app.py

@@ -360,10 +360,7 @@ def delegates(self):
 
         """
         self.app.log.info('Getting delegate reports')
-        if (
-            self.app.pargs.delegate_super_file and
-            self.app.pargs.delegate_sum_file
-        ):
+        if (self.app.pargs.delegate_super_file and self.app.pargs.delegate_sum_file):
             report = DelegateReport(
                 delsuper_datafile=self.app.pargs.delegate_super_file,
                 delsum_datafile=self.app.pargs.delegate_sum_file

elex/cli/decorators.py

@@ -57,7 +57,7 @@ def decorated(self):
             self.app.log.error('HTTP Error {0} - {1}'.format(e.response.status_code, message))
             self.app.log.debug('HTTP Error {0} ({1})'.format(e.response.status_code, e.response.url))
             self.app.close(1)
-        except APAPIKeyException as e:
+        except APAPIKeyException:
             text = 'APAPIKeyError: AP_API_KEY environment variable is not set.'
             self.app.log.error(text)
             self.app.close(1)

elex/cli/hooks.py

@@ -38,7 +38,8 @@ def add_election_hook(app):
             app.close(1)
         else:
             app.election.officeids = app.pargs.officeids
-            # kept as a comma-delimited string so officeID as a param always appears once in request url (e.g. officeID=P%2CH%2CG)
+            # kept as a comma-delimited string so officeID as a param always appears once in request url
+            # (e.g. officeID=P%2CH%2CG)
 
 
 def cachecontrol_logging_hook(app):

setup.cfg

@@ -2,7 +2,7 @@
 universal = 1
 
 [flake8]
-max-line-length = 119
+max-line-length = 135
 ignore = E731
 
 [metadata]

tests/test_ap_network.py

@@ -1,6 +1,5 @@
 import os
 import unittest
-import tests
 
 from elex.cli.app import ElexApp
 from requests.exceptions import HTTPError

tests/test_candidate_reporting_unit.py

@@ -135,10 +135,7 @@ def test_candidate_reporting_unit_sums_reportingunit_pct(self):
         reporting_unit = self.reporting_units[0]
         candidate_reporting_units = self.candidate_reporting_units[0:2]
         self.assertEqual(
-            (
-                candidate_reporting_units[0].votecount /
-                float(reporting_unit.votecount)
-            ),
+            (candidate_reporting_units[0].votecount / float(reporting_unit.votecount)),
             0.694266390666554
         )