From: Hirokazu Yamamoto <ocean-city@m2.ccsnet.ne.jp>
Date: Wed, 20 Aug 2008 04:17:24 +0000 (+0000)
Subject: Merged revisions 65900 via svnmerge from
X-Git-Tag: v3.0b3~13
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5ef6d18bdf789f56dacd8efaa0b281c84180e1c2;p=python

Merged revisions 65900 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r65900 | hirokazu.yamamoto | 2008-08-20 13:13:28 +0900 | 1 line

  fixed get_file_system in test_os.py ('path' is unicode on py3k and ansi on trunk)
........
---

diff --git a/Lib/test/test_os.py b/Lib/test/test_os.py
index 3dffcb2dea..c566705404 100644
--- a/Lib/test/test_os.py
+++ b/Lib/test/test_os.py
@@ -299,12 +299,15 @@ class StatAttributeTests(unittest.TestCase):
     # 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(support.TESTFN) == "NTFS":