Move CLOSE_STDIN to class

Author: blueyed

src/_pytest/pytester.py

@@ -36,8 +36,6 @@
     u"/var/lib/sss/mc/passwd"
 ]
 
-CLOSE_STDIN = object
-
 
 def pytest_addoption(parser):
     parser.addoption(
@@ -475,6 +473,8 @@ class Testdir(object):
 
     """
 
+    CLOSE_STDIN = object
+
     class TimeoutExpired(Exception):
         pass
 
@@ -1059,15 +1059,15 @@ def popen(
         env["USERPROFILE"] = env["HOME"]
         kw["env"] = env
 
-        if stdin is CLOSE_STDIN:
+        if stdin is Testdir.CLOSE_STDIN:
             kw["stdin"] = subprocess.PIPE
         elif isinstance(stdin, bytes):
             kw["stdin"] = subprocess.PIPE
         else:
             kw["stdin"] = stdin
 
         popen = subprocess.Popen(cmdargs, stdout=stdout, stderr=stderr, **kw)
-        if stdin is CLOSE_STDIN:
+        if stdin is Testdir.CLOSE_STDIN:
             popen.stdin.close()
         elif isinstance(stdin, bytes):
             popen.stdin.write(stdin)
@@ -1093,7 +1093,7 @@ def run(self, *cmdargs, **kwargs):
         __tracebackhide__ = True
 
         timeout = kwargs.pop("timeout", None)
-        stdin = kwargs.pop("stdin", CLOSE_STDIN)
+        stdin = kwargs.pop("stdin", Testdir.CLOSE_STDIN)
         raise_on_kwargs(kwargs)
 
         popen_kwargs = {"stdin": stdin}