#1040: use default fs encoding instead of utf8 when decoding from ubytes to unicode

1 files changed, 4 insertions, 2 deletions

diff --git a/psutil/_pswindows.py b/psutil/_pswindows.py
index 3d54b86c..266c1220 100644
--- a/psutil/_pswindows.py
+++ b/psutil/_pswindows.py
@@ -184,7 +184,9 @@ def convert_dos_path(s):
         "C:\Windows\systemew\file.txt"
     """
     if PY3 and not isinstance(s, str):
-        s = s.decode('utf8')
+        # TODO: probably getting here means there's something wrong;
+        # probably needs to be removed.
+        s = s.decode(FS_ENCODING, errors=PY2_ENCODING_ERRS)
     rawdrive = '\\'.join(s.split('\\')[:3])
     driveletter = cext.win32_QueryDosDevice(rawdrive)
     return os.path.join(driveletter, s[len(rawdrive):])
@@ -761,9 +763,9 @@ class Process(object):
         else:
             for addr, perm, path, rss in raw:
                 assert isinstance(path, unicode), path
+                path = convert_dos_path(path)
                 if not PY3:
                     path = py2_strencode(path)
-                path = convert_dos_path(path)
                 addr = hex(addr)
                 yield (addr, perm, path, rss)