[virt-tools-list] [virt-bootstrap] [PATCH] test: python 2/3 compatability

[Cedric Bosdonnat]

On Tue, 2017-09-05 at 09:35 +0100, Radostin Stoyanov wrote:
> The function read_file() from the python bindings of libguestfs
> returns value of type "str" Python 2 and type "bytes" for Python 3.
> 
> To use split() we need to convert the type 'bytes' into 'str' using
> decode().
> ---
>  tests/docker_source.py | 4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)
> 
> diff --git a/tests/docker_source.py b/tests/docker_source.py
> index 9090988..71e3e40 100644
> --- a/tests/docker_source.py
> +++ b/tests/docker_source.py
> @@ -181,7 +181,9 @@ class TestQcow2DockerSource(Qcow2ImageAccessor):
>          cmd = ['qemu-img', 'info', image_path]
>          proc = subprocess.Popen(cmd, stdout=subprocess.PIPE)
>          output, _ignore = proc.communicate()
> -        return output.decode('utf-8').split('\n')
> +        if hasattr(output, 'decode'):
> +            output = output.decode('utf-8')
> +        return output.split('\n')
>  
>      def call_bootstrap(self):
>          """

ACK

--
Cedric