Update test_wave_parsing.py

2.7 test support
This commit is contained in:
Jamie Hardt
2019-01-05 10:27:29 -08:00
parent 71f0aed5ff
commit 4f0c26f5ca

View File

@@ -1,4 +1,5 @@
import os.path import os.path
import sys
import json import json
import subprocess import subprocess
from subprocess import PIPE from subprocess import PIPE
@@ -14,14 +15,24 @@ def ffprobe(path):
arguments = [ FFPROBE , "-of", "json" , "-show_format", "-show_streams", path ] arguments = [ FFPROBE , "-of", "json" , "-show_format", "-show_streams", path ]
process = subprocess.run(arguments, stdin=None, stdout=PIPE, stderr=PIPE) if int(sys.version[0]) < 3:
process = subprocess.Popen(arguments, stdout=PIPE)
if process.returncode == 0: process.wait()
output_str = process.stdout.decode('utf-8') if process.returncode == 0:
return json.loads(output_str) output = process.communicate()[0]
if output:
output_str = output.decode('utf-8')
return json.loads(output_str)
else:
return None
else: else:
return None process = subprocess.run(arguments, stdin=None, stdout=PIPE, stderr=PIPE)
if process.returncode == 0:
output_str = process.stdout.decode('utf-8')
return json.loads(output_str)
else:
return None
class TestWaveInfo(TestCase): class TestWaveInfo(TestCase):