Use os.remove() in all cases, instead of mixing remove() and unlink().
Jeremy Hylton authored
Add one case where failure to remove is not a fatal error. And be more
specific about the error that is caught -- OSError only.
6fb972a0