summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHirokazu Yamamoto <ocean-city@m2.ccsnet.ne.jp>2008-08-20 16:15:28 (GMT)
committerHirokazu Yamamoto <ocean-city@m2.ccsnet.ne.jp>2008-08-20 16:15:28 (GMT)
commitcd3b74d4e860b75bc45658ade0d412274054648f (patch)
treee0b2a590da1f32d489a60edccfec63cdbd4e98a8
parentf8402963922e181f9078306f089fc21e79775f6e (diff)
downloadcpython-cd3b74d4e860b75bc45658ade0d412274054648f.zip
cpython-cd3b74d4e860b75bc45658ade0d412274054648f.tar.gz
cpython-cd3b74d4e860b75bc45658ade0d412274054648f.tar.bz2
Reverted r65900. See http://mail.python.org/pipermail/python-checkins/2008-August/073116.html
-rw-r--r--Lib/test/test_os.py10
1 files changed, 3 insertions, 7 deletions
diff --git a/Lib/test/test_os.py b/Lib/test/test_os.py
index 5e605d2..cec023d 100644
--- a/Lib/test/test_os.py
+++ b/Lib/test/test_os.py
@@ -296,13 +296,9 @@ class StatAttributeTests(unittest.TestCase):
def get_file_system(path):
root = os.path.splitdrive(os.path.abspath(path))[0] + '\\'
import ctypes
- from ctypes.wintypes import LPCWSTR, LPWSTR, DWORD
- LPDWORD = ctypes.POINTER(DWORD)
- f = ctypes.windll.kernel32.GetVolumeInformationW
- f.argtypes = (LPCWSTR, LPWSTR, DWORD,
- LPDWORD, LPDWORD, LPDWORD, LPWSTR, DWORD)
- buf = ctypes.create_unicode_buffer("", 100)
- if f(root, None, 0, None, None, None, buf, len(buf)):
+ kernel32 = ctypes.windll.kernel32
+ buf = ctypes.create_string_buffer("", 100)
+ if kernel32.GetVolumeInformationA(root, None, 0, None, None, None, buf, len(buf)):
return buf.value
if get_file_system(test_support.TESTFN) == "NTFS":