From efbabbafa3b6edf8a9bbe7dbd0199ced06f86001 Mon Sep 17 00:00:00 2001 From: mdipierro Date: Thu, 30 Aug 2012 20:24:56 -0500 Subject: [PATCH] fixed 'fdb' is not defined issue, thanks villas --- VERSION | 2 +- gluon/dal.py | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/VERSION b/VERSION index f61853e6..9c0e3b1d 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -Version 2.0.3 (2012-08-30 20:18:58) stable +Version 2.0.3 (2012-08-30 20:24:53) stable diff --git a/gluon/dal.py b/gluon/dal.py index 6e01073f..73559108 100644 --- a/gluon/dal.py +++ b/gluon/dal.py @@ -3196,7 +3196,7 @@ class FireBirdAdapter(BaseAdapter): def __init__(self,db,uri,pool_size=0,folder=None,db_codec ='UTF-8', credential_decoder=IDENTITY, driver_args={}, - adapter_args={}): + adapter_args={}): if 'driver_name' in adapter_args: if adapter_args['driver_name'] == 'fdb': self.driver = fdb @@ -3204,8 +3204,12 @@ class FireBirdAdapter(BaseAdapter): self.driver = firebirdsql elif adapter_args['driver_name'] == 'kinterbasdb': self.driver = kinterbasdb - else: + elif 'fdb' in globals(): self.driver = fdb + elif 'kinterbasdb' in globals(): + self.driver = kinterbasdb + else: + raise RuntimeError, "no fdb and no kinterbasdb driver found" if not self.driver: raise RuntimeError, "Unable to import driver"