diff options
| author | Steve Dower <steve.dower@microsoft.com> | 2016-03-12 16:06:23 (GMT) |
|---|---|---|
| committer | Steve Dower <steve.dower@microsoft.com> | 2016-03-12 16:06:23 (GMT) |
| commit | 126c9c17efedc6f69d5d86de4b660f3b44e635e4 (patch) | |
| tree | b2d50c958405389ebcf0b4be944a407ecd027837 | |
| parent | 8a7240eeed609f747bdf38985679816ed9f61a0e (diff) | |
| download | cpython-126c9c17efedc6f69d5d86de4b660f3b44e635e4.zip cpython-126c9c17efedc6f69d5d86de4b660f3b44e635e4.tar.gz cpython-126c9c17efedc6f69d5d86de4b660f3b44e635e4.tar.bz2 | |
Issue #26513: Fixes platform module detection of Windows Server
| -rwxr-xr-x | Lib/platform.py | 2 | ||||
| -rw-r--r-- | Misc/NEWS | 2 |
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) @@ -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. |