dabo Commit
Revision 4180
Date: 2008-06-25 16:07:51 -0700 (Wed, 25 Jun 2008)
Author: Ed
Trac: http://svn.dabodev.com/trac/dabo/changeset/4180
Changed:
U trunk/dabo/db/dConnectInfo.py
U trunk/dabo/db/dConnection.py
U trunk/dabo/db/dCursorMixin.py
U trunk/dabo/db/dTable.py
U trunk/dabo/db/dbFirebird.py
U trunk/dabo/db/dbOracle.py
Log:
Removed bare 'except:' lines.
Diff:
Modified: trunk/dabo/db/dConnectInfo.py
===================================================================
--- trunk/dabo/db/dConnectInfo.py 2008-06-25 22:09:04 UTC (rev 4179)
+++ trunk/dabo/db/dConnectInfo.py 2008-06-25 23:07:51 UTC (rev 4180)
@@ -222,7 +222,7 @@
def _setPort(self, port):
try:
self._port = int(port)
- except:
+ except ValueError:
self._port = None
Modified: trunk/dabo/db/dConnection.py
===================================================================
--- trunk/dabo/db/dConnection.py 2008-06-25 22:09:04 UTC (rev 4179)
+++ trunk/dabo/db/dConnection.py 2008-06-25 23:07:51 UTC (rev 4180)
@@ -89,7 +89,7 @@
def _getName(self):
try:
return self.ConnectInfo.Name
- except:
+ except AttributeError:
return "?"
Modified: trunk/dabo/db/dCursorMixin.py
===================================================================
--- trunk/dabo/db/dCursorMixin.py 2008-06-25 22:09:04 UTC (rev 4179)
+++ trunk/dabo/db/dCursorMixin.py 2008-06-25 23:07:51 UTC (rev 4180)
@@ -653,7 +653,7 @@
def getType(self, val):
try:
ret = re.search("type '([^']+)'",
str(type(val))).groups()[0]
- except:
+ except IndexError:
ret = "-unknown-"
return ret
@@ -1303,7 +1303,7 @@
if row is None:
# We deleted based on pk, don't delete
flag for the current row.
return
- except:
+ except KeyError:
pass
if row is None:
@@ -1705,7 +1705,7 @@
try:
for fld in kf:
self._records[0][fld]
- except:
+ except KeyError:
raise dException.MissingPKException, _("Primary key
field does not exist in the data set: ") + fld
@@ -2359,7 +2359,8 @@
try:
self._keyField = [fld[0] for fld in
self.getFields(table)
if fld[2] ][0]
- except: pass
+ except KeyError:
+ pass
def _getUserSQL(self):
Modified: trunk/dabo/db/dTable.py
===================================================================
--- trunk/dabo/db/dTable.py 2008-06-25 22:09:04 UTC (rev 4179)
+++ trunk/dabo/db/dTable.py 2008-06-25 23:07:51 UTC (rev 4180)
@@ -65,7 +65,7 @@
try:
idx = kwargs["Index"]
name = kwargs["Name"]
- except:
+ except KeyError:
pass
else:
self._indexes.append(dIndex(Name=idx,Fields=name))
@@ -75,7 +75,7 @@
try:
pk = kwargs["IsPK"]
name = kwargs["Name"]
- except:
+ except KeyError:
pass
else:
if pk == True:
Modified: trunk/dabo/db/dbFirebird.py
===================================================================
--- trunk/dabo/db/dbFirebird.py 2008-06-25 22:09:04 UTC (rev 4179)
+++ trunk/dabo/db/dbFirebird.py 2008-06-25 23:07:51 UTC (rev 4180)
@@ -133,7 +133,7 @@
rs = cursor.getDataSet(rows=1)
try:
pkField = rs[0]["column_name"].strip()
- except:
+ except KeyError:
pkField = None
# Now get the field info
Modified: trunk/dabo/db/dbOracle.py
===================================================================
--- trunk/dabo/db/dbOracle.py 2008-06-25 22:09:04 UTC (rev 4179)
+++ trunk/dabo/db/dbOracle.py 2008-06-25 23:07:51 UTC (rev 4180)
@@ -90,7 +90,7 @@
#print "rs = cursor.getDataSet(): ", rs
try:
pkField = rs[0]["COLUMN_NAME"].strip()
- except:
+ except KeyError:
pkField = None
# Now get the field info
sqlstr = """SELECT column_name, data_type,
COALESCE(data_precision, data_length) "LENGTH",
_______________________________________________
Post Messages to: [email protected]
Subscription Maintenance: http://leafe.com/mailman/listinfo/dabo-dev
Searchable Archives: http://leafe.com/archives/search/dabo-dev
This message: http://leafe.com/archives/byMID/[EMAIL PROTECTED]
