[Python-checkins] r42481 - in python/trunk/Lib/bsddb: init.py test/test_misc.py

Sun Feb 19 02:21:11 CET 2006

Author: georg.brandl
Date: Sun Feb 19 02:21:11 2006
New Revision: 42481
Modified:
 python/trunk/Lib/bsddb/__init__.py
 python/trunk/Lib/bsddb/test/test_misc.py
Log:
Add a unit test for bug fix #1396678.
Modified: python/trunk/Lib/bsddb/__init__.py
==============================================================================

--- python/trunk/Lib/bsddb/__init__.py	(original)
+++ python/trunk/Lib/bsddb/__init__.py	Sun Feb 19 02:21:11 2006
@@ -111,11 +111,10 @@
 return
 
 def iteritems(self):
+ if not self.db:
+ return
 try:
- try:
- cur = self._make_iter_cursor()
- except AttributeError:
- return
+ cur = self._make_iter_cursor()
 
 # FIXME-20031102-greg: race condition. cursor could
 # be closed by another thread before this call.
Modified: python/trunk/Lib/bsddb/test/test_misc.py
==============================================================================
--- python/trunk/Lib/bsddb/test/test_misc.py	(original)
+++ python/trunk/Lib/bsddb/test/test_misc.py	Sun Feb 19 02:21:11 2006
@@ -7,10 +7,10 @@
 
 try:
 # For Pythons w/distutils pybsddb
- from bsddb3 import db, dbshelve
+ from bsddb3 import db, dbshelve, hashopen
 except ImportError:
 # For Python 2.3
- from bsddb import db, dbshelve
+ from bsddb import db, dbshelve, hashopen
 
 #----------------------------------------------------------------------
 
@@ -46,6 +46,12 @@
 env.open(self.homeDir, db.DB_CREATE)
 assert self.homeDir == env.db_home
 
+ def test03_repr_closed_db(self):
+ db = hashopen(self.filename)
+ db.close()
+ rp = repr(db)
+ self.assertEquals(rp, "{}")
+
 
 #----------------------------------------------------------------------
 


[Python-checkins] r42481 - in python/trunk/Lib/bsddb: __init__.py test/test_misc.py

[Python-checkins] r42481 - in python/trunk/Lib/bsddb: init.py test/test_misc.py