diff --git a/Doc/library/time.rst b/Doc/library/time.rst index ccbb3f37877b2c..612af749c3ecaf 100644 --- a/Doc/library/time.rst +++ b/Doc/library/time.rst @@ -293,14 +293,6 @@ Functions The reference point of the returned value is undefined, so that only the difference between the results of consecutive calls is valid. - On Windows versions older than Vista, :func:`monotonic` detects - :c:func:`GetTickCount` integer overflow (32 bits, roll-over after 49.7 days). - It increases an internal epoch (reference time) by 2\ :sup:`32` each time - that an overflow is detected. The epoch is stored in the process-local state - and so the value of :func:`monotonic` may be different in two Python - processes running for more than 49 days. On more recent versions of Windows - and on other operating systems, :func:`monotonic` is system-wide. - .. versionadded:: 3.3 .. versionchanged:: 3.5 The function is now always available. diff --git a/Doc/using/windows.rst b/Doc/using/windows.rst index cc560d968a1de9..cb6c43522a5147 100644 --- a/Doc/using/windows.rst +++ b/Doc/using/windows.rst @@ -29,7 +29,8 @@ Supported Versions As specified in :pep:`11`, a Python release only supports a Windows platform while Microsoft considers the platform under extended support. This means that -Python |version| supports Windows Vista and newer. If you require Windows XP +Python |version| supports Windows 7 and newer. If you require Windows Vista +support then please install Python 3.6. If you require Windows XP support then please install Python 3.4. Installation Steps diff --git a/Misc/NEWS.d/next/Windows/2018-01-18-10-39-37.bpo-32592.EPqtd6.rst b/Misc/NEWS.d/next/Windows/2018-01-18-10-39-37.bpo-32592.EPqtd6.rst new file mode 100644 index 00000000000000..5b4890890eb27b --- /dev/null +++ b/Misc/NEWS.d/next/Windows/2018-01-18-10-39-37.bpo-32592.EPqtd6.rst @@ -0,0 +1,3 @@ +Drop support for Windows Vista. Windows Vista extended support ended in +April 2017. As stated in :pep:`11`, Python 3.7 drops support for Windows +Vista and now requires Windows 7 or newer. diff --git a/Modules/posixmodule.c b/Modules/posixmodule.c index b0e48dabbd55cf..52ed76ae697a60 100644 --- a/Modules/posixmodule.c +++ b/Modules/posixmodule.c @@ -11153,22 +11153,7 @@ os_cpu_count_impl(PyObject *module) { int ncpu = 0; #ifdef MS_WINDOWS - /* Vista is supported and the GetMaximumProcessorCount API is Win7+ - Need to fallback to Vista behavior if this call isn't present */ - HINSTANCE hKernel32; - hKernel32 = GetModuleHandleW(L"KERNEL32"); - - static DWORD(CALLBACK *_GetMaximumProcessorCount)(WORD) = NULL; - *(FARPROC*)&_GetMaximumProcessorCount = GetProcAddress(hKernel32, - "GetMaximumProcessorCount"); - if (_GetMaximumProcessorCount != NULL) { - ncpu = _GetMaximumProcessorCount(ALL_PROCESSOR_GROUPS); - } - else { - SYSTEM_INFO sysinfo; - GetSystemInfo(&sysinfo); - ncpu = sysinfo.dwNumberOfProcessors; - } + ncpu = GetMaximumProcessorCount(ALL_PROCESSOR_GROUPS); #elif defined(__hpux) ncpu = mpctl(MPC_GETNUMSPUS, NULL, NULL); #elif defined(HAVE_SYSCONF) && defined(_SC_NPROCESSORS_ONLN) diff --git a/PCbuild/readme.txt b/PCbuild/readme.txt index d28435b4c4d7d9..3a26116429f140 100644 --- a/PCbuild/readme.txt +++ b/PCbuild/readme.txt @@ -14,7 +14,7 @@ Building Python using Microsoft Visual C++ ------------------------------------------ This directory is used to build CPython for Microsoft Windows NT version -6.0 or higher (Windows Vista, Windows Server 2008, or later) on 32 and 64 +6.1 or higher (Windows 7 or later) on 32 and 64 bit platforms. Using this directory requires an installation of Microsoft Visual Studio 2017 (MSVC 14.1) with the *Python workload* and its optional *Python native development* component selected. (For