[Python-checkins] cpython (merge 3.5 -> default): Issue #26513: Fixes platform module detection of Windows Server

[steve.dower]

https://hg.python.org/cpython/rev/fabbfad67362
changeset:   100503:fabbfad67362
parent:      100500:a7093386efaf
parent:      100501:5564cf3ba523
user:        Steve Dower <steve.dower at microsoft.com>
date:        Sat Mar 12 08:07:34 2016 -0800
summary:
  Issue #26513: Fixes platform module detection of Windows Server

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


diff --git a/Lib/platform.py b/Lib/platform.py
--- a/Lib/platform.py
+++ b/Lib/platform.py
@@ -588,7 +588,7 @@
                 csd = 'SP' + csd[13:]
 
     # VER_NT_SERVER = 3
-    if getattr(winver, 'product_type', None) == 3:
+    if getattr(winver, 'product', None) == 3:
         release = (_WIN32_SERVER_RELEASES.get((maj, min)) or
                    _WIN32_SERVER_RELEASES.get((maj, None)) or
                    release)
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -201,6 +201,8 @@
 Library
 -------
 
+- Issue #26513: Fixes platform module detection of Windows Server
+
 - Issue #23718: Fixed parsing time in week 0 before Jan 1.  Original patch by
   Tamás Bence Gedai.
 

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