From: Steve Dower <steve.dower@microsoft.com>
Date: Sat, 12 Mar 2016 16:06:23 +0000 (-0800)
Subject: Issue #26513: Fixes platform module detection of Windows Server
X-Git-Tag: v3.6.0a1~495^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=126c9c17efedc6f69d5d86de4b660f3b44e635e4;p=thirdparty%2FPython%2Fcpython.git

Issue #26513: Fixes platform module detection of Windows Server
---

diff --git a/Lib/platform.py b/Lib/platform.py
index f3d2c423875a..042d39a50f64 100755
--- a/Lib/platform.py
+++ b/Lib/platform.py
@@ -588,7 +588,7 @@ def win32_ver(release='', version='', csd='', ptype=''):
                 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
index b5c34be6a1d4..f57aab197552 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -91,6 +91,8 @@ Core and Builtins
 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.