Flake8 all the things

Now that submodules are added to the flake8 target, fix the many errors it
spots.

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

Author: dgibson

smadata2/db/__init__.py

@@ -19,5 +19,5 @@
 
 from __future__ import print_function
 
-from base import *
-from sqlite import *
+from .base import WrongSchema
+from .sqlite import SQLiteDatabase

smadata2/db/sqlite.py

@@ -19,24 +19,25 @@
 
 from __future__ import print_function
 
-import os
 import shutil
 import re
 import sqlite3
+import time
+import datetime
 
-from base import *
+from base import BaseDatabase, WrongSchema
 
 
 all = ['SQLiteDatabase']
 
-_whitespace = re.compile('\s+')
+_whitespace = re.compile('\\s+')
 
 
 def squash_schema(sqls):
-    l = []
+    tmp = []
     for sql in sqls:
-        l.append(_whitespace.sub(' ', sql.strip()))
-    return frozenset(l)
+        tmp.append(_whitespace.sub(' ', sql.strip()))
+    return frozenset(tmp)
 
 
 def sqlite_schema(conn):

smadata2/db/tests.py

@@ -2,13 +2,12 @@
 
 from __future__ import print_function
 
-import StringIO
 import os
 import os.path
 import errno
 import sqlite3
 
-from nose.tools import *
+from nose.tools import assert_equals, raises
 
 import smadata2.db
 import smadata2.db.mock
@@ -199,7 +198,7 @@ def test_aggregate(self):
 #
 # Tests for sqlite schema updating
 #
-class UpdateSQLiteChecker(Test_SimpleChecks_SQLiteDBChecker):
+class UpdateSQLiteChecker(SQLiteDBChecker):
     PRESERVE_RECORD = ("PRESERVE", 0, 31415)
 
     def test_backup(self):
@@ -291,4 +290,4 @@ def prepopulate(self):
 
     @raises(smadata2.db.WrongSchema)
     def test_update(self):
-        db = smadata2.db.sqlite.create_or_update(self.dbname)
+        smadata2.db.sqlite.create_or_update(self.dbname)

smadata2/inverter/__init__.py

@@ -18,5 +18,3 @@
 # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
 from __future__ import print_function
-
-from base import *

smadata2/inverter/mock.py

@@ -33,10 +33,10 @@ def daily_yield(self):
         return 0
 
     def historic(self, fromtime, totime):
-        l = []
+        tmp = []
         for timestamp in range(fromtime, totime, 5*60):
-            l.append((timestamp, 0))
-        return l
+            tmp.append((timestamp, 0))
+        return tmp
 
     def historic_daily(self, fromtime, totime):
-        raise NotImplemented
+        raise NotImplementedError

smadata2/inverter/smabluetooth.py

@@ -25,9 +25,9 @@
 import time
 
 import bluetooth
-import readline
 
 import base
+from base import Error
 from smadata2.datetimeutil import format_time
 
 __all__ = ['Connection',
@@ -420,7 +420,6 @@ def tx_historic_daily(self, fromtime, totime):
 
     def wait(self, class_, cond=None):
         self.waitvar = None
-        fn = getattr(self, 'rx_' + class_)
         setattr(self, '__waitcond_rx_' + class_, cond)
         while self.waitvar is None:
             self.rx()
@@ -546,7 +545,7 @@ def historic_daily(self, fromtime, totime):
         return points
 
     def set_time(self, newtime, tzoffset):
-        tag = self.tx_set_time(newtime, tzoffset)
+        self.tx_set_time(newtime, tzoffset)
 
 
 def ptime(str):