Merge pull request python#12 from paulmon/win32-arm-nanoserver

Windows arm32 - fix failing tests or skip

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 == 'win32') and (ext != '.exe'):
+    if (sys.platform.startswith('win')) 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', 'cygwin'}:
+if sys.platform in {'win32', 'win-arm', '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 == 'win32':  # pragma: no cover
+if sys.platform.startswith('win'):  # pragma: no cover
     from .windows_events import *
     __all__ += windows_events.__all__
 else:

Lib/asyncio/unix_events.py

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

Lib/asyncio/windows_utils.py

@@ -2,7 +2,7 @@
 
 import sys
 
-if sys.platform != 'win32':  # pragma: no cover
+if not sys.platform.startswith('win'):  # 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 == "win32", 'Windows-specific test')
+    @unittest.skipUnless(sys.platform.startswith("win"), '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 == "win32":
+        if sys.platform.startswith("win"):
             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 == "win32":
+if sys.platform.startswith("win"):
     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 == "win32", 'Windows-specific test')
+    @unittest.skipUnless(sys.platform.startswith("win"), '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 == "win32", 'Windows-specific test')
+    @unittest.skipUnless(sys.platform.startswith("win"), '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 == "win32":
+        if sys.platform.startswith("win"):
             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 == "win32", 'Windows-specific test')
+@unittest.skipUnless(sys.platform.startswith("win"), '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.