[Python-checkins] cpython (merge 3.2 -> default): Merge 3.2

[brian.curtin]

http://hg.python.org/cpython/rev/2802b26c64a9
changeset:   79670:2802b26c64a9
parent:      79667:c3c188a0325a
parent:      79668:8245333db1e5
user:        Brian Curtin <brian at python.org>
date:        Thu Oct 11 16:12:47 2012 -0500
summary:
  Merge 3.2

files:
  Lib/platform.py |  7 ++++++-
  Misc/NEWS       |  2 ++
  2 files changed, 8 insertions(+), 1 deletions(-)


diff --git a/Lib/platform.py b/Lib/platform.py
--- a/Lib/platform.py
+++ b/Lib/platform.py
@@ -595,8 +595,13 @@
                     release = '7'
                 else:
                     release = '2008ServerR2'
+            elif min == 2:
+                if product_type == VER_NT_WORKSTATION:
+                    release = '8'
+                else:
+                    release = '2012Server'
             else:
-                release = 'post2008Server'
+                release = 'post2012Server'
 
     else:
         if not release:
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -45,6 +45,8 @@
 Library
 -------
 
+- Issue #16176: Properly identify Windows 8 via platform.platform()
+
 - Issue #16088: BaseHTTPRequestHandler's send_error method includes a
   Content-Length header in it's response now. Patch by Antoine Pitrou.
 

-- 
Repository URL: http://hg.python.org/cpython