fixup merge conflict

Author: ammgws

Lib/subprocess.py

@@ -1631,7 +1631,6 @@ def _execute_child(self, args, executable, preexec_fn, close_fds,
                            unused_restore_signals,
                            unused_gid, unused_gids, unused_uid,
                            unused_umask,
-                           unused_start_new_session,
                            unused_start_new_session, unused_process_group,
                            force_hide):
             """Execute program (MS Windows version)"""
@@ -2024,7 +2023,6 @@ def _execute_child(self, args, executable, preexec_fn, close_fds,
                            errread, errwrite,
                            restore_signals,
                            gid, gids, uid, umask,
-                           start_new_session,
                            start_new_session, process_group,
                            unused_force_hide):
             """Execute program (POSIX version)"""

Lib/test/test_subprocess.py

@@ -3818,10 +3818,14 @@ def spy(*args):
     # CREATE_NEW_CONSOLE creates a "popup" window.
     @support.requires_resource('gui')
     def test_creationflags(self):
+        # creationflags argument
+        CREATE_NEW_CONSOLE = 16
         sys.stderr.write("    a DOS box should flash briefly ...\n")
-        subprocess.call(sys.executable +
-                        ' -c "import time; time.sleep(0.25)"',
-                        creationflags=subprocess.CREATE_NEW_CONSOLE)
+        rc = subprocess.call(sys.executable +
+                             ' -c "import time; time.sleep(0.25)"',
+                             creationflags=CREATE_NEW_CONSOLE)
+        support.skip_on_low_desktop_heap_memory_subprocess(rc)
+        self.assertEqual(rc, 0)
 
     def test_force_hide(self):
         if ctypes:
@@ -3834,10 +3838,6 @@ def test_force_hide(self):
         else:
             script = 'import sys; sys.exit(0)'
         rc = subprocess.call([sys.executable, '-c', script], force_hide=True)
-        rc = subprocess.call(sys.executable +
-                             ' -c "import time; time.sleep(0.25)"',
-                             creationflags=CREATE_NEW_CONSOLE)
-        support.skip_on_low_desktop_heap_memory_subprocess(rc)
         self.assertEqual(rc, 0)
 
     def test_invalid_args(self):