merge

diff --cc Lib/subprocess.py
index b3fb9355c9bd3ea032ed009ab44f18ac074b6127,299f73e711a8d3588c7df275d441f6a740202a6d..9856e6a3330684d290f7de2d40742e0fc1b50359
--- 1/Lib/subprocess.py
--- 2/Lib/subprocess.py
+++ b/Lib/subprocess.py
@@@ -415,8 -371,15 +415,15 @@@ __all__ = ["Popen", "PIPE", "STDOUT", "
             "getoutput", "check_output", "CalledProcessError"]
  
  if mswindows:
-     from _subprocess import CREATE_NEW_CONSOLE, CREATE_NEW_PROCESS_GROUP
-     __all__.extend(["CREATE_NEW_CONSOLE", "CREATE_NEW_PROCESS_GROUP"])
 -    from _subprocess import (CREATE_NEW_CONSOLE,
++    from _subprocess import (CREATE_NEW_CONSOLE, CREATE_NEW_PROCESS_GROUP,
+                              STD_INPUT_HANDLE, STD_OUTPUT_HANDLE,
+                              STD_ERROR_HANDLE, SW_HIDE,
+                              STARTF_USESTDHANDLES, STARTF_USESHOWWINDOW)
+                 
 -    __all__.extend(["CREATE_NEW_CONSOLE",
++    __all__.extend(["CREATE_NEW_CONSOLE", "CREATE_NEW_PROCESS_GROUP",
+                     "STD_INPUT_HANDLE", "STD_OUTPUT_HANDLE",
+                     "STD_ERROR_HANDLE", "SW_HIDE",
+                     "STARTF_USESTDHANDLES", "STARTF_USESHOWWINDOW"])
  try:
      MAXFD = os.sysconf("SC_OPEN_MAX")
  except: