[Python-3000-checkins] r54601 - python/branches/p3yk/Lib/bsddb/dbtables.py

[guido.van.rossum]

Author: guido.van.rossum
Date: Wed Mar 28 23:03:48 2007
New Revision: 54601

Modified:
   python/branches/p3yk/Lib/bsddb/dbtables.py
Log:
More fixes related to removal of exception slicing.


Modified: python/branches/p3yk/Lib/bsddb/dbtables.py
==============================================================================
--- python/branches/p3yk/Lib/bsddb/dbtables.py	(original)
+++ python/branches/p3yk/Lib/bsddb/dbtables.py	Wed Mar 28 23:03:48 2007
@@ -263,7 +263,7 @@
         except DBError as dberror:
             if txn:
                 txn.abort()
-            raise TableDBError, dberror[1]
+            raise TableDBError, dberror.args[1]
 
 
     def ListTableColumns(self, table):
@@ -341,7 +341,7 @@
             except DBError as dberror:
                 if txn:
                     txn.abort()
-                raise TableDBError, dberror[1]
+                raise TableDBError, dberror.args[1]
 
 
     def __load_column_info(self, table) :
@@ -416,7 +416,7 @@
             if txn:
                 txn.abort()
                 self.db.delete(_rowid_key(table, rowid))
-            raise TableDBError, dberror[1], info[2]
+            raise TableDBError, dberror.args[1], info[2]
 
 
     def Modify(self, table, conditions={}, mappings={}):
@@ -467,7 +467,7 @@
                     raise
 
         except DBError as dberror:
-            raise TableDBError, dberror[1]
+            raise TableDBError, dberror.args[1]
 
     def Delete(self, table, conditions={}):
         """Delete(table, conditions) - Delete items matching the given
@@ -507,7 +507,7 @@
                         txn.abort()
                     raise
         except DBError as dberror:
-            raise TableDBError, dberror[1]
+            raise TableDBError, dberror.args[1]
 
 
     def Select(self, table, columns, conditions={}):
@@ -527,7 +527,7 @@
                 columns = self.__tablecolumns[table]
             matching_rowids = self.__Select(table, columns, conditions)
         except DBError as dberror:
-            raise TableDBError, dberror[1]
+            raise TableDBError, dberror.args[1]
         # return the matches as a list of dictionaries
         return matching_rowids.values()
 
@@ -617,7 +617,7 @@
                     key, data = cur.next()
 
             except DBError as dberror:
-                if dberror[0] != DB_NOTFOUND:
+                if dberror.args[0] != DB_NOTFOUND:
                     raise
                 continue
 
@@ -637,7 +637,7 @@
                         rowdata[column] = self.db.get(
                             _data_key(table, column, rowid))
                     except DBError as dberror:
-                        if dberror[0] != DB_NOTFOUND:
+                        if dberror.args[0] != DB_NOTFOUND:
                             raise
                         rowdata[column] = None
 
@@ -703,4 +703,4 @@
         except DBError as dberror:
             if txn:
                 txn.abort()
-            raise TableDBError, dberror[1]
+            raise TableDBError, dberror.args[1]