[Zodb-checkins] CVS: ZODB4/src/zodb/storage/tests - base.py:1.6.4.2

[Barry Warsaw]

Update of /cvs-repository/ZODB4/src/zodb/storage/tests
In directory cvs.zope.org:/tmp/cvs-serv8629

Modified Files:
      Tag: opaque-pickles-branch
	base.py 
Log Message:
Merging in from the HEAD


=== ZODB4/src/zodb/storage/tests/base.py 1.6.4.1 => 1.6.4.2 ===
--- ZODB4/src/zodb/storage/tests/base.py:1.6.4.1	Mon Mar 10 18:06:10 2003
+++ ZODB4/src/zodb/storage/tests/base.py	Thu Mar 13 11:11:14 2003
@@ -266,12 +266,8 @@
     def _zap_dbhome(self, dir=None):
         if dir is None:
             dir = self._envdir()
-        # XXX Pre-Python 2.3 doesn't ignore errors if the first arg doesn't
-        # exist, even if the second is True.
-        try:
-            shutil.rmtree(dir, True)
-        except OSError, e:
-            if e.errno <> errno.ENOENT: raise
+        if os.path.isdir(dir):
+            shutil.rmtree(dir)
 
     def _mk_dbhome(self, dir=None):
         if dir is None: