From cc5551afe46185e60657130a681fcbf567a83a61 Mon Sep 17 00:00:00 2001 From: Python3pkg Date: Sun, 21 May 2017 05:33:38 -0700 Subject: [PATCH] Convert to Python3 --- dbwrapper/db.py | 8 ++++---- tests/test.py | 10 +++++----- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dbwrapper/db.py b/dbwrapper/db.py index 7e3bb33..842c152 100644 --- a/dbwrapper/db.py +++ b/dbwrapper/db.py @@ -8,7 +8,7 @@ This module contains a simple thread-safe wrapper for a sqlite3 database. """ import logging -import Queue +import queue import sqlite3 import threading import time @@ -29,7 +29,7 @@ def __init__(self, filename=":memory:", logger=None, log_level=logging.INFO): """ super(DBWrapper, self).__init__() self._filename = filename - self._queue = Queue.Queue() + self._queue = queue.Queue() self._stopped = threading.Event() self._n = 0 #initialize logging @@ -73,7 +73,7 @@ def run(self): try: for row in cursor.execute(cmd, params): res.append(row) - except sqlite3.Error, e: + except sqlite3.Error as e: self._logger.error("Database error: '%s'." % e.args[0]) q.put(res) @@ -104,7 +104,7 @@ def execute(self, cmd, params=tuple()): n = self._n start = time.time() if not self._stopped.isSet(): - q = Queue.Queue() + q = queue.Queue() self._queue.put((cmd, params, q)) res = q.get() dur = time.time() - start diff --git a/tests/test.py b/tests/test.py index 7f86354..5ffe52d 100644 --- a/tests/test.py +++ b/tests/test.py @@ -10,13 +10,13 @@ def run_test(): def test_create_table(db): tables = db.get_tables() - print tables + print(tables) if not "test" in tables: db.execute("CREATE TABLE test (id TEXT, value TEXT)") tables = db.get_tables() - print tables + print(tables) def test_insert(db): for i in range(0, 1000): @@ -25,17 +25,17 @@ def test_insert(db): def test_select(db): result = db.execute("SELECT id, value FROM test") for row in result: - print "%s: %s" % (row["id"], row["value"]) + print("%s: %s" % (row["id"], row["value"])) def test_drop_table(db): tables = db.get_tables() - print tables + print(tables) if "test" in tables: db.execute("DROP TABLE test") tables = db.get_tables() - print tables + print(tables) if __name__ == "__main__": run_test()