Skip to content

Convert to Python3 #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ralic wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Convert to Python3 #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions dbwrapper/db.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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
Expand Down
10 changes: 5 additions & 5 deletions tests/test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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):
Expand All @@ -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()