diff options
| author | Jesus Cea <jcea@jcea.es> | 2008-09-02 02:29:06 (GMT) |
|---|---|---|
| committer | Jesus Cea <jcea@jcea.es> | 2008-09-02 02:29:06 (GMT) |
| commit | 3b6be74304b528112a2a4baebc17eaccca15f049 (patch) | |
| tree | 63262408783037c4257c2e00afa8272f09a28714 | |
| parent | 2dd647b8fc97e03d4e4d9088090d8b8bc42862fe (diff) | |
| download | cpython-3b6be74304b528112a2a4baebc17eaccca15f049.zip cpython-3b6be74304b528112a2a4baebc17eaccca15f049.tar.gz cpython-3b6be74304b528112a2a4baebc17eaccca15f049.tar.bz2 | |
Improve compatibility with Python3.0 testsuite
| -rw-r--r-- | Lib/bsddb/__init__.py | 15 | ||||
| -rw-r--r-- | Lib/bsddb/test/test_all.py | 2 | ||||
| -rw-r--r-- | Modules/bsddb.h | 2 |
3 files changed, 12 insertions, 7 deletions
diff --git a/Lib/bsddb/__init__.py b/Lib/bsddb/__init__.py index 0b8f6d9..0e5169c 100644 --- a/Lib/bsddb/__init__.py +++ b/Lib/bsddb/__init__.py @@ -110,7 +110,7 @@ class _iter_mixin(MutableMapping): key = _DeadlockWrap(cur.first, 0,0,0)[0] yield key - next = cur.next + next = getattr(cur, "next") while 1: try: key = _DeadlockWrap(next, 0,0,0)[0] @@ -123,7 +123,7 @@ class _iter_mixin(MutableMapping): # FIXME-20031101-greg: race condition. cursor could # be closed by another thread before this call. _DeadlockWrap(cur.set, key,0,0,0) - next = cur.next + next = getattr(cur, "next") except _bsddb.DBNotFoundError: pass except _bsddb.DBCursorClosedError: @@ -152,7 +152,7 @@ class _iter_mixin(MutableMapping): key = kv[0] yield kv - next = cur.next + next = getattr(cur, "next") while 1: try: kv = _DeadlockWrap(next) @@ -166,7 +166,7 @@ class _iter_mixin(MutableMapping): # FIXME-20031101-greg: race condition. cursor could # be closed by another thread before this call. _DeadlockWrap(cur.set, key,0,0,0) - next = cur.next + next = getattr(cur, "next") except _bsddb.DBNotFoundError: pass except _bsddb.DBCursorClosedError: @@ -302,12 +302,15 @@ class _DBWithCursor(_iter_mixin): self._checkCursor() return _DeadlockWrap(self.dbc.set_range, key) - def next(self): + def next(self): # Renamed by "2to3" self._checkOpen() self._checkCursor() - rv = _DeadlockWrap(self.dbc.next) + rv = _DeadlockWrap(getattr(self.dbc, "next")) return rv + if sys.version_info[0] >= 3 : # For "2to3" conversion + next = __next__ + def previous(self): self._checkOpen() self._checkCursor() diff --git a/Lib/bsddb/test/test_all.py b/Lib/bsddb/test/test_all.py index 75f5dc0..75a2322 100644 --- a/Lib/bsddb/test/test_all.py +++ b/Lib/bsddb/test/test_all.py @@ -33,6 +33,8 @@ if sys.version_info[0] >= 3 : v = getattr(self._dbcursor, "next")() return self._fix(v) + next = __next__ + def previous(self) : v = self._dbcursor.previous() return self._fix(v) diff --git a/Modules/bsddb.h b/Modules/bsddb.h index 41f1db9..af5e56b 100644 --- a/Modules/bsddb.h +++ b/Modules/bsddb.h @@ -105,7 +105,7 @@ #error "eek! DBVER can't handle minor versions > 9" #endif -#define PY_BSDDB_VERSION "4.7.3pre2" +#define PY_BSDDB_VERSION "4.7.3pre3" /* Python object definitions */ |