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

[hirokazu.yamamoto]

Author: hirokazu.yamamoto
Date: Wed Aug 20 06:20:53 2008
New Revision: 65902

Log:
Backport r65900: fixed get_file_system in test_os.py ('path' is unicode on py3k and ansi on trunk)

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 06:20:53 2008
@@ -265,12 +265,15 @@
     # systems support centiseconds
     if sys.platform == 'win32':
         def get_file_system(path):
-            import os
-            root = os.path.splitdrive(os.path.realpath("."))[0] + '\\'
+            root = os.path.splitdrive(os.path.abspath(path))[0] + '\\'
             import ctypes
-            kernel32 = ctypes.windll.kernel32
-            buf = ctypes.create_string_buffer("", 100)
-            if kernel32.GetVolumeInformationA(root, None, 0, None, None, None, buf, len(buf)):
+            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)):
                 return buf.value
 
         if get_file_system(test_support.TESTFN) == "NTFS":