summaryrefslogtreecommitdiffstats
path: root/Lib/test
diff options
context:
space:
mode:
authorAmaury Forgeot d'Arc <amauryfa@gmail.com>2009-02-19 23:23:47 (GMT)
committerAmaury Forgeot d'Arc <amauryfa@gmail.com>2009-02-19 23:23:47 (GMT)
commit2fc224f0904f398be79e40616cc8a4570375c786 (patch)
treeddbae8d7cc6f421ae36b904576e70479437da540 /Lib/test
parentb672b6dea65dfae3c8ad04591642e8835f499da2 (diff)
downloadcpython-2fc224f0904f398be79e40616cc8a4570375c786.zip
cpython-2fc224f0904f398be79e40616cc8a4570375c786.tar.gz
cpython-2fc224f0904f398be79e40616cc8a4570375c786.tar.bz2
#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.
Diffstat (limited to 'Lib/test')
-rw-r--r--Lib/test/test_os.py4
1 files changed, 2 insertions, 2 deletions
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 @@ class Win32ErrorTests(unittest.TestCase):
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)