[Python-checkins] r65916 - python/branches/release25-maint/Lib/test/test_os.py

[hirokazu.yamamoto]

Author: hirokazu.yamamoto
Date: Wed Aug 20 18:13:57 2008
New Revision: 65916

Log:
Reverted r65902. See http://mail.python.org/pipermail/python-checkins/2008-August/073116.html

Modified:
   python/branches/release25-maint/Lib/test/test_os.py

Modified: python/branches/release25-maint/Lib/test/test_os.py
==============================================================================
--- python/branches/release25-maint/Lib/test/test_os.py	(original)
+++ python/branches/release25-maint/Lib/test/test_os.py	Wed Aug 20 18:13:57 2008
@@ -267,13 +267,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":