Use custom call_subprocess for VCS commands

Author: deveshks

src/pip/_internal/vcs/subversion.py

@@ -25,7 +25,7 @@
 
 
 if MYPY_CHECK_RUNNING:
-    from typing import Optional, Tuple, Text
+    from typing import Optional, Tuple
     from pip._internal.utils.subprocess import CommandArgs
     from pip._internal.utils.misc import HiddenText
     from pip._internal.vcs.versioncontrol import AuthInfo, RevOptions
@@ -215,17 +215,7 @@ def call_vcs_version(self):
         #   svn, version 1.7.14 (r1542130)
         #      compiled Mar 28 2018, 08:49:13 on x86_64-pc-linux-gnu
         version_prefix = 'svn, version '
-        cmd_output = self.run_command(['--version'], show_stdout=False)
-
-        # Split the output by newline, and find the first line where
-        # version_prefix is present
-        output_lines = cmd_output.split('\n')
-        version = ''  # type: Text
-
-        for line in output_lines:
-            if version_prefix in line:
-                version = line
-                break
+        version = self.run_command(['--version'], show_stdout=True)
 
         if not version.startswith(version_prefix):
             return ()

src/pip/_internal/vcs/versioncontrol.py

@@ -39,7 +39,7 @@
 if MYPY_CHECK_RUNNING:
     from typing import (
         Dict, Iterable, Iterator, List, Optional, Text, Tuple,
-        Type, Union, IO
+        Type, Union
     )
     from pip._internal.utils.misc import HiddenText
     from pip._internal.utils.subprocess import CommandArgs
@@ -104,7 +104,8 @@ def call_subprocess(
     # Most places in pip use show_stdout=False.
     # What this means is--
     #
-    # - We log this output of stdout and stderr at DEBUG level as it is received.
+    # - We log this output of stdout and stderr at DEBUG level
+    # as it is received.
     # - If DEBUG logging isn't enabled (e.g. if --verbose logging wasn't
     #   requested), then we show a spinner so the user can still see the
     #   subprocess is in progress.
@@ -133,9 +134,9 @@ def call_subprocess(
         proc = subprocess.Popen(
             # Convert HiddenText objects to the underlying str.
             reveal_command_args(cmd),
-            stdin=subprocess.PIPE,
             stdout=subprocess.PIPE,
-            cwd=cwd,
+            stderr=subprocess.PIPE,
+            cwd=cwd
         )
         if proc.stdin:
             proc.stdin.close()
@@ -163,6 +164,7 @@ def call_subprocess(
     finally:
         if proc.stdout:
             proc.stdout.close()
+
     proc_had_error = (
         proc.returncode and proc.returncode not in extra_ok_returncodes
     )

tests/unit/test_vcs.py

@@ -443,18 +443,6 @@ def test_subversion__call_vcs_version():
     ('svn, version 1.10.3 (r1842928)\n'
      '   compiled Feb 25 2019, 14:20:39 on x86_64-apple-darwin17.0.0',
      (1, 10, 3)),
-    ('Warning: Failed to set locale category LC_NUMERIC to en_IN.\n'
-     'Warning: Failed to set locale category LC_TIME to en_IN.\n'
-     'svn, version 1.10.3 (r1842928)\n'
-     '   compiled Feb 25 2019, 14:20:39 on x86_64-apple-darwin17.0.0',
-     (1, 10, 3)),
-    ('Warning: Failed to set locale category LC_NUMERIC to en_IN.\n'
-     'Warning: Failed to set locale category LC_TIME to en_IN.\n'
-     'svn, version 1.10.3 (r1842928)\n'
-     '   compiled Feb 25 2019, 14:20:39 on x86_64-apple-darwin17.0.0'
-     'svn, version 1.11.3 (r1842928)\n'
-     '   compiled Feb 25 2019, 14:20:39 on x86_64-apple-darwin17.0.0',
-     (1, 10, 3)),
     ('svn, version 1.9.7 (r1800392)', (1, 9, 7)),
     ('svn, version 1.9.7a1 (r1800392)', ()),
     ('svn, version 1.9 (r1800392)', (1, 9)),