diff options
| author | Ezio Melotti <ezio.melotti@gmail.com> | 2010-02-02 08:37:35 (GMT) |
|---|---|---|
| committer | Ezio Melotti <ezio.melotti@gmail.com> | 2010-02-02 08:37:35 (GMT) |
| commit | 5d62cfe070b63cdb3c80744ef9970facc008750c (patch) | |
| tree | 3a7fea1b5ac99808c15312b2a6ae5dcbf5e3503f /Lib/bsddb/dbtables.py | |
| parent | 039c89938841347192b57a8609fb615dbc13d47b (diff) | |
| download | cpython-5d62cfe070b63cdb3c80744ef9970facc008750c.zip cpython-5d62cfe070b63cdb3c80744ef9970facc008750c.tar.gz cpython-5d62cfe070b63cdb3c80744ef9970facc008750c.tar.bz2 | |
#7092: silence py3k warnings for bsddb. Patch by Florent Xicluna.
Diffstat (limited to 'Lib/bsddb/dbtables.py')
| -rw-r--r-- | Lib/bsddb/dbtables.py | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/Lib/bsddb/dbtables.py b/Lib/bsddb/dbtables.py index 2b0a2bf..b728570 100644 --- a/Lib/bsddb/dbtables.py +++ b/Lib/bsddb/dbtables.py @@ -332,7 +332,7 @@ class bsdTableDB : except db.DBError, dberror: if txn: txn.abort() - if sys.version_info[0] < 3 : + if sys.version_info < (2, 6) : raise TableDBError, dberror[1] else : raise TableDBError, dberror.args[1] @@ -416,7 +416,7 @@ class bsdTableDB : except db.DBError, dberror: if txn: txn.abort() - if sys.version_info[0] < 3 : + if sys.version_info < (2, 6) : raise TableDBError, dberror[1] else : raise TableDBError, dberror.args[1] @@ -499,7 +499,7 @@ class bsdTableDB : if txn: txn.abort() self.db.delete(_rowid_key(table, rowid)) - if sys.version_info[0] < 3 : + if sys.version_info < (2, 6) : raise TableDBError, dberror[1], info[2] else : raise TableDBError, dberror.args[1], info[2] @@ -554,7 +554,7 @@ class bsdTableDB : raise except db.DBError, dberror: - if sys.version_info[0] < 3 : + if sys.version_info < (2, 6) : raise TableDBError, dberror[1] else : raise TableDBError, dberror.args[1] @@ -598,7 +598,7 @@ class bsdTableDB : txn.abort() raise except db.DBError, dberror: - if sys.version_info[0] < 3 : + if sys.version_info < (2, 6) : raise TableDBError, dberror[1] else : raise TableDBError, dberror.args[1] @@ -621,7 +621,7 @@ class bsdTableDB : columns = self.__tablecolumns[table] matching_rowids = self.__Select(table, columns, conditions) except db.DBError, dberror: - if sys.version_info[0] < 3 : + if sys.version_info < (2, 6) : raise TableDBError, dberror[1] else : raise TableDBError, dberror.args[1] @@ -677,7 +677,7 @@ class bsdTableDB : # leave all unknown condition callables alone as equals return 0 - if sys.version_info[0] < 3 : + if sys.version_info < (2, 6) : conditionlist = conditions.items() conditionlist.sort(cmp_conditions) else : # Insertion Sort. Please, improve @@ -745,7 +745,7 @@ class bsdTableDB : rowdata[column] = self.db.get( _data_key(table, column, rowid)) except db.DBError, dberror: - if sys.version_info[0] < 3 : + if sys.version_info < (2, 6) : if dberror[0] != db.DB_NOTFOUND: raise else : |