On 19.12.2017 18:34, Philippe Mathieu-Daudé wrote:
> Signed-off-by: Philippe Mathieu-Daudé <f4...@amsat.org>
> ---
> tests/qemu-iotests/iotests.py | 7 +++++--
> 1 file changed, 5 insertions(+), 2 deletions(-)
>
> diff --git a/tests/qemu-iotests/iotests.py b/tests/qemu-iotests/iotests.py
> index 4c515d2e6c..0e1b8ab6e6 100644
> --- a/tests/qemu-iotests/iotests.py
> +++ b/tests/qemu-iotests/iotests.py
> @@ -459,13 +459,16 @@ def main(supported_fmts=[], supported_oses=['linux']):
>
> # We need to filter out the time taken from the output so that
> qemu-iotest
> # can reliably diff the results against master output.
> - import StringIO
> if debug:
> output = sys.stdout
> verbosity = 2
> sys.argv.remove('-d')
> else:
> - output = StringIO.StringIO()
> + try:
> + from StringIO import StringIO
> + except ImportError:
> + from io import StringIO
> + output = StringIO()*Please* make a commit message that mentions that StringIO was moved into the io package for py3. It took me way too long to make any sense of this change until I read the except statement. Maybe also add a comment.
signature.asc
Description: OpenPGP digital signature
