test_urllib is currently failing on Windows buildbots because test_os at one time created a directory named test_support.TESTFN + ".2". test_os has been fixed, but the old directory is still present on buildbots. This patch is a one time fix that should be removed after the first succesful buildbot run. I added the cleanup code to test_urllib, because buildbots run tests in random order. The other option is to ask the buildbot slave maintainers to manually remove the offending directory.
Here is the second patch that should be applied once the first one has done its job. It also removes Neal's cleanups, because they are not needed anymore. File Added: cleanup_cleanup.diff
Ziga, if this passes on windows, please apply to trunk. 2.5 branch is stilly frozen (I forget if this is trunk only). Thanks for backing out my changes. They never did much.
I checked in the first patch, and it fixed the problem on the Windows 2000 buildbot slave. I'm not entirely sure how the buildbot works, so I would like to wait with the second patch until the Windows XP slave comes back online. The test was failing only on the trunk, so there is no need to backport this change.