Merge pull request python#13 from paulmon/win-arm32-fixes

fix importlib and distutils formatting of platform tag for ARM

Author: paulmon

Lib/_osx_support.py

@@ -38,7 +38,7 @@ def _find_executable(executable, path=None):
     paths = path.split(os.pathsep)
     base, ext = os.path.splitext(executable)
 
-    if (sys.platform.startswith('win')) and (ext != '.exe'):
+    if (sys.platform == 'win32') and (ext != '.exe'):
         executable = executable + '.exe'
 
     if not os.path.isfile(executable):

Lib/_pyio.py

@@ -10,7 +10,7 @@
 import sys
 # Import _thread instead of threading to reduce startup cost
 from _thread import allocate_lock as Lock
-if sys.platform in {'win32', 'win-arm', 'cygwin'}:
+if sys.platform in {'win32', 'cygwin'}:
     from msvcrt import setmode as _setmode
 else:
     _setmode = None

Lib/asyncio/__init__.py

@@ -35,7 +35,7 @@
            tasks.__all__ +
            transports.__all__)
 
-if sys.platform.startswith('win'):  # pragma: no cover
+if sys.platform == 'win32':  # pragma: no cover
     from .windows_events import *
     __all__ += windows_events.__all__
 else:

Lib/asyncio/unix_events.py

@@ -32,7 +32,7 @@
 )
 
 
-if sys.platform.startswith('win'):  # pragma: no cover
+if sys.platform == 'win32':  # pragma: no cover
     raise ImportError('Signals are not really supported on Windows')
 
 

Lib/asyncio/windows_utils.py

@@ -2,7 +2,7 @@
 
 import sys
 
-if not sys.platform.startswith('win'):  # pragma: no cover
+if sys.platform != 'win32':  # pragma: no cover
     raise ImportError('win32 only')
 
 import _winapi

Lib/ctypes/test/test_bytes.py

@@ -52,7 +52,7 @@ class X(Structure):
         self.assertEqual(x.a, "abc")
         self.assertEqual(type(x.a), str)
 
-    @unittest.skipUnless(sys.platform.startswith("win"), 'Windows-specific test')
+    @unittest.skipUnless(sys.platform == "win32", 'Windows-specific test')
     def test_BSTR(self):
         from _ctypes import _SimpleCData
         class BSTR(_SimpleCData):

Lib/ctypes/test/test_find.py

@@ -10,7 +10,7 @@ class Test_OpenGL_libs(unittest.TestCase):
     @classmethod
     def setUpClass(cls):
         lib_gl = lib_glu = lib_gle = None
-        if sys.platform.startswith("win"):
+        if sys.platform == "win32":
             lib_gl = find_library("OpenGL32")
             lib_glu = find_library("Glu32")
         elif sys.platform == "darwin":

Lib/ctypes/test/test_functions.py

@@ -17,7 +17,7 @@
 
 import _ctypes_test
 dll = CDLL(_ctypes_test.__file__)
-if sys.platform.startswith("win"):
+if sys.platform == "win32":
     windll = WinDLL(_ctypes_test.__file__)
 
 class POINT(Structure):
@@ -341,7 +341,7 @@ class S2H(Structure):
         s2h = dll.ret_2h_func(inp)
         self.assertEqual((s2h.x, s2h.y), (99*2, 88*3))
 
