From: Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com>
Date: Wed, 7 Nov 2018 22:46:10 +0000 (-0800)
Subject: Fix the construction of subprocess.CalledProcessError in test_venv (GH-10400)
X-Git-Tag: v3.6.8rc1~130
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=0e3983689bc5c09ce9220c7976d94adf68ef118c;p=thirdparty%2FPython%2Fcpython.git

Fix the construction of subprocess.CalledProcessError in test_venv (GH-10400)


The constructor of subprocess.CalledProcessError in the check_output function had an extra None in it.
(cherry picked from commit b93925047a025511c48a7bf3e6e6f0cfec79b8ed)

Co-authored-by: Pablo Galindo <Pablogsal@gmail.com>
---

diff --git a/Lib/test/test_venv.py b/Lib/test/test_venv.py
index d1ffb8132d81..842470fef08a 100644
--- a/Lib/test/test_venv.py
+++ b/Lib/test/test_venv.py
@@ -40,7 +40,7 @@ def check_output(cmd, encoding=None):
     out, err = p.communicate()
     if p.returncode:
         raise subprocess.CalledProcessError(
-            p.returncode, cmd, None, out, err)
+            p.returncode, cmd, out, err)
     return out, err
 
 class BaseTest(unittest.TestCase):