mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-02 16:13:13 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Fix py3k warnings in bsddb

Browse source
This commit is contained in:
Antoine Pitrou 2009-10-14 18:01:33 +00:00
parent 868817eaf5
commit 63b0cb2f39
4 changed files with 112 additions and 119 deletions
Download patch file Download diff file Expand all files Collapse all files

33
Lib/bsddb/dbtables.py
View file

@ -398,7 +398,7 @@ class bsdTableDB :
# column names
newcolumnlist = copy.copy(oldcolumnlist)
for c in columns:
if not oldcolumnhash.has_key(c):
if not c in oldcolumnhash:
newcolumnlist.append(c)
# store the table's new extended column list
@ -472,7 +472,7 @@ class bsdTableDB :
raise TableDBError, "unknown table"
# check the validity of each column name
if not self.__tablecolumns.has_key(table):
if not table in self.__tablecolumns:
self.__load_column_info(table)
for column in rowdict.keys() :
if not self.__tablecolumns[table].count(column):
@ -540,7 +540,7 @@ class bsdTableDB :
# error
dataitem = None
dataitem = mappings[column](dataitem)
if dataitem <> None:
if dataitem != None:
self.db.put(
_data_key(table, column, rowid),
dataitem, txn=txn)
@ -615,7 +615,7 @@ class bsdTableDB :
argument and returning a boolean.
"""
try:
if not self.__tablecolumns.has_key(table):
if not table in self.__tablecolumns:
self.__load_column_info(table)
if columns is None:
columns = self.__tablecolumns[table]
@ -639,7 +639,7 @@ class bsdTableDB :
argument and returning a boolean.
"""
# check the validity of each column name
if not self.__tablecolumns.has_key(table):
if not table in self.__tablecolumns:
self.__load_column_info(table)
if columns is None:
columns = self.tablecolumns[table]
@ -709,28 +709,24 @@ class bsdTableDB :
# extract the rowid from the key
rowid = key[-_rowid_str_len:]
if not rejected_rowids.has_key(rowid):
if not rowid in rejected_rowids:
# if no condition was specified or the condition
# succeeds, add row to our match list.
if not condition or condition(data):
if not matching_rowids.has_key(rowid):
if not rowid in matching_rowids:
matching_rowids[rowid] = {}
if savethiscolumndata:
matching_rowids[rowid][column] = data
else:
if matching_rowids.has_key(rowid):
if rowid in matching_rowids:
del matching_rowids[rowid]
rejected_rowids[rowid] = rowid
key, data = cur.next()
except db.DBError, dberror:
if sys.version_info[0] < 3 :
if dberror[0] != db.DB_NOTFOUND:
raise
else :
if dberror.args[0] != db.DB_NOTFOUND:
raise
if dberror.args[0] != db.DB_NOTFOUND:
raise
continue
cur.close()
@ -743,7 +739,7 @@ class bsdTableDB :
if len(columns) > 0:
for rowid, rowdata in matching_rowids.items():
for column in columns:
if rowdata.has_key(column):
if column in rowdata:
continue
try:
rowdata[column] = self.db.get(
@ -815,13 +811,10 @@ class bsdTableDB :
txn.commit()
txn = None
if self.__tablecolumns.has_key(table):
if table in self.__tablecolumns:
del self.__tablecolumns[table]
except db.DBError, dberror:
if txn:
txn.abort()
if sys.version_info[0] < 3 :
raise TableDBError, dberror[1]
else :
raise TableDBError, dberror.args[1]
raise TableDBError(dberror.args[1])