From: Barry Warsaw <barry@python.org>
Date: Mon, 4 Jun 2001 19:35:04 +0000 (+0000)
Subject: Backported two fixes from the Py2.1 tree (pre-unittest rewrite):
X-Git-Tag: v2.0.1c1~8
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5cf87aaf48b194aa8bcf1fc7bd01c37c4d496eab;p=thirdparty%2FPython%2Fcpython.git

Backported two fixes from the Py2.1 tree (pre-unittest rewrite):

----------------------------
revision 1.3
date: 2001/04/10 15:01:20;  author: gvanrossum;  state: Exp;  lines: +6 -0
Some other tests, when failing, don't always remove their TESTFN file.
Try to do it for them, so our mkdir() operation doesn't fail.
----------------------------
revision 1.2
date: 2001/03/02 05:46:17;  author: gvanrossum;  state: Exp;  lines: +3 -3
When catching errors from os.rmdir(), test for os.error, not IOError!
----------------------------

except I used OSError instead of os.error.
---

diff --git a/Lib/test/test_mailbox.py b/Lib/test/test_mailbox.py
index e28d721f0aa7..a19c15b048bd 100644
--- a/Lib/test/test_mailbox.py
+++ b/Lib/test/test_mailbox.py
@@ -2,6 +2,12 @@ import mailbox
 import os
 import test_support
 
+# cleanup the turds of some of the other tests. :(
+try:
+    os.unlink(test_support.TESTFN)
+except OSError:
+    pass
+
 # create a new maildir mailbox to work with:
 curdir = os.path.join(test_support.TESTFN, "cur")
 newdir = os.path.join(test_support.TESTFN, "new")
@@ -21,8 +27,8 @@ try:
 
 finally:
     try: os.rmdir(newdir)
-    except IOError: pass
+    except OSError: pass
     try: os.rmdir(curdir)
-    except IOError: pass
+    except OSError: pass
     try: os.rmdir(test_support.TESTFN)
-    except IOError: pass
+    except OSError: pass