Flake8 cleanups

Many of these look like real bugs

Signed-off-by: David Gibson <[email protected]>

Author: dgibson

Makefile

@@ -1,5 +1,6 @@
 NOSE = nosetests
 PEP8 = pep8
+FLAKE8 = flake8-2
 
 NOSEFLAGS = --with-coverage --cover-package=smadata2
 
@@ -18,6 +19,9 @@ checkall:
 pep8:
 	$(PEP8) $(PYFILES)
 
+flake8:
+	$(FLAKE8) $(PYFILES)
+
 clean:
 	rm -f *~ *.pyc
 	rm -f smadata2/*~ smadata2/*.pyc

sma2-explore

@@ -25,7 +25,10 @@ import signal
 import readline
 import time
 
-from smadata2.inverter.smabluetooth import *
+from smadata2.inverter.smabluetooth import Connection
+from smadata2.inverter.smabluetooth import OTYPE_HELLO, OTYPE_ERROR, \
+    OTYPE_VARVAL, OTYPE_GETVAR, OTYPE_PPP, OTYPE_PPP2, OVAR_SIGNAL
+from smadata2.inverter.smabluetooth import bytes2int, int2bytes16
 
 
 class Quit(Exception):
@@ -250,7 +253,7 @@ class SMAData2CLI(Connection):
         self.tx_ppp("ff:ff:ff:ff:ff:ff", protocol, payload)
 
     def cmd_send2(self, *args):
-        bi = [int(x, 16) for x in args]
+        bb = [int(x, 16) for x in args]
         a2 = bb[0]
         b1, b2 = bb[1], bb[2]
         c1, c2 = bb[3], bb[4]

sma2-upload-to-pvoutputorg

@@ -21,9 +21,7 @@ from __future__ import print_function
 
 import argparse
 import datetime
-from datetime import date
 import sys
-import time
 
 import smadata2.protocol
 import smadata2.config
@@ -119,7 +117,7 @@ class sidType():
                 self.system = system
                 break
         if self.system is None:
-            fatal("sid not found")
+            raise "sid not found"
 
     def __call__(self):
         print("__called__ called on datetimeType?!")

smadata2/config.py

@@ -21,8 +21,6 @@
 
 import sys
 import os
-import time
-import calendar
 import dateutil.parser
 import dateutil.tz
 import json

smadata2/pvoutputuploader.py

@@ -1,9 +1,6 @@
 import time
 import datetime
 
-import upload
-import datetimeutil
-
 
 class PVOutputUploader(object):
     def __init__(self, db, system, pvoutput):
@@ -23,7 +20,6 @@ def setVerbose(self, verbose):
     # @fixme move this batching into pvoutput
     def send_production(self, entries):
         batch = []
-        last_total_production = -1		# unlikely...
 
         too_old_in_days = self.pvoutput.days_ago_accepted_by_api()
 
@@ -45,8 +41,6 @@ def send_production(self, entries):
             dt = datetime.datetime.fromtimestamp(timestamp)
             batch.append([dt, total_production])
 
-            last_total_production = total_production
-
             if len(batch) == self.pvoutput.batchstatus_count_accepted_by_api():
                 if havesent:
                     # if we do *not* wait, other requests can get served
@@ -134,16 +128,17 @@ def upload_unuploaded_statuses(self):
     # @param day day to upload for
     # @note The day *must be over* for this not to screw you over.
     # @note no way to tell if all inverters have reported in....
-    def upload_statuses_for_day(self, day):
-        date = day.date()
-        ts_start, ts_end = datetimeutil.day_timestamps(date,
-                                                       self.system.timezone())
-        ids = [i.serial for i in self.system.inverters()]
-
-        entries = db.get_aggregate_historic(ts_start, ts_end, ids)
-        entries = prepare_data_for_date(date, results, sc.timezone())
-
-        self.send_production(entries)
+    # def upload_statuses_for_day(self, day):
+    #     date = day.date()
+    #     ts_start, ts_end = datetimeutil.day_timestamps(date,
+    #                                                    self.system.timezone())
+    #     ids = [i.serial for i in self.system.inverters()]
+    #
+    #     entries = db.get_aggregate_historic(ts_start, ts_end, ids)
+    #     entries = prepare_data_for_date(date, entries,
+    #                                     self.system.timezone())
+    #
+    #     self.send_production(entries)
 
     # print out a message only if we're verbose
     def debug(self, message):
@@ -276,7 +271,7 @@ def do_date(self, date, fix):
             print(" upload data for a specific date (%s)" % date)
             day = self.pvoutput.parse_date_and_time(date, "00:00")
             self.upload_statuses_for_day(day)
-            sleep(20)  # so the reconcile works....
+            time.sleep(20)  # so the reconcile works....
 
         if True:
             print("reconciling specific date (%s)" % date)

smadata2/sma2mon.py

@@ -21,7 +21,6 @@
 
 import sys
 import argparse
-import time
 import os.path
 import datetime
 import dateutil.parser

smadata2/test_config.py

@@ -2,12 +2,11 @@
 
 import StringIO
 import os.path
-import unittest
 import time
 import datetime
 import dateutil.tz
 
-from nose.tools import *
+from nose.tools import assert_equals
 
 import smadata2.config
 
@@ -144,7 +143,6 @@ def test_inv(self):
         assert_equals(inv.name, "Test Inverter")
         assert_equals(inv.bdaddr, "aa:bb:cc:dd:ee:ff")
         assert_equals(inv.serial, "TESTSERIAL")
-        xtime = time.mktime(datetime.datetime(2000, 1, 1).timetuple())
         assert inv.starttime is None
         assert isinstance(str(inv), str)
 

smadata2/test_datetimeutil.py

@@ -1,13 +1,9 @@
 #! /usr/bin/env python
 
-import StringIO
-import os.path
-import unittest
-import time
 import datetime
 import dateutil.tz
 
-from nose.tools import *
+from nose.tools import assert_equals, raises
 
 import smadata2.datetimeutil
 
@@ -45,7 +41,7 @@ def test_daytimestamps_dstend():
     assert_equals(tst, (1396702800, 1396702800 + 25*60*60))
 
 
-def test_daytimestamps_dstend():
+def test_daytimestamps_dstbegin():
     d = datetime.date(2014, 10, 5)
     tz = dateutil.tz.gettz("Australia/Sydney")
     tst = smadata2.datetimeutil.day_timestamps(d, tz)

smadata2/test_pvoutputorg.py

@@ -5,7 +5,7 @@
 import time
 import dateutil
 
-from nose.tools import *
+from nose.tools import assert_equals
 from nose.plugins.attrib import attr
 
 import smadata2.config
@@ -125,7 +125,7 @@ def test_addsingle(self):
         self.delay()
 
         results = self.api.getstatus(self.date)
-        assert_equal(results, [(dt0, 0), (dt1, 7)])
+        assert_equals(results, [(dt0, 0), (dt1, 7)])
 
     def test_addbatch(self):
         dt0 = datetime.datetime.combine(self.date, datetime.time(10, 0, 0))

smadata2/test_sma2mon.py

@@ -2,8 +2,6 @@
 
 import argparse
 
-from nose.tools import *
-
 import smadata2.sma2mon