diff options
| author | Brian Curtin <brian@python.org> | 2012-02-01 15:17:39 -0600 |
|---|---|---|
| committer | Brian Curtin <brian@python.org> | 2012-02-01 15:17:39 -0600 |
| commit | b4bef305fd1d40ce4912922c1787db8cddb42a8f (patch) | |
| tree | 8d9683ec6cd04710592bbaf00fb37ad753a62410 | |
| parent | 1d4ae48f48b2da82a89769a714644eb55a541888 (diff) | |
| download | cpython-git-b4bef305fd1d40ce4912922c1787db8cddb42a8f.tar.gz | |
merge from fb225c289bf0
| -rw-r--r-- | Doc/library/platform.rst | 4 | ||||
| -rwxr-xr-x | Lib/platform.py | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/Doc/library/platform.rst b/Doc/library/platform.rst index 49c617f191..26f587eaf3 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 20f8dc6e7a..d20c39d9a7 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 |