[Python-checkins] cpython (merge 3.2 -> default): merge from 3.2
brian.curtin
python-checkins at python.org
Wed Feb 1 22:25:00 CET 2012
http://hg.python.org/cpython/rev/8ff6930c6ea1
changeset: 74712:8ff6930c6ea1
parent: 74702:056f5cc8885d
parent: 74711:fb225c289bf0
user: Brian Curtin <brian at python.org>
date: Wed Feb 01 15:15:14 2012 -0600
summary:
merge from 3.2
files:
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
--- a/Doc/library/platform.rst
+++ b/Doc/library/platform.rst
@@ -188,8 +188,8 @@
.. 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
--- a/Lib/platform.py
+++ b/Lib/platform.py
@@ -475,7 +475,7 @@
""" 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
--
Repository URL: http://hg.python.org/cpython
More information about the Python-checkins
mailing list