From: Huangbin Zhan <zhanhb88@gmail.com>
Date: Mon, 6 Jul 2020 23:14:42 +0000 (+0800)
Subject: build: fix compatibility with python 3.6
X-Git-Tag: v19.07.4~69
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=9c0ad7f1d5e564420ae1e6493c2fc2622fd27c8c;p=openwrt%2Fstaging%2Fhauke.git

build: fix compatibility with python 3.6

On a system python3 is linked to python3.6, fail to perform json_overview_image_info
 and got `TypeError: __init__() got an unexpected keyword argument 'capture_output'`.
This patch emulate the behaviour on python 3.7+.

Signed-off-by: Huangbin Zhan <zhanhb88@gmail.com>
(cherry picked from commit 3caad5150c2011a7dac462acaa06d0e69f8ed005)
---

diff --git a/scripts/json_overview_image_info.py b/scripts/json_overview_image_info.py
index 8f3525f890..c76a442840 100755
--- a/scripts/json_overview_image_info.py
+++ b/scripts/json_overview_image_info.py
@@ -2,7 +2,7 @@
 
 from os import getenv, environ
 from pathlib import Path
-from subprocess import run
+from subprocess import run, PIPE
 from sys import argv
 import json
 
@@ -42,10 +42,11 @@ if output:
             "val.DEFAULT_PACKAGES",
             "val.ARCH_PACKAGES",
         ],
-        capture_output=True,
+        stdout=PIPE,
+        stderr=PIPE,
         check=True,
         env=environ.copy().update({"TOPDIR": Path().cwd()}),
-        text=True,
+        universal_newlines=True,
     ).stdout.splitlines()
 
     output["default_packages"] = default_packages.split()