Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

Improve compatibility with Python3.0 testsuite

This commit is contained in:
Jesus Cea 2008-09-02 02:29:06 +00:00
parent 2dd647b8fc
commit 3b6be74304
3 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
Lib/bsddb/__init__.py
View File

@ -110,7 +110,7 @@ class _iter_mixin(MutableMapping):
key = _DeadlockWrap(cur.first, 0,0,0)[0] key = _DeadlockWrap(cur.first, 0,0,0)[0]
yield key yield key
next = cur.next next = getattr(cur, "next")
while 1: while 1:
try: try:
key = _DeadlockWrap(next, 0,0,0)[0] key = _DeadlockWrap(next, 0,0,0)[0]
@ -123,7 +123,7 @@ class _iter_mixin(MutableMapping):
# FIXME-20031101-greg: race condition. cursor could # FIXME-20031101-greg: race condition. cursor could
# be closed by another thread before this call. # be closed by another thread before this call.
_DeadlockWrap(cur.set, key,0,0,0) _DeadlockWrap(cur.set, key,0,0,0)
next = cur.next next = getattr(cur, "next")
except _bsddb.DBNotFoundError: except _bsddb.DBNotFoundError:
pass pass
except _bsddb.DBCursorClosedError: except _bsddb.DBCursorClosedError:
@ -152,7 +152,7 @@ class _iter_mixin(MutableMapping):
key = kv[0] key = kv[0]
yield kv yield kv
next = cur.next next = getattr(cur, "next")
while 1: while 1:
try: try:
kv = _DeadlockWrap(next) kv = _DeadlockWrap(next)
@ -166,7 +166,7 @@ class _iter_mixin(MutableMapping):
# FIXME-20031101-greg: race condition. cursor could # FIXME-20031101-greg: race condition. cursor could
# be closed by another thread before this call. # be closed by another thread before this call.
_DeadlockWrap(cur.set, key,0,0,0) _DeadlockWrap(cur.set, key,0,0,0)
next = cur.next next = getattr(cur, "next")
except _bsddb.DBNotFoundError: except _bsddb.DBNotFoundError:
pass pass
except _bsddb.DBCursorClosedError: except _bsddb.DBCursorClosedError:
@ -302,12 +302,15 @@ class _DBWithCursor(_iter_mixin):
self._checkCursor() self._checkCursor()
return _DeadlockWrap(self.dbc.set_range, key) return _DeadlockWrap(self.dbc.set_range, key)
def next(self): def next(self): # Renamed by "2to3"
self._checkOpen() self._checkOpen()
self._checkCursor() self._checkCursor()
rv = _DeadlockWrap(self.dbc.next) rv = _DeadlockWrap(getattr(self.dbc, "next"))
return rv return rv
if sys.version_info[0] >= 3 : # For "2to3" conversion
next = __next__
def previous(self): def previous(self):
self._checkOpen() self._checkOpen()
self._checkCursor() self._checkCursor()

2
Lib/bsddb/test/test_all.py
View File

@ -33,6 +33,8 @@ if sys.version_info[0] >= 3 :
v = getattr(self._dbcursor, "next")() v = getattr(self._dbcursor, "next")()
return self._fix(v) return self._fix(v)
next = __next__
def previous(self) : def previous(self) :
v = self._dbcursor.previous() v = self._dbcursor.previous()
return self._fix(v) return self._fix(v)

2
Modules/bsddb.h
View File

@ -105,7 +105,7 @@
#error "eek! DBVER can't handle minor versions > 9" #error "eek! DBVER can't handle minor versions > 9"
#endif #endif
#define PY_BSDDB_VERSION "4.7.3pre2" #define PY_BSDDB_VERSION "4.7.3pre3"
/* Python object definitions */ /* Python object definitions */