Merge branch 'master' of github.com:giampaolo/psutil

2 files changed, 11 insertions, 4 deletions

diff --git a/psutil/tests/__init__.py b/psutil/tests/__init__.py
index 84215259..c03daf7f 100644
--- a/psutil/tests/__init__.py
+++ b/psutil/tests/__init__.py
@@ -12,7 +12,6 @@ from __future__ import print_function
 
 import atexit
 import contextlib
-import ctypes
 import errno
 import functools
 import os
@@ -688,8 +687,8 @@ def skip_on_not_implemented(only_if=None):
 
 
 def cleanup():
-    for name in os.listdir('.'):
-        if name.startswith(TESTFILE_PREFIX):
+    for name in os.listdir(u('.')):
+        if name.startswith(u(TESTFILE_PREFIX)):
             try:
                 safe_rmpath(name)
             except UnicodeEncodeError as exc:
@@ -965,6 +964,7 @@ def copyload_shared_lib(dst_prefix=TESTFILE_PREFIX):
     in memory via ctypes.
     Return the new absolutized, normcased path.
     """
+    import ctypes
     ext = ".so" if POSIX else ".dll"
     dst = tempfile.mktemp(prefix=dst_prefix, suffix=ext)
     libs = [x.path for x in psutil.Process().memory_maps()
@@ -981,5 +981,12 @@ def copyload_shared_lib(dst_prefix=TESTFILE_PREFIX):
         yield dst
     finally:
         if WINDOWS and cfile is not None:
+            # See:
+            # - https://ci.appveyor.com/project/giampaolo/psutil/build/1207/
+            #       job/o53330pbnri9bcw7
+            # - http://bugs.python.org/issue30286
+            # - http://stackoverflow.com/questions/23522055
+            from ctypes import wintypes
+            ctypes.windll.kernel32.FreeLibrary.argtypes = [wintypes.HMODULE]
             ctypes.windll.kernel32.FreeLibrary(cfile._handle)
         safe_rmpath(dst)
diff --git a/scripts/internal/winmake.py b/scripts/internal/winmake.py
index e3ac1e28..0408b80c 100755
--- a/scripts/internal/winmake.py
+++ b/scripts/internal/winmake.py
@@ -158,7 +158,7 @@ def safe_rmtree(path):
 
 def recursive_rm(*patterns):
     """Recursively remove a file or matching a list of patterns."""
-    for root, subdirs, subfiles in os.walk('.'):
+    for root, subdirs, subfiles in os.walk(u'.'):
         root = os.path.normpath(root)
         if root.startswith('.git/'):
             continue