From b4bef305fd1d40ce4912922c1787db8cddb42a8f Mon Sep 17 00:00:00 2001 From: Brian Curtin Date: Wed, 1 Feb 2012 15:17:39 -0600 Subject: [PATCH] merge from fb225c289bf0 --- Doc/library/platform.rst | 4 ++-- Lib/platform.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Doc/library/platform.rst b/Doc/library/platform.rst index 49c617f191c..26f587eaf3c 100644 --- a/Doc/library/platform.rst +++ b/Doc/library/platform.rst @@ -197,8 +197,8 @@ Windows Platform .. function:: win32_ver(release='', version='', csd='', ptype='') Get additional version information from the Windows Registry and return a tuple - ``(version, csd, ptype)`` referring to version number, CSD level and OS type - (multi/single processor). + ``(version, csd, ptype)`` referring to version number, CSD level + (service pack) and OS type (multi/single processor). As a hint: *ptype* is ``'Uniprocessor Free'`` on single processor NT machines and ``'Multiprocessor Free'`` on multi processor machines. The *'Free'* refers diff --git a/Lib/platform.py b/Lib/platform.py index 20f8dc6e7a1..d20c39d9a7c 100755 --- a/Lib/platform.py +++ b/Lib/platform.py @@ -554,7 +554,7 @@ def win32_ver(release='',version='',csd='',ptype=''): """ Get additional version information from the Windows Registry and return a tuple (version,csd,ptype) referring to version - number, CSD level and OS type (multi/single + number, CSD level (service pack), and OS type (multi/single processor). As a hint: ptype returns 'Uniprocessor Free' on single