Fix uncaught exception in db.py
Don't use file or type as variable names
Signed-off-by: Martin Bligh <mbligh@google.com>
git-svn-id: http://test.kernel.org/svn/autotest/trunk@1044 592f7852-d20e-0410-864c-8624ca9c26a4
diff --git a/tko/db.py b/tko/db.py
index 1954324..cece69a 100644
--- a/tko/db.py
+++ b/tko/db.py
@@ -299,18 +299,20 @@
# Use a class method as a class factory, generating a relevant database object.
def db(*args, **dargs):
path = os.path.dirname(os.path.abspath(sys.argv[0]))
- type = None
+ db_type = None
try:
- file = os.path.join(path, '.database')
- db_prefs = open(file, 'r')
+ db_file = os.path.join(path, '.database')
+ db_prefs = open(db_file, 'r')
host = db_prefs.readline().rstrip()
database = db_prefs.readline().rstrip()
- type = db_prefs.readline().rstrip()
- finally:
- if not type:
- type = 'mysql'
+ db_type = db_prefs.readline().rstrip()
+ except:
+ pass
- type = 'db_' + type
- exec 'import %s; db = %s.%s(*args, **dargs)' % (type, type, type)
+ if not db_type:
+ db_type = 'mysql'
+
+ db_type = 'db_' + db_type
+ exec 'import %s; db = %s.%s(*args, **dargs)' % (db_type, db_type, db_type)
return db