[Python-checkins] cpython (merge 2.7 -> 2.7): merge.

brian.curtin python-checkins at python.org
Wed Feb 1 22:25:03 CET 2012


http://hg.python.org/cpython/rev/2c3f5556128c
changeset:   74715:2c3f5556128c
branch:      2.7
parent:      74709:93ac4b12a750
parent:      74713:822d362ab48f
user:        Brian Curtin <brian at python.org>
date:        Wed Feb 01 15:22:50 2012 -0600
summary:
  merge.

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
@@ -197,8 +197,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
@@ -554,7 +554,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