From a1d0c7fd97eae01a03f95bba32171fcbc2439ff7 Mon Sep 17 00:00:00 2001 From: Klaus-Uwe Mitterer Date: Wed, 22 Apr 2015 00:21:16 +0200 Subject: [PATCH] Simplify dbHelper --- tools.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/tools.py b/tools.py index 67b5b1e..056aa84 100644 --- a/tools.py +++ b/tools.py @@ -31,19 +31,19 @@ class dbObject: return False -def dbCheck(path): - if dbInitialized(path): +def dbCheck(db): + if dbInitialized(db): return True raise ValueError("Provided database file " + path + " is not initialized. Create it using makedb.py or csvdb.py") def dbHelper(path): - dbCheck(path) - return dbObject(path) - - -def dbInitialized(path): db = dbObject(path) + dbCheck(db) + return db + + +def dbInitialized(db): return db.isInitialized()