mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-11-25 04:34:37 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

reapply of r57378 to fix bug 1725856

Browse source
This commit is contained in:
Gregory P. Smith 2007-08-24 05:32:10 +00:00
parent fc5fafcf78
commit 07aec08a01
2 changed files with 20 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Lib/bsddb/__init__.py
View file

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

16
Lib/test/test_bsddb.py
View file

@ -131,6 +131,22 @@ class TestBSDDB(unittest.TestCase):
items.append(self.f.previous())
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(0, len(self.f), "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(0, len(self.f), "expected empty db after test")
def test_set_location(self):
self.assertEqual(self.f.set_location('e'), ('e', self.d['e']))