diff options
| author | Brian Curtin <brian@python.org> | 2012-02-01 21:22:50 (GMT) |
|---|---|---|
| committer | Brian Curtin <brian@python.org> | 2012-02-01 21:22:50 (GMT) |
| commit | 3c8807bd5e29139728ea1532d330a767f373bc00 (patch) | |
| tree | 7d5086c658be4ab44457bf4117dfd34ccad52988 | |
| parent | 0518f470b1bb99b0b8878224942ebf1e18d1e74f (diff) | |
| parent | b4bef305fd1d40ce4912922c1787db8cddb42a8f (diff) | |
| download | cpython-3c8807bd5e29139728ea1532d330a767f373bc00.zip cpython-3c8807bd5e29139728ea1532d330a767f373bc00.tar.gz cpython-3c8807bd5e29139728ea1532d330a767f373bc00.tar.bz2 | |
merge.
| -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 49c617f..26f587e 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 20f8dc6..d20c39d 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 |