-    @unittest.skipUnless(sys.platform.startswith("win"), 'Windows-specific test')
+    @unittest.skipUnless(sys.platform == "win32", 'Windows-specific test')
     def test_struct_return_2H_stdcall(self):
         class S2H(Structure):
             _fields_ = [("x", c_short),
@@ -369,7 +369,7 @@ class S8I(Structure):
         self.assertEqual((s8i.a, s8i.b, s8i.c, s8i.d, s8i.e, s8i.f, s8i.g, s8i.h),
                              (9*2, 8*3, 7*4, 6*5, 5*6, 4*7, 3*8, 2*9))
 
-    @unittest.skipUnless(sys.platform.startswith("win"), 'Windows-specific test')
+    @unittest.skipUnless(sys.platform == "win32", 'Windows-specific test')
     def test_struct_return_8H_stdcall(self):
         class S8I(Structure):
             _fields_ = [("a", c_int),

Lib/ctypes/test/test_pointers.py

@@ -192,7 +192,7 @@ def test_pointers_bool(self):
         self.assertEqual(bool(CFUNCTYPE(None)(42)), True)
 
         # COM methods are boolean True:
-        if sys.platform.startswith("win"):
+        if sys.platform == "win32":
             mth = WINFUNCTYPE(None)(42, "name", (), None)
             self.assertEqual(bool(mth), True)
 

Lib/ctypes/test/test_random_things.py

@@ -5,7 +5,7 @@ def callback_func(arg):
     42 / arg
     raise ValueError(arg)
 
-@unittest.skipUnless(sys.platform.startswith("win"), 'Windows-specific test')
+@unittest.skipUnless(sys.platform == "win32", 'Windows-specific test')
 class call_function_TestCase(unittest.TestCase):
     # _ctypes.call_function is deprecated and private, but used by
     # Gary Bishp's readline module.  If we have it, we must test it as well.

Lib/ctypes/test/test_win32.py

@@ -7,7 +7,7 @@
 import _ctypes_test
 
 # Only windows 32-bit has different calling conventions.
-@unittest.skipUnless(sys.platform.startswith("win"), 'Windows-specific test')
+@unittest.skipUnless(sys.platform == "win32", 'Windows-specific test')
 @unittest.skipUnless(sizeof(c_void_p) == sizeof(c_int),
                      "sizeof c_void_p and c_int differ")
 class WindowsTestCase(unittest.TestCase):
@@ -37,7 +37,7 @@ def test_callconv_2(self):
         # (4 bytes missing) or wrong calling convention
         self.assertRaises(ValueError, IsWindow, None)
 
-@unittest.skipUnless(sys.platform.startswith("win"), 'Windows-specific test')
+@unittest.skipUnless(sys.platform == "win32", 'Windows-specific test')
 class FunctionCallTestCase(unittest.TestCase):
     @unittest.skipUnless('MSC' in sys.version, "SEH only supported by MSC")
     @unittest.skipIf(sys.executable.lower().endswith('_d.exe'),
@@ -56,7 +56,7 @@ def test_noargs(self):
         windll.user32.GetDesktopWindow()
 
 
-@unittest.skipUnless(sys.platform.startswith("win"), 'Windows-specific test')
+@unittest.skipUnless(sys.platform == "win32", 'Windows-specific test')
 class TestWintypes(unittest.TestCase):
     def test_HWND(self):
         from ctypes import wintypes
@@ -80,7 +80,7 @@ def test_COMError(self):
         self.assertEqual(ex.text, "text")
         self.assertEqual(ex.details, ("details",))
 
-@unittest.skipUnless(sys.platform.startswith("win"), 'Windows-specific test')
+@unittest.skipUnless(sys.platform == "win32", 'Windows-specific test')
 class TestWinError(unittest.TestCase):
     def test_winerror(self):
         # see Issue 16169

Lib/distutils/archive_util.py

@@ -115,7 +115,7 @@ def _set_uid_gid(tarinfo):
         warn("'compress' will be deprecated.", PendingDeprecationWarning)
         # the option varies depending on the platform
         compressed_name = archive_name + compress_ext[compress]
-        if sys.platform.startswith('win'):
+        if sys.platform == 'win32':
             cmd = [compress, archive_name, compressed_name]
         else:
             cmd = [compress, '-f', archive_name]

Lib/distutils/command/bdist_wininst.py

@@ -110,7 +110,7 @@ def finalize_options(self):
                       % self.install_script)
 
     def run(self):
-        if (not sys.platform.startswith("win") and
+        if (sys.platform != "win32" and
             (self.distribution.has_ext_modules() or
              self.distribution.has_c_libraries())):
             raise DistutilsPlatformError \

Lib/distutils/command/build_ext.py

@@ -702,7 +702,7 @@ def get_libraries(self, ext):
         # pyconfig.h that MSVC groks.  The other Windows compilers all seem
         # to need it mentioned explicitly, though, so that's what we do.
         # Append '_d' to the python import library on debug builds.
-        if sys.platform.startswith("win"):
+        if sys.platform == "win32":
             from distutils._msvccompiler import MSVCCompiler
             if not isinstance(self.compiler, MSVCCompiler):
                 template = "python%d%d"

Lib/distutils/command/sdist.py

@@ -364,7 +364,7 @@ def prune_file_list(self):
         self.filelist.exclude_pattern(None, prefix=build.build_base)
         self.filelist.exclude_pattern(None, prefix=base_dir)
 
-        if sys.platform.startswith('win'):
+        if sys.platform == 'win32':
             seps = r'/|\\'
         else:
             seps = '/'

Lib/distutils/msvc9compiler.py

@@ -36,7 +36,7 @@
          winreg.HKEY_LOCAL_MACHINE,
          winreg.HKEY_CLASSES_ROOT)
 
-NATIVE_WIN64 = (sys.platform.startswith('win') and sys.maxsize > 2**32)
+NATIVE_WIN64 = (sys.platform == 'win32' and sys.maxsize > 2**32)
 if NATIVE_WIN64:
     # Visual C++ is a 32-bit application, so we need to look in
     # the corresponding registry branch, if we're running a

Lib/distutils/spawn.py

@@ -178,7 +178,7 @@ def find_executable(executable, path=None):
     paths = path.split(os.pathsep)
     base, ext = os.path.splitext(executable)
 
-    if (sys.platform.startswith('win')) and (ext != '.exe'):
+    if (sys.platform == 'win32') and (ext != '.exe'):
         executable = executable + '.exe'
 
     if not os.path.isfile(executable):

Lib/distutils/tests/test_bdist_msi.py

@@ -6,7 +6,7 @@
 from distutils.tests import support
 
 
-SKIP_MESSAGE = (None if sys.platform.startswith("win") and not platform.win32_is_iot() else
+SKIP_MESSAGE = (None if sys.platform == 'win32' and not platform.win32_is_iot() else
                 "These tests require Windows x86 or x64.  Windows IoT Core and nanoserver are not supported")
 
 @unittest.skipUnless(SKIP_MESSAGE is None, SKIP_MESSAGE)

Lib/distutils/tests/test_build_clib.py

@@ -102,7 +102,7 @@ def test_finalize_options(self):
         cmd.distribution.libraries = 'WONTWORK'
         self.assertRaises(DistutilsSetupError, cmd.finalize_options)
 
-    @unittest.skipIf(sys.platform.startswith('win'), "can't test on Windows")
+    @unittest.skipIf(sys.platform == 'win32', "can't test on Windows")
     def test_run(self):
         pkg_dir, dist = self.create_dist()
         cmd = build_clib(dist)

Lib/distutils/tests/test_config_cmd.py

@@ -37,7 +37,7 @@ def test_dump_file(self):
         dump_file(this_file, 'I am the header')
         self.assertEqual(len(self._logs), numlines+1)
 
-    @unittest.skipIf(sys.platform.startswith('win'), "can't test on Windows")
+    @unittest.skipIf(sys.platform == 'win32', "can't test on Windows")
     def test_search_cpp(self):
         cmd = missing_compiler_executable(['preprocessor'])
         if cmd is not None:

Lib/distutils/tests/test_dist.py

@@ -461,7 +461,7 @@ def test_custom_pydistutils(self):
                 self.assertIn(user_filename, files)
 
             # win32-style
-            if sys.platform.startswith('win'):
+            if sys.platform == 'win32':
                 # home drive should be found
                 os.environ['HOME'] = temp_dir
                 files = dist.find_config_files()

Lib/distutils/tests/test_msvc9compiler.py

@@ -91,7 +91,7 @@
   </dependency>
 </assembly>"""
 
-if sys.platform.startswith("win") and not platform.win32_is_iot():
+if sys.platform=="win32" and not platform.win32_is_iot():
     from distutils.msvccompiler import get_build_version
     if get_build_version()>=8.0:
         SKIP_MESSAGE = None

Lib/distutils/tests/test_msvccompiler.py

@@ -9,7 +9,7 @@
 from test.support import run_unittest
 
 
-SKIP_MESSAGE = (None if sys.platform.startswith("win") and not platform.win32_is_iot() else
+SKIP_MESSAGE = (None if sys.platform == "win32" and not platform.win32_is_iot() else
                 "These tests require Windows x86 or x64.  Windows IoT Core and nanoserver are not supported")
 
 @unittest.skipUnless(SKIP_MESSAGE is None, SKIP_MESSAGE)

Lib/distutils/tests/test_spawn.py

@@ -30,7 +30,7 @@ def test_spawn(self):
 
         # creating something executable
         # through the shell that returns 1
-        if not sys.platform.startswith('win'):
+        if sys.platform != 'win32':
             exe = os.path.join(tmpdir, 'foo.sh')
             self.write_file(exe, '#!%s\nexit 1' % unix_shell)
         else:
@@ -41,7 +41,7 @@ def test_spawn(self):
         self.assertRaises(DistutilsExecError, spawn, [exe])
 
         # now something that works
-        if not sys.platform.startswith('win'):
+        if sys.platform != 'win32':
             exe = os.path.join(tmpdir, 'foo.sh')
             self.write_file(exe, '#!%s\nexit 0' % unix_shell)
         else:

Lib/distutils/tests/test_unixccompiler.py

@@ -20,7 +20,7 @@ def tearDown(self):
         sys.platform = self._backup_platform
         sysconfig.get_config_var = self._backup_get_config_var
 
-    @unittest.skipIf(sys.platform.startswith('win'), "can't test on Windows")
+    @unittest.skipIf(sys.platform == 'win32', "can't test on Windows")
     def test_runtime_libdir_option(self):
         # Issue#5900
         #

Lib/distutils/util.py

@@ -38,6 +38,8 @@ def get_platform ():
     if os.name == 'nt':
         if 'amd64' in sys.version.lower():
             return 'win-amd64'
+        if 'arm' in sys.version.lower():
+            return 'win-arm'
         return sys.platform
 
     # Set for cross builds explicitly

Lib/encodings/__init__.py

@@ -155,7 +155,7 @@ def search_function(encoding):
 # Register the search_function in the Python codec registry
 codecs.register(search_function)
 
-if sys.platform.startswith('win'):
+if sys.platform == 'win32':
     def _alias_mbcs(encoding):
         try:
             import _winapi

Lib/idlelib/iomenu.py

@@ -25,7 +25,7 @@
         pass
 
     locale_decode = 'ascii'
-    if sys.platform.startswith('win'):
+    if sys.platform == 'win32':
         # On Windows, we could use "mbcs". However, to give the user
         # a portable encoding name, we need to find the code page
         try:

Lib/idlelib/pyshell.py

@@ -11,7 +11,7 @@
 
 # Valid arguments for the ...Awareness call below are defined in the following.
 # https://msdn.microsoft.com/en-us/library/windows/desktop/dn280512(v=vs.85).aspx
-if sys.platform.startswith('win'):
+if sys.platform == 'win32':
     import ctypes
     PROCESS_SYSTEM_DPI_AWARE = 1
     try:

Lib/idlelib/zoomheight.py

@@ -25,7 +25,7 @@ def zoom_height(top):
         return
     width, height, x, y = map(int, m.groups())
     newheight = top.winfo_screenheight()
-    if sys.platform.startswith('win'):
+    if sys.platform == 'win32':
         newy = 0
         newheight = newheight - 72
 

Lib/locale.py

@@ -547,7 +547,7 @@ def getdefaultlocale(envvars=('LC_ALL', 'LC_CTYPE', 'LANG', 'LANGUAGE')):
         pass
     else:
         # make sure the code/encoding values are valid
-        if sys.platform.startswith("win") and code and code[:2] == "0x":
+        if sys.platform == "win32" and code and code[:2] == "0x":
             # map windows language identifier to language name
             code = windows_locale.get(int(code, 0))
         # ...add other platform-specific processing here, if

Lib/multiprocessing/connection.py

@@ -30,7 +30,7 @@
     import _winapi
     from _winapi import WAIT_OBJECT_0, WAIT_ABANDONED_0, WAIT_TIMEOUT, INFINITE
 except ImportError:
-    if sys.platform.startswith('win'):
+    if sys.platform == 'win32':
         raise
     _winapi = None
 
@@ -51,7 +51,7 @@
     default_family = 'AF_UNIX'
     families += ['AF_UNIX']
 
-if sys.platform.startswith('win'):
+if sys.platform == 'win32':
     default_family = 'AF_PIPE'
     families += ['AF_PIPE']
 
@@ -84,10 +84,10 @@ def _validate_family(family):
     '''
     Checks if the family is valid for the current environment.
     '''
-    if not sys.platform.startswith('win') and family == 'AF_PIPE':
+    if sys.platform != 'win32' and family == 'AF_PIPE':
         raise ValueError('Family %s is not recognized.' % family)
 
-    if sys.platform.startswith('win') and family == 'AF_UNIX':
+    if sys.platform == 'win32' and family == 'AF_UNIX':
         # double check
         if not hasattr(socket, family):
             raise ValueError('Family %s is not recognized.' % family)
@@ -501,7 +501,7 @@ def Client(address, family=None, authkey=None):
     return c
 
 
-if not sys.platform.startswith('win'):
+if sys.platform != 'win32':
 
     def Pipe(duplex=True):
         '''
@@ -623,7 +623,7 @@ def SocketClient(address):
 # Definitions for connections based on named pipes
 #
 
-if sys.platform.startswith('win'):
+if sys.platform == 'win32':
 
     class PipeListener(object):
         '''
@@ -789,7 +789,7 @@ def XmlClient(*args, **kwds):
 # Wait
 #
 
-if sys.platform.startswith('win'):
+if sys.platform == 'win32':
 
     def _exhaustive_wait(handles, timeout):
         # Return ALL handles which are currently signalled.  (Only
@@ -930,7 +930,7 @@ def wait(object_list, timeout=None):
 # Make connection and socket objects sharable if possible
 #
 
-if sys.platform.startswith('win'):
+if sys.platform == 'win32':
     def reduce_connection(conn):
         handle = conn.fileno()
         with socket.fromfd(handle, socket.AF_INET, socket.SOCK_STREAM) as s: