diff options
| author | Giampaolo Rodola <g.rodola@gmail.com> | 2017-02-03 18:32:45 +0100 |
|---|---|---|
| committer | Giampaolo Rodola <g.rodola@gmail.com> | 2017-02-03 18:32:45 +0100 |
| commit | 941512903e8cf3e00c403427494500565094ef97 (patch) | |
| tree | 4c650028c1eabeddad6d6fa67c4ad6865764f046 | |
| parent | bde7f7bac923f83cc675c526cca791b9abc9baac (diff) | |
| parent | 8e7760b3c76097c669ddb235fb076ce0d6dad36a (diff) | |
| download | psutil-941512903e8cf3e00c403427494500565094ef97.tar.gz | |
Merge branch 'master' of github.com:giampaolo/psutil
| -rw-r--r-- | psutil/_pswindows.py | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/psutil/_pswindows.py b/psutil/_pswindows.py index dd83c929..53f57a7a 100644 --- a/psutil/_pswindows.py +++ b/psutil/_pswindows.py @@ -173,10 +173,6 @@ TimeoutExpired = None @lru_cache(maxsize=512) -def _win32_QueryDosDevice(s): - return cext.win32_QueryDosDevice(s) - - def convert_dos_path(s): # convert paths using native DOS format like: # "\Device\HarddiskVolume1\Windows\systemew\file.txt" @@ -184,7 +180,7 @@ def convert_dos_path(s): if PY3 and not isinstance(s, str): s = s.decode('utf8') rawdrive = '\\'.join(s.split('\\')[:3]) - driveletter = _win32_QueryDosDevice(rawdrive) + driveletter = cext.win32_QueryDosDevice(rawdrive) return os.path.join(driveletter, s[len(rawdrive):]) |