Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

merge.

This commit is contained in:
Brian Curtin 2012-02-01 15:22:50 -06:00
parent 0518f470b1 b4bef305fd
commit 3c8807bd5e
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Doc/library/platform.rst
View File

@ -197,8 +197,8 @@ Windows Platform
.. function:: win32_ver(release='', version='', csd='', ptype='') .. function:: win32_ver(release='', version='', csd='', ptype='')
Get additional version information from the Windows Registry and return a tuple Get additional version information from the Windows Registry and return a tuple
``(version, csd, ptype)`` referring to version number, CSD level and OS type ``(version, csd, ptype)`` referring to version number, CSD level
(multi/single processor). (service pack) and OS type (multi/single processor).
As a hint: *ptype* is ``'Uniprocessor Free'`` on single processor NT machines As a hint: *ptype* is ``'Uniprocessor Free'`` on single processor NT machines
and ``'Multiprocessor Free'`` on multi processor machines. The *'Free'* refers and ``'Multiprocessor Free'`` on multi processor machines. The *'Free'* refers

2
Lib/platform.py
View File

@ -554,7 +554,7 @@ def win32_ver(release='',version='',csd='',ptype=''):
""" Get additional version information from the Windows Registry """ Get additional version information from the Windows Registry
and return a tuple (version,csd,ptype) referring to version 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). processor).
As a hint: ptype returns 'Uniprocessor Free' on single As a hint: ptype returns 'Uniprocessor Free' on single