From: Hirokazu Yamamoto Date: Wed, 20 Aug 2008 16:15:28 +0000 (+0000) Subject: Reverted r65900. See http://mail.python.org/pipermail/python-checkins/2008-August... X-Git-Tag: v2.6b3~1 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=cd3b74d4e860b75bc45658ade0d412274054648f;p=thirdparty%2FPython%2Fcpython.git Reverted r65900. See http://mail.python.org/pipermail/python-checkins/2008-August/073116.html --- diff --git a/Lib/test/test_os.py b/Lib/test/test_os.py index 5e605d2222eb..cec023d308d2 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":