[Python-checkins] r65917 - python/trunk/Lib/test/test_os.py
hirokazu.yamamoto
python-checkins at python.org
Wed Aug 20 18:15:28 CEST 2008
Author: hirokazu.yamamoto
Date: Wed Aug 20 18:15:28 2008
New Revision: 65917
Log:
Reverted r65900. See http://mail.python.org/pipermail/python-checkins/2008-August/073116.html
Modified:
python/trunk/Lib/test/test_os.py
Modified: python/trunk/Lib/test/test_os.py
==============================================================================
--- python/trunk/Lib/test/test_os.py (original)
+++ python/trunk/Lib/test/test_os.py Wed Aug 20 18:15:28 2008
@@ -296,13 +296,9 @@
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":
More information about the Python-checkins
mailing list