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

Fix bug 1725856.

This commit is contained in:
Gregory P. Smith 2007-08-24 05:11:38 +00:00
parent daa6f254c6
commit 1042a4d719
2 changed files with 20 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Lib/bsddb/__init__.py
View File

@ -274,12 +274,16 @@ class _DBWithCursor(_iter_mixin):
def first(self): def first(self):
self._checkOpen() self._checkOpen()
# fix 1725856: don't needlessly try to restore our cursor position
self.saved_dbc_key = None
self._checkCursor() self._checkCursor()
rv = _DeadlockWrap(self.dbc.first) rv = _DeadlockWrap(self.dbc.first)
return rv return rv
def last(self): def last(self):
self._checkOpen() self._checkOpen()
# fix 1725856: don't needlessly try to restore our cursor position
self.saved_dbc_key = None
self._checkCursor() self._checkCursor()
rv = _DeadlockWrap(self.dbc.last) rv = _DeadlockWrap(self.dbc.last)
return rv return rv

16
Lib/test/test_bsddb.py
View File

@ -127,6 +127,22 @@ class TestBSDDB(unittest.TestCase):
items.append(self.f.previous()) items.append(self.f.previous())
self.assertSetEquals(items, self.d.items()) self.assertSetEquals(items, self.d.items())
def test_first_while_deleting(self):
# Test for bug 1725856
self.assert_(len(self.d) >= 2, "test requires >=2 items")
for _ in self.d:
key = self.f.first()[0]
del self.f[key]
self.assertEqual([], self.f.items(), "expected empty db after test")
def test_last_while_deleting(self):
# Test for bug 1725856's evil twin
self.assert_(len(self.d) >= 2, "test requires >=2 items")
for _ in self.d:
key = self.f.last()[0]
del self.f[key]
self.assertEqual([], self.f.items(), "expected empty db after test")
def test_set_location(self): def test_set_location(self):
self.assertEqual(self.f.set_location('e'), ('e', self.d['e'])) self.assertEqual(self.f.set_location('e'), ('e', self.d['e']))