PPE8 all the things

PEP8 makefile target didn't get the Python files in submodules.  Fix it,
then fix the PEP8 problems.

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

Author: dgibson

Makefile

@@ -6,7 +6,18 @@ NOSEFLAGS = --with-coverage --cover-package=smadata2
 
 SCRIPTS = sma2-explore sma2mon \
 	sma2-upload-to-pvoutputorg sma2-push-daily-to-pvoutput
-PYFILES = $(SCRIPTS) $(wildcard smadata2/*.py)
+
+SMADATA2_PYFILES = check.py config.py datetimeutil.py download.py \
+	__init__.py pvoutputorg.py pvoutputuploader.py sma2mon.py \
+	upload.py \
+	test_config.py test_datetimeutil.py test_upload.py
+
+DB_PYFILES = base.py __init__.py mock.py sqlite.py tests.py
+INVERTER_PYFILES = base.py __init__.py mock.py smabluetooth.py
+
+PYFILES = $(SCRIPTS) $(SMADATA2_PYFILES:%=smadata2/%) \
+	$(DB_PYFILES:%=smadata2/db/%) \
+	$(INVERTER_PYFILES:%=smadata2/inverter/%)
 
 all: check
 

smadata2/db/mock.py

@@ -21,6 +21,7 @@
 
 from base import BaseDatabase
 
+
 class MockDatabase(BaseDatabase):
     def __init__(self):
         super(MockDatabase, self).__init__()

smadata2/db/sqlite.py

@@ -31,6 +31,7 @@
 
 _whitespace = re.compile('\s+')
 
+
 def squash_schema(sqls):
     l = []
     for sql in sqls:
@@ -47,12 +48,13 @@ def sqlite_schema(conn):
 
 class SQLiteDatabase(BaseDatabase):
     DDL = [
-"""CREATE TABLE generation (inverter_serial INTEGER,
-                            timestamp INTEGER,
-                            total_yield INTEGER,
-                            PRIMARY KEY (inverter_serial, timestamp))""",
-"""CREATE TABLE pvoutput (sid STRING,
-                          last_datetime_uploaded INTEGER)""",
+        """CREATE TABLE generation (inverter_serial INTEGER,
+                                    timestamp INTEGER,
+                                    total_yield INTEGER,
+                                    PRIMARY KEY (inverter_serial,
+                                                 timestamp))""",
+        """CREATE TABLE pvoutput (sid STRING,
+                                  last_datetime_uploaded INTEGER)""",
     ]
 
     def __init__(self, filename):
@@ -69,9 +71,9 @@ def commit(self):
 
     def add_historic(self, serial, timestamp, total_yield):
         c = self.conn.cursor()
-        c.execute("INSERT INTO generation"
-                  + " (inverter_serial, timestamp, total_yield)"
-                  + " VALUES (?, ?, ?);",
+        c.execute("INSERT INTO generation" +
+                  " (inverter_serial, timestamp, total_yield)" +
+                  " VALUES (?, ?, ?);",
                   (serial, timestamp, total_yield))
 
     def get_one_historic(self, serial, timestamp):
@@ -104,11 +106,12 @@ def get_aggregate_one_historic(self, ts, ids):
 
     def get_aggregate_historic(self, from_ts, to_ts, ids):
         c = self.conn.cursor()
-        c.execute("SELECT timestamp, sum(total_yield) FROM generation"
-                  " WHERE inverter_serial IN (" + ",".join("?" * len(ids)) + ")"
-                  + " AND timestamp >= ? AND timestamp < ?"
-                  + " GROUP BY timestamp ORDER BY timestamp ASC",
-                  tuple(ids) + (from_ts, to_ts))
+        template = ("SELECT timestamp, sum(total_yield) FROM generation" +
+                    " WHERE inverter_serial IN (" +
+                    ",".join("?" * len(ids)) +
+                    ") AND timestamp >= ? AND timestamp < ?" +
+                    " GROUP BY timestamp ORDER BY timestamp ASC")
+        c.execute(template, tuple(ids) + (from_ts, to_ts))
         return c.fetchall()
 
     # return midnights for each day in the database
@@ -117,11 +120,12 @@ def get_aggregate_historic(self, from_ts, to_ts, ids):
     def midnights(self, inverters):
         c = self.conn.cursor()
         serials = ','.join(x.serial for x in inverters)
-        c.execute("SELECT distinct(timestamp) "
-                  "FROM generation "
-                  "WHERE inverter_serial  in ( ? ) "
-                  "AND timestamp % 86400 = 0 "
-                  "ORDER BY timestamp ASC", (serials,))
+        template = """SELECT distinct(timestamp)
+        FROM generation
+        WHERE inverter_serial  in ( ? )
+        AND timestamp % 86400 = 0
+        ORDER BY timestamp ASC"""
+        c.execute(template, (serials,))
         r = c.fetchall()
         r = map(lambda x: datetime.datetime.utcfromtimestamp(x[0]), r)
         return r
@@ -221,11 +225,11 @@ def create_from_empty(conn):
 
 
 SCHEMA_NOPVO = squash_schema((
-"""CREATE TABLE generation (inverter_serial INTEGER,
-                            timestamp INTEGER,
-                            total_yield INTEGER,
-                            PRIMARY KEY (inverter_serial, timestamp))""",
-"""CREATE TABLE schema (magic INTEGER, version INTEGER)"""))
+    """CREATE TABLE generation (inverter_serial INTEGER,
+                                timestamp INTEGER,
+                                total_yield INTEGER,
+                                PRIMARY KEY (inverter_serial, timestamp))""",
+    """CREATE TABLE schema (magic INTEGER, version INTEGER)"""))
 
 
 def update_nopvo(conn):
@@ -236,13 +240,13 @@ def update_nopvo(conn):
 
 
 SCHEMA_V0 = squash_schema((
-"""CREATE TABLE generation (inverter_serial INTEGER,
-                            timestamp INTEGER,
-                            total_yield INTEGER,
-                            PRIMARY KEY (inverter_serial, timestamp))""",
-"""CREATE TABLE schema (magic INTEGER, version INTEGER)""",
-"""CREATE TABLE pvoutput (sid STRING,
-                          last_datetime_uploaded INTEGER)"""))
+    """CREATE TABLE generation (inverter_serial INTEGER,
+                                timestamp INTEGER,
+                                total_yield INTEGER,
+                                PRIMARY KEY (inverter_serial, timestamp))""",
+    """CREATE TABLE schema (magic INTEGER, version INTEGER)""",
+    """CREATE TABLE pvoutput (sid STRING,
+                              last_datetime_uploaded INTEGER)"""))
 
 
 def update_v0(conn):
@@ -258,6 +262,7 @@ def update_v0(conn):
     SCHEMA_NOPVO: update_nopvo,
 }
 
+
 def try_open(filename):
     try:
         db = SQLiteDatabase(filename)

smadata2/db/tests.py

@@ -14,6 +14,7 @@
 import smadata2.db.mock
 from smadata2 import check
 
+
 def removef(filename):
     try:
         os.remove(filename)
@@ -229,7 +230,6 @@ def prepopulate(self):
                      (DB_MAGIC, DB_VERSION))
         conn.commit()
 
-
         conn.execute("""INSERT INTO generation (inverter_serial, timestamp,
                                                  total_yield)
                             VALUES (?, ?, ?)""", self.PRESERVE_RECORD)
@@ -256,7 +256,6 @@ def prepopulate(self):
                      (DB_MAGIC, DB_VERSION))
         conn.commit()
 
-
         conn.execute("""INSERT INTO generation (inverter_serial, timestamp,
                                                  total_yield)
                             VALUES (?, ?, ?)""", self.PRESERVE_RECORD)

smadata2/inverter/__init__.py

@@ -20,4 +20,3 @@
 from __future__ import print_function
 
 from base import *
-

smadata2/inverter/smabluetooth.py

@@ -202,9 +202,9 @@ def rx_raw(self, pkt):
         self.rx_outer(from_, to_, type_, payload)
 
     def rxfilter_outer(self, to_):
-        return ((to_ == self.local_addr)
-                or (to_ == self.BROADCAST)
-                or (to_ == "00:00:00:00:00:00"))
+        return ((to_ == self.local_addr) or
+                (to_ == self.BROADCAST) or
+                (to_ == "00:00:00:00:00:00"))
 
     @waiter
     def rx_outer(self, from_, to_, type_, payload):
@@ -284,8 +284,8 @@ def rx_ppp(self, from_, protocol, payload):
                          response, error, pktcount, first)
 
     def rxfilter_6560(self, to2):
-        return ((to2 == self.local_addr2)
-                or (to2 == self.BROADCAST2))
+        return ((to2 == self.local_addr2) or
+                (to2 == self.BROADCAST2))
 
     @waiter
     def rx_6560(self, from2, to2, a2, b1, b2, c1, c2, tag,
@@ -338,8 +338,8 @@ def tx_6560(self, from2, to2, a2, b1, b2, c1, c2, tag,
                 type_, subtype, arg1, arg2, extra=bytearray(),
                 response=False, error=0, pktcount=0, first=True):
         if len(extra) % 4 != 0:
-            raise Error("Inner protocol payloads must"
-                        + "have multiple of 4 bytes length")
+            raise Error("Inner protocol payloads must" +
+                        " have multiple of 4 bytes length")
         innerlen = (len(extra) + INNER_HLEN) // 4
         payload = bytearray()
         payload.append(innerlen)
@@ -429,8 +429,7 @@ def wait(self, class_, cond=None):
 
     def wait_outer(self, wtype, wpl=bytearray()):
         def wfn(from_, to_, type_, payload):
-            if ((type_ == wtype)
-                    and payload.startswith(wpl)):
+            if ((type_ == wtype) and payload.startswith(wpl)):
                 return payload
         return self.wait('outer', wfn)
 
@@ -479,8 +478,8 @@ def multiwait_6560(from2, to2, a2, b1, b2, c1, c2, tag,
 
     def hello(self):
         hellopkt = self.wait_outer(OTYPE_HELLO)
-        if hellopkt != bytearray('\x00\x04\x70\x00\x01\x00\x00\x00'
-                                 + '\x00\x01\x00\x00\x00'):
+        if hellopkt != bytearray('\x00\x04\x70\x00\x01\x00\x00\x00' +
+                                 '\x00\x01\x00\x00\x00'):
             raise Error("Unexpected HELLO %r" % hellopkt)
         self.tx_outer("00:00:00:00:00:00", self.remote_addr,
                       OTYPE_HELLO, hellopkt)