summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--make.bat9
-rw-r--r--psutil/_psutil_windows.c2
-rw-r--r--psutil/arch/windows/process_info.c2
3 files changed, 8 insertions, 5 deletions
diff --git a/make.bat b/make.bat
index 5d472a30..045ad536 100644
--- a/make.bat
+++ b/make.bat
@@ -78,9 +78,12 @@ if "%1" == "install" (
if "%1" == "uninstall" (
:uninstall
- rmdir /S /Q %PYTHON%\Lib\site-packages\psutil
- del /F /S /Q %PYTHON%\Lib\site-packages\psutil*
- del /F /S /Q %PYTHON%\Lib\site-packages\_psutil*
+ for %%A in ("%PYTHON%") do (
+ set folder=%%~dpA
+ )
+ for /F "delims=" %%i in ('dir /b %folder%\Lib\site-packages\*psutil*') do (
+ rmdir /S /Q %folder%\Lib\site-packages\%%i
+ )
goto :eof
)
diff --git a/psutil/_psutil_windows.c b/psutil/_psutil_windows.c
index 783ec2bf..0bd44aee 100644
--- a/psutil/_psutil_windows.c
+++ b/psutil/_psutil_windows.c
@@ -3091,7 +3091,7 @@ void init_psutil_windows(void)
}
st = GETSTATE(module);
- st->error = PyErr_NewException("_psutil_mswindow.Error", NULL, NULL);
+ st->error = PyErr_NewException("_psutil_windows.Error", NULL, NULL);
if (st->error == NULL) {
Py_DECREF(module);
INITERROR;
diff --git a/psutil/arch/windows/process_info.c b/psutil/arch/windows/process_info.c
index f0f1c134..8298b16c 100644
--- a/psutil/arch/windows/process_info.c
+++ b/psutil/arch/windows/process_info.c
@@ -4,7 +4,7 @@
* found in the LICENSE file.
*
* Helper functions related to fetching process information. Used by
- * _psutil_mswindows module methods.
+ * _psutil_windows module methods.
*/
#include <Python.h>