summaryrefslogtreecommitdiffstats
path: root/Lib/bsddb
diff options
context:
space:
mode:
authorBrett Cannon <bcannon@gmail.com>2008-09-09 00:49:16 (GMT)
committerBrett Cannon <bcannon@gmail.com>2008-09-09 00:49:16 (GMT)
commit672237dc6ca1498eabac08554bcbc5bd0fd9ddaa (patch)
tree1847849ac1bcb31cc345ad691242d846350097d6 /Lib/bsddb
parent631be01252d99e14ec8632ccb6ee898d11345d22 (diff)
downloadcpython-672237dc6ca1498eabac08554bcbc5bd0fd9ddaa.zip
cpython-672237dc6ca1498eabac08554bcbc5bd0fd9ddaa.tar.gz
cpython-672237dc6ca1498eabac08554bcbc5bd0fd9ddaa.tar.bz2
warnings.catch_warnings() now returns a list or None instead of the custom
WarningsRecorder object. This makes the API simpler to use as no special object must be learned. Closes issue 3781. Review by Benjamin Peterson.
Diffstat (limited to 'Lib/bsddb')
-rw-r--r--Lib/bsddb/test/test_early_close.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/Lib/bsddb/test/test_early_close.py b/Lib/bsddb/test/test_early_close.py
index 3d3396c..cc69e47 100644
--- a/Lib/bsddb/test/test_early_close.py
+++ b/Lib/bsddb/test/test_early_close.py
@@ -168,9 +168,9 @@ class DBEnvClosedEarlyCrash(unittest.TestCase):
self.assertEquals(("XXX", "yyy"), c1.first())
import warnings
# Not interested in warnings about implicit close.
- warnings.simplefilter("ignore")
- txn.commit()
- warnings.resetwarnings()
+ with warnings.catch_warnings():
+ warnings.simplefilter("ignore")
+ txn.commit()
self.assertRaises(db.DBCursorClosedError, c2.first)
if db.version() > (4,3,0) :