diff --git a/src/bmconfigparser.py b/src/bmconfigparser.py index 9bd612fc..cd826bb4 100644 --- a/src/bmconfigparser.py +++ b/src/bmconfigparser.py @@ -2,13 +2,7 @@ BMConfigParser class definition and default configuration settings """ -# import ConfigParser -try: - from configparser import ConfigParser -except ImportError: - import ConfigParser - - +import ConfigParser import os import shutil from datetime import datetime diff --git a/src/tests/test_sqlthread.py b/src/tests/test_sqlthread.py index 1e92bb51..59e0154a 100644 --- a/src/tests/test_sqlthread.py +++ b/src/tests/test_sqlthread.py @@ -198,7 +198,7 @@ class TestSqlThread(unittest.TestCase): # Assertion self.cur.execute('''select * from inventory where objecttype = 'pubkey';''') - self.assertNotEqual(self.cur.fetchone(), 1, "Table knownnodes not deleted in versioning 5") + self.assertNotEqual(self.cur.fetchone(), 1, "Table inventory not deleted in versioning 4") def test_sql_thread_version_3(self): """ @@ -214,4 +214,4 @@ class TestSqlThread(unittest.TestCase): # Assertion self.cur.execute(''' SELECT count(name) FROM sqlite_master WHERE type='table' AND name='inventory_backup' ''') - self.assertNotEqual(self.cur.fetchone(), 1, "Table inventory_backup not deleted in versioning 5") + self.assertNotEqual(self.cur.fetchone(), 1, "Table inventory_backup not deleted in versioning 2")