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

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.