summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSteve Dower <steve.dower@microsoft.com>2016-03-12 16:07:34 (GMT)
committerSteve Dower <steve.dower@microsoft.com>2016-03-12 16:07:34 (GMT)
commit11b3918164fa53be2e9bcebf62f49955fdb5fa5d (patch)
tree2b4af9dd4a8819fb84fbb3c1b0f75fec6ad95f55
parent6e4150f36b74622a23ea0fd259bd61bbd753d3fd (diff)
parent126c9c17efedc6f69d5d86de4b660f3b44e635e4 (diff)
downloadcpython-11b3918164fa53be2e9bcebf62f49955fdb5fa5d.zip
cpython-11b3918164fa53be2e9bcebf62f49955fdb5fa5d.tar.gz
cpython-11b3918164fa53be2e9bcebf62f49955fdb5fa5d.tar.bz2
Issue #26513: Fixes platform module detection of Windows Server
-rwxr-xr-xLib/platform.py2
-rw-r--r--Misc/NEWS2
2 files changed, 3 insertions, 1 deletions
diff --git a/Lib/platform.py b/Lib/platform.py
index f3d2c42..042d39a 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 f18a140..b964244 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -201,6 +201,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.