From d9a120a2c62e5b3c9c01aff88bc636b6f43e1e1c Mon Sep 17 00:00:00 2001 From: fpdb-mme Date: Mon, 2 Nov 2009 08:48:07 +0100 Subject: [PATCH] removed superfluous try ..except clause. Database.__init__() was not doing any sanity checks, so the try ..except clause was only covering exceptions we are actually interested in --- pyfpdb/Configuration.py | 25 +++++++++++-------------- 1 file changed, 11 insertions(+), 14 deletions(-) diff --git a/pyfpdb/Configuration.py b/pyfpdb/Configuration.py index 85aa392b..58a249ff 100755 --- a/pyfpdb/Configuration.py +++ b/pyfpdb/Configuration.py @@ -391,20 +391,17 @@ class Config: #TODO: do we want to take all tags or all tags contained in # ..this may break stuff for some users. so leave it unchanged for now untill there is a decission for db_node in doc.getElementsByTagName("database"): - try: - db = Database(node = db_node) - except: - raise FpdbError("Unable to create database object") - else: - if db.db_name in self.supported_databases: - raise FpdbError("Database names must be unique") - # If there is only one Database node, or none are marked - # default, use first - if not self.supported_databases: - self.db_selected = db.db_name - self.supported_databases[db.db_name] = db - if db.db_selected: - self.db_selected = db.db_name + db = Database(node=db_node) + if db.db_name in self.supported_databases: + raise FpdbError("Database names must be unique") + # If there is only one Database node, or none are marked + # default, use first + # default, use first + if not self.supported_databases: + self.db_selected = db.db_name + self.supported_databases[db.db_name] = db + if db.db_selected: + self.db_selected = db.db_name if dbname and dbname in self.supported_databases: self.db_selected = dbname