merge 3.5 (#27969)

45c7514d · Benjamin Peterson · 582282b7 · cbef66d7 · 45c7514d
Commit 45c7514d authored Sep 06, 2016 by Benjamin Peterson
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 0 deletions

Lib/test/test_gdb.py Lib/test/test_gdb.py +1 -0

No files found.
--- a/Lib/test/test_gdb.py
+++ b/Lib/test/test_gdb.py
@@ -24,6 +24,7 @@ def get_gdb_version():
    try:
        proc = subprocess.Popen(["gdb", "-nx", "--version"],
                                stdout=subprocess.PIPE,
+                                stderr=subprocess.PIPE,
                                universal_newlines=True)
        with proc:
            version = proc.communicate()[0]