summaryrefslogtreecommitdiffstats
path: root/Lib/platform.py
diff options
context:
space:
mode:
authorBrian Curtin <brian@python.org>2012-02-01 21:15:14 (GMT)
committerBrian Curtin <brian@python.org>2012-02-01 21:15:14 (GMT)
commit8d132c88c2dd8a19f8accd9ef3d4c8f33d2a9a6b (patch)
treeeb51892fe327c00c2ff15252412ac633f1bfa964 /Lib/platform.py
parented27785b32f11e815f1029b6b9e393b5c16a7660 (diff)
parent10dda6e029b70aa95c51fe7ba2a61b729527c73b (diff)
downloadcpython-8d132c88c2dd8a19f8accd9ef3d4c8f33d2a9a6b.zip
cpython-8d132c88c2dd8a19f8accd9ef3d4c8f33d2a9a6b.tar.gz
cpython-8d132c88c2dd8a19f8accd9ef3d4c8f33d2a9a6b.tar.bz2
merge from 3.2
Diffstat (limited to 'Lib/platform.py')
-rwxr-xr-xLib/platform.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/Lib/platform.py b/Lib/platform.py
index 172722e..4554659 100755
--- a/Lib/platform.py
+++ b/Lib/platform.py
@@ -475,7 +475,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