summaryrefslogtreecommitdiff
path: root/Lib/platform.py
diff options
context:
space:
mode:
authorBrian Curtin <brian@python.org>2012-02-01 15:24:10 -0600
committerBrian Curtin <brian@python.org>2012-02-01 15:24:10 -0600
commit090ec3c7fccbb7d5ddc026043b84a56be011adf5 (patch)
tree4b91703d0b26fccd78099ab35cffc9fb94d11602 /Lib/platform.py
parent023fe334bbb61fd4912dd6f3e02e19528333ac62 (diff)
parent10dda6e029b70aa95c51fe7ba2a61b729527c73b (diff)
downloadcpython-git-090ec3c7fccbb7d5ddc026043b84a56be011adf5.tar.gz
merge. again.
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 e04bcb4ef6..985a9f85cb 100755
--- a/Lib/platform.py
+++ b/Lib/platform.py
@@ -549,7 +549,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