#5306: Fix compilation on Windows by properly merging change 69495.
+ fixed an obvious merge glitch in a windows-only test.
Patch by Hirokazu Yamamoto.
I added a _PyVerify_fd() call to os.device_encoding() (new in python 3.0)
which also uses a raw file descriptor.
diff --git a/Lib/test/test_os.py b/Lib/test/test_os.py
index f28f862..0136c5e 100644
--- a/Lib/test/test_os.py
+++ b/Lib/test/test_os.py
@@ -576,12 +576,12 @@
self.assertRaises(WindowsError, os.chdir, support.TESTFN)
def test_mkdir(self):
- f = open(test_support.TESTFN, "w")
+ f = open(support.TESTFN, "w")
try:
self.assertRaises(WindowsError, os.mkdir, support.TESTFN)
finally:
f.close()
- os.unlink(test_support.TESTFN)
+ os.unlink(support.TESTFN)
def test_utime(self):
self.assertRaises(WindowsError, os.utime, support.TESTFN, None)