code review cleanup

paulmon · Dec 14, 2018 · 91c3864 · 91c3864
1 parent cfd2cf1
commit 91c3864
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 7 deletions.
diff --git a/Lib/distutils/tests/test_bdist_wininst.py b/Lib/distutils/tests/test_bdist_wininst.py
@@ -8,7 +8,6 @@
 
 @unittest.skipIf(getattr(bdist_wininst, '_unsupported', False),
     'bdist_wininst is not supported in this install')
-@unittest.skipIf(platform.win32_is_iot(), "These tests don't work on Windows IoT Core or nanoserver")
 class BuildWinInstTestCase(support.TempdirManager,
                            support.LoggingSilencer,
                            unittest.TestCase):

diff --git a/Modules/_ctypes/callproc.c b/Modules/_ctypes/callproc.c
@@ -781,7 +781,7 @@ static int _call_function_pointer(int flags,
     int *space;
     ffi_cif cif;
     int cc;
-#ifdef MS_WIN32
+#if defined(MS_WIN32) && !defined(_M_ARM)
     int delta;
 #ifndef DONT_USE_SEH
     DWORD dwExceptionCode = 0;
@@ -831,11 +831,9 @@ static int _call_function_pointer(int flags,
 #ifndef DONT_USE_SEH
     __try {
 #endif
-#ifdef _M_ARM
-        delta = 0;
-#else
+#ifndef _M_ARM
         delta =
-#endif // _M_ARM
+#endif
 #endif
                 ffi_call(&cif, (void *)pProc, resmem, avalues);
 #ifdef MS_WIN32
@@ -875,6 +873,7 @@ static int _call_function_pointer(int flags,
         return -1;
     }
 #else
+#ifndef _M_ARM
     if (delta < 0) {
         if (flags & FUNCFLAG_CDECL)
             PyErr_Format(PyExc_ValueError,
@@ -896,6 +895,7 @@ static int _call_function_pointer(int flags,
         return -1;
     }
 #endif
+#endif
 #endif
     if ((flags & FUNCFLAG_PYTHONAPI) && PyErr_Occurred())
         return -1;

diff --git a/Tools/winiot/sync_win_iot.py b/Tools/winiot/sync_win_iot.py
@@ -122,7 +122,7 @@ def include_in_tools(p):
 
     return p.suffix.lower() in {'.py', '.pyw', '.txt'}
 
-BASE_NAME = 'python{0.major}{0.minor}'.format(sys.version_info)
+BASE_NAME = 'python??'
 
 FULL_LAYOUT = [
     ('/', '$source', 'python.exe', is_not_debug),