From ab0053aa13951ad00a00c29467cc6b106725630b Mon Sep 17 00:00:00 2001 From: Skip Montanaro Date: Sat, 17 May 2003 02:54:11 +0000 Subject: [PATCH] simpler temp dir cleanup --- Lib/test/test_bsddb185.py | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/Lib/test/test_bsddb185.py b/Lib/test/test_bsddb185.py index ceacf4dddc5..df1ece09c91 100644 --- a/Lib/test/test_bsddb185.py +++ b/Lib/test/test_bsddb185.py @@ -11,6 +11,7 @@ import anydbm import whichdb import os import tempfile +import shutil class Bsddb185Tests(unittest.TestCase): @@ -28,15 +29,12 @@ class Bsddb185Tests(unittest.TestCase): # Verify that anydbm.open does *not* create a bsddb185 file tmpdir = tempfile.mkdtemp() try: - try: - dbfile = os.path.join(tmpdir, "foo.db") - anydbm.open(os.path.splitext(dbfile)[0], "c").close() - ftype = whichdb.whichdb(dbfile) - self.assertNotEqual(ftype, "bsddb185") - finally: - os.unlink(dbfile) + dbfile = os.path.join(tmpdir, "foo.db") + anydbm.open(dbfile, "c").close() + ftype = whichdb.whichdb(dbfile) + self.assertNotEqual(ftype, "bsddb185") finally: - os.rmdir(tmpdir) + shutil.rmtree(tmpdir) def test_main(): run_unittest(Bsddb185Tests)