From 57a4e9092278b9393cb2ee0da7f3b8b19a47c6cf Mon Sep 17 00:00:00 2001 From: Fred Drake Date: Mon, 18 Sep 2000 17:56:58 +0000 Subject: [PATCH] Fix up the cleanup of the temporary DB so it works for BSD DB's compatibility layer as well as "classic" ndbm. --- Lib/test/test_dbm.py | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/Lib/test/test_dbm.py b/Lib/test/test_dbm.py index b4f7f89464f..94949cf6fcb 100755 --- a/Lib/test/test_dbm.py +++ b/Lib/test/test_dbm.py @@ -6,7 +6,7 @@ import dbm from dbm import error from test_support import verbose -filename= '/tmp/delete_me' +filename = '/tmp/delete_me' d = dbm.open(filename, 'c') d['a'] = 'b' @@ -15,7 +15,7 @@ d.keys() if d.has_key('a'): if verbose: print 'Test dbm keys: ', d.keys() - + d.close() d = dbm.open(filename, 'r') d.close() @@ -28,7 +28,15 @@ d.close() try: import os - os.unlink(filename + '.dir') - os.unlink(filename + '.pag') + if dbm.library == "ndbm": + # classic dbm + os.unlink(filename + '.dir') + os.unlink(filename + '.pag') + elif dbm.library == "BSD db": + # BSD DB's compatibility layer + os.unlink(filename + '.db') + else: + # GNU gdbm compatibility layer + os.unlink(filename) except: pass