diff options
| author | Giampaolo Rodola <g.rodola@gmail.com> | 2020-01-02 18:56:02 +0100 |
|---|---|---|
| committer | Giampaolo Rodola <g.rodola@gmail.com> | 2020-01-02 18:56:02 +0100 |
| commit | ac61e733137dbd392635a8573db58c58207eb671 (patch) | |
| tree | 09d7742933f9c303e1ed5d2c63a6c3997c6d8cc8 | |
| parent | 2665d3a7e578dd87e33731b1ab289ac8b89964e9 (diff) | |
| download | psutil-ac61e733137dbd392635a8573db58c58207eb671.tar.gz | |
#1652: also drop support for Windows Server 2003
| -rw-r--r-- | HISTORY.rst | 4 | ||||
| -rw-r--r-- | docs/index.rst | 5 | ||||
| -rw-r--r-- | psutil/_psutil_windows.c | 4 | ||||
| -rw-r--r-- | psutil/arch/windows/global.c | 6 | ||||
| -rw-r--r-- | psutil/arch/windows/global.h | 1 |
5 files changed, 5 insertions, 15 deletions
diff --git a/HISTORY.rst b/HISTORY.rst index f367db3e..d112ccc2 100644 --- a/HISTORY.rst +++ b/HISTORY.rst @@ -9,8 +9,8 @@ XXXX-XX-XX - 1648_: [Linux] sensors_temperatures() looks into an additional /sys/device/ directory for additional data. (patch by Javad Karabi) -- 1652_: [Windows] dropped Windows XP support. Minumum supported client now is - Windows Vista. +- 1652_: [Windows] dropped support for Windows XP and Windows Server 2003. + Minimum supported Windows version now is Windows Vista. **Bug fixes** diff --git a/docs/index.rst b/docs/index.rst index 877ffcbf..dc025642 100644 --- a/docs/index.rst +++ b/docs/index.rst @@ -2619,9 +2619,8 @@ These are the platforms I develop and test on: Earlier versions are supposed to work but are not tested. For Linux, Windows and MacOS we have continuos integration. Other platforms are tested manually from time to time. -Oldest supported Windows version is Windows XP, which can be compiled from -sources. Latest wheel supporting Windows XP is -`psutil 2.1.3 <https://pypi.org/project/psutil/2.1.3/#files>`__. +Minimum supported Windows version is Windows Vista (Windows XP and Windows +Server 2003 are not supported). Supported Python versions are 3.4+, 2.7 and 2.6. FAQs diff --git a/psutil/_psutil_windows.c b/psutil/_psutil_windows.c index b572f0e1..5ab41695 100644 --- a/psutil/_psutil_windows.c +++ b/psutil/_psutil_windows.c @@ -3173,10 +3173,6 @@ void init_psutil_windows(void) PyModule_AddIntConstant( module, "WINVER", PSUTIL_WINVER); PyModule_AddIntConstant( - module, "WINDOWS_XP", PSUTIL_WINDOWS_XP); - PyModule_AddIntConstant( - module, "WINDOWS_SERVER_2003", PSUTIL_WINDOWS_SERVER_2003); - PyModule_AddIntConstant( module, "WINDOWS_VISTA", PSUTIL_WINDOWS_VISTA); PyModule_AddIntConstant( module, "WINDOWS_7", PSUTIL_WINDOWS_7); diff --git a/psutil/arch/windows/global.c b/psutil/arch/windows/global.c index a09bb337..1aafcdd1 100644 --- a/psutil/arch/windows/global.c +++ b/psutil/arch/windows/global.c @@ -193,11 +193,7 @@ psutil_set_winver() { psutil_RtlGetVersion((PRTL_OSVERSIONINFOW)&versionInfo); maj = versionInfo.dwMajorVersion; min = versionInfo.dwMinorVersion; - if (maj == 5 && min == 1) - PSUTIL_WINVER = PSUTIL_WINDOWS_XP; - else if (maj == 5 && min == 2) - PSUTIL_WINVER = PSUTIL_WINDOWS_SERVER_2003; - else if (maj == 6 && min == 0) + if (maj == 6 && min == 0) PSUTIL_WINVER = PSUTIL_WINDOWS_VISTA; // or Server 2008 else if (maj == 6 && min == 1) PSUTIL_WINVER = PSUTIL_WINDOWS_7; diff --git a/psutil/arch/windows/global.h b/psutil/arch/windows/global.h index d7a35b31..4cf77cde 100644 --- a/psutil/arch/windows/global.h +++ b/psutil/arch/windows/global.h @@ -11,7 +11,6 @@ extern int PSUTIL_WINVER; extern SYSTEM_INFO PSUTIL_SYSTEM_INFO; -#define PSUTIL_WINDOWS_SERVER_2003 52 #define PSUTIL_WINDOWS_VISTA 60 #define PSUTIL_WINDOWS_7 61 #define PSUTIL_WINDOWS_8 62 |