From cb6fdf2c63961e8b9111357ca57c3de27d029820 Mon Sep 17 00:00:00 2001
From: "Gregory P. Smith" <greg@krypto.org>
Date: Tue, 7 Apr 2015 16:11:33 -0700
Subject: [PATCH] issue10838: Rename the subprocess.mswindows internal global
 to _mswindows. It is internal only, not a documented API.

---
 Lib/subprocess.py           | 12 ++++++------
 Lib/test/test_subprocess.py |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/Lib/subprocess.py b/Lib/subprocess.py
index 1c7eb9e552f..e92928e9da9 100644
--- a/Lib/subprocess.py
+++ b/Lib/subprocess.py
@@ -356,7 +356,7 @@ class Popen(args, bufsize=-1, executable=None,
 """
 
 import sys
-mswindows = (sys.platform == "win32")
+_mswindows = (sys.platform == "win32")
 
 import io
 import os
@@ -399,7 +399,7 @@ def __str__(self):
                 (self.cmd, self.timeout))
 
 
-if mswindows:
+if _mswindows:
     import threading
     import msvcrt
     import _winapi
@@ -438,7 +438,7 @@ class STARTUPINFO:
            # NOTE: We intentionally exclude list2cmdline as it is
            # considered an internal implementation detail.  issue10838.
 
-if mswindows:
+if _mswindows:
     from _winapi import (CREATE_NEW_CONSOLE, CREATE_NEW_PROCESS_GROUP,
                          STD_INPUT_HANDLE, STD_OUTPUT_HANDLE,
                          STD_ERROR_HANDLE, SW_HIDE,
@@ -765,7 +765,7 @@ def __init__(self, args, bufsize=-1, executable=None,
         if not isinstance(bufsize, int):
             raise TypeError("bufsize must be an integer")
 
-        if mswindows:
+        if _mswindows:
             if preexec_fn is not None:
                 raise ValueError("preexec_fn is not supported on Windows "
                                  "platforms")
@@ -825,7 +825,7 @@ def __init__(self, args, bufsize=-1, executable=None,
         # quickly terminating child could make our fds unwrappable
         # (see #8458).
 
-        if mswindows:
+        if _mswindows:
             if p2cwrite != -1:
                 p2cwrite = msvcrt.open_osfhandle(p2cwrite.Detach(), 0)
             if c2pread != -1:
@@ -1002,7 +1002,7 @@ def _check_timeout(self, endtime, orig_timeout):
             raise TimeoutExpired(self.args, orig_timeout)
 
 
-    if mswindows:
+    if _mswindows:
         #
         # Windows methods
         #
diff --git a/Lib/test/test_subprocess.py b/Lib/test/test_subprocess.py
index 71481bc7969..7b669453468 100644
--- a/Lib/test/test_subprocess.py
+++ b/Lib/test/test_subprocess.py
@@ -2422,7 +2422,7 @@ def tearDown(self):
 
     def test__all__(self):
         """Ensure that __all__ is populated properly."""
-        intentionally_excluded = set(("list2cmdline", "mswindows", "MAXFD"))
+        intentionally_excluded = set(("list2cmdline",))
         exported = set(subprocess.__all__)
         possible_exports = set()
         import types