Backup_Repos/beets
1
0
Fork 0
mirror of https://github.com/beetbox/beets.git synced 2025-12-09 18:12:19 +01:00
Code Issues Projects Releases Wiki Activity

add test helper method to convert cmd args on py2/3

Browse source 
This helper method converts args to bytes on python 2, and args to
strings on python 3
This commit is contained in:
Johnny Robeson 2016-07-25 02:59:12 -04:00
parent ba26b7d26f
commit f8049e67b4
1 changed files with 17 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
test/helper.py
View file

@ -119,13 +119,25 @@ def capture_stdout():
print(capture.getvalue())
def _convert_args(args):
"""Convert args to bytestrings for Python 2 and convert them to strings
on Python 3.
"""
for i, elem in enumerate(args):
if six.PY2:
if isinstance(elem, six.text_type):
args[i] = elem.encode(_arg_encoding())
else:
if isinstance(elem, bytes):
args[i] = elem.decode(_arg_encoding())
return args
def has_program(cmd, args=['--version']):
"""Returns `True` if `cmd` can be executed.
"""
full_cmd = [cmd] + args
for i, elem in enumerate(full_cmd):
if isinstance(elem, six.text_type):
full_cmd[i] = elem.encode(_arg_encoding())
full_cmd = _convert_args([cmd] + args)
try:
with open(os.devnull, 'wb') as devnull:
subprocess.check_call(full_cmd, stderr=devnull,
@ -431,7 +443,7 @@ class TestHelper(object):
if hasattr(self, 'lib'):
lib = self.lib
lib = kwargs.get('lib', lib)
beets.ui._raw_main(list(args), lib)
beets.ui._raw_main(_convert_args(list(args)), lib)
def run_with_output(self, *args):
with capture_stdout() as out: