[Python-checkins] CVS: python/dist/src/Lib/test test_dbm.py,1.3,1.4

[Fred L. Drake]

Update of /cvsroot/python/python/dist/src/Lib/test
In directory slayer.i.sourceforge.net:/tmp/cvs-serv27765/Lib/test

Modified Files:
	test_dbm.py 
Log Message:

Fix up the cleanup of the temporary DB so it works for BSD DB's
compatibility layer as well as "classic" ndbm.


Index: test_dbm.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/test/test_dbm.py,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** test_dbm.py	1998/03/26 19:41:57	1.3
--- test_dbm.py	2000/09/18 17:56:58	1.4
***************
*** 7,11 ****
  from test_support import verbose
  
! filename= '/tmp/delete_me'
  
  d = dbm.open(filename, 'c')
--- 7,11 ----
  from test_support import verbose
  
! filename = '/tmp/delete_me'
  
  d = dbm.open(filename, 'c')
***************
*** 16,20 ****
      if verbose:
          print 'Test dbm keys: ', d.keys()
!         
  d.close()
  d = dbm.open(filename, 'r')
--- 16,20 ----
      if verbose:
          print 'Test dbm keys: ', d.keys()
! 
  d.close()
  d = dbm.open(filename, 'r')
***************
*** 29,34 ****
  try:
      import os
!     os.unlink(filename + '.dir')
!     os.unlink(filename + '.pag')
  except:
      pass
--- 29,42 ----
  try:
      import os
!     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