Address code review feedback

zooba · Apr 25, 2019 · Aug 2, 2018 · Apr 19, 2019 · Apr 19, 2019 · Apr 22, 2019
commit 77d776efcc3234ede100576cb0a0a7501804afab
diff --git a/Doc/library/platform.rst b/Doc/library/platform.rst
@@ -222,11 +222,15 @@ Windows Platform
    values include but are not limited to ``'Enterprise'``, ``'IoTUAP'``,
    ``'ServerStandard'``, and ``'nanoserver'``.
 
+   .. versionadded:: 3.8
+
 .. function:: win32_is_iot()
 
-   Returns True if the windows edition returned by win32_edition is recognized 
+   Returns True if the windows edition returned by win32_edition is recognized
    as an IoT edition.
 
+   .. versionadded:: 3.8
+
 
 Mac OS Platform
 ---------------

diff --git a/Lib/distutils/sysconfig.py b/Lib/distutils/sysconfig.py
@@ -450,15 +450,7 @@ def _init_nt():
     # XXX hmmm.. a normal install puts include files here
     g['INCLUDEPY'] = get_python_inc(plat_specific=0)
 
-    # if cross-compiling replace hardcoded platform-specific EXT_SUFFIX
-    # with an EXT_SUFFIX that matches the target platform
-    if get_platform() == get_host_platform():
-        g['EXT_SUFFIX'] = _imp.extension_suffixes()[0]
-    else:
-        plat_tag = get_platform().replace('-', '_')
-        host_plat_tag = get_host_platform().replace('-', '_')
-        g['EXT_SUFFIX'] = _imp.extension_suffixes()[0].replace(host_plat_tag, plat_tag)
-
+    g['EXT_SUFFIX'] = _imp.extension_suffixes()[0]
     g['EXE'] = ".exe"
     g['VERSION'] = get_python_version().replace(".", "")
     g['BINDIR'] = os.path.dirname(os.path.abspath(sys.executable))

diff --git a/Lib/distutils/util.py b/Lib/distutils/util.py
@@ -15,7 +15,7 @@
 from distutils import log
 from distutils.errors import DistutilsByteCompileError
 
-def get_host_platform ():
+def get_host_platform():
     """Return a string that identifies the current platform.  This is used mainly to
     distinguish platform-specific build directories and platform-specific built
     distributions.  Typically includes the OS name and version and the
@@ -92,25 +92,17 @@ def get_host_platform ():
 
     return "%s-%s-%s" % (osname, release, machine)
 
-# get_host_platform ()
-
-def get_platform ():
+def get_platform():
     TARGET_TO_PLAT = {
         'x86' : 'win32',
         'x64' : 'win-amd64',
         'arm' : 'win-arm32',
     }
 
-    targetPlatformFromEnvironment = os.environ.get('VSCMD_ARG_TGT_ARCH')
-
-    if targetPlatformFromEnvironment != None and targetPlatformFromEnvironment in TARGET_TO_PLAT:
-        targetPlatform = TARGET_TO_PLAT[targetPlatformFromEnvironment]
+    if os.name == 'nt':
+        return TARGET_TO_PLAT.get(os.environ.get('VSCMD_ARG_TGT_ARCH')) or get_host_platform()
     else:
-        targetPlatform = get_host_platform()
-
-    return targetPlatform
-
-# get_platform ()
+        return get_host_platform()
 
 def convert_path (pathname):
     """Return 'pathname' as a name that will work on the native filesystem,

diff --git a/Lib/platform.py b/Lib/platform.py
@@ -343,16 +343,12 @@ def win32_edition():
     except ImportError:
         from _winreg import OpenKeyEx, QueryValueEx, CloseKey, HKEY_LOCAL_MACHINE
 
-    key = None
     try:
-        key = OpenKeyEx(HKEY_LOCAL_MACHINE,
-                        r'SOFTWARE\Microsoft\Windows NT\CurrentVersion')
-        return QueryValueEx(key, 'EditionId')[0]
+        with OpenKeyEx(HKEY_LOCAL_MACHINE,
+                       r'SOFTWARE\Microsoft\Windows NT\CurrentVersion') as key:
+            return QueryValueEx(key, 'EditionId')[0]
     except OSError:
         pass
-    finally:
-        if key:
-            CloseKey(key)
 
     return None
 

diff --git a/Lib/test/test_codecs.py b/Lib/test/test_codecs.py
@@ -29,7 +29,7 @@ def check(input, expect):
 
 # On small versions of Windows like Windows IoT or Windows Nano Server not all codepages are present
 def is_code_page_present(cp):
-    from ctypes import POINTER, WINFUNCTYPE, windll, WinError, Structure
+    from ctypes import POINTER, WINFUNCTYPE, windll, WinError, Structure, WinDLL
     from ctypes.wintypes import BOOL, UINT, BYTE, WCHAR, UINT, DWORD
 
     MAX_LEADBYTES = 12  # 5 ranges, 2 bytes ea., 0 term.
@@ -44,22 +44,9 @@ class CPINFOEXW(ctypes.Structure):
                     ("CodePageName", WCHAR*MAX_PATH)]
 
     prototype = WINFUNCTYPE(BOOL, UINT, DWORD, POINTER(CPINFOEXW))
-    GetCPInfoEx = prototype(("GetCPInfoExW", windll.kernel32))
-
-    def errcheck(result, func, args):
-        if not result:
-            from ctypes import WinError
-            raise OSError(2, "code page not found")
-        return args
-
-    from ctypes import WinError
-    try:
-        GetCPInfoEx.errcheck = errcheck
-        info = CPINFOEXW()
-        GetCPInfoEx(cp,0, info)
-        return True
-    except OSError:
-        return False
+    GetCPInfoEx = prototype(("GetCPInfoExW", WinDLL("kernel32")))
+    info = CPINFOEXW()
+    return GetCPInfoEx(cp, 0, info)
 
 class Queue(object):
     """
@@ -3120,12 +3107,10 @@ def test_code_page_decode_flags(self):
             # A missing codepage causes an OSError exception
             # so check for the codepage before decoding
             if is_code_page_present(cp):
-                if support.verbose:
-                    sys.stdout.write("  testing cp={}\n".format(cp))
-                self.assertEqual(codecs.code_page_decode(cp, b'abc'), ('abc', 3))
+                self.assertEqual(codecs.code_page_decode(cp, b'abc'), ('abc', 3), f'cp{cp}')
             else:
                 if support.verbose:
-                    sys.stdout.write("  skipping cp={}\n".format(cp))
+                    print(f"  skipping cp={cp}")
         self.assertEqual(codecs.code_page_decode(42, b'abc'),
                          ('\uf061\uf062\uf063', 3))
 

diff --git a/Lib/test/test_mimetypes.py b/Lib/test/test_mimetypes.py
@@ -117,7 +117,8 @@ def tearDown(self):
         mimetypes.types_map.clear()
         mimetypes.types_map.update(self.original_types_map)
 
-    @unittest.skipIf(win32_edition() in ('NanoServer', 'WindowsCoreHeadless', 'IoTEdgeOS'), "mime types registry keys not available on NanoServer")
+    @unittest.skipIf(win32_edition() in ('NanoServer', 'WindowsCoreHeadless', 'IoTEdgeOS'),
+                                         "MIME types registry keys unavailable")
     def test_registry_parsing(self):
         # the original, minimum contents of the MIME database in the
         # Windows registry is undocumented AFAIK.