[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [PULL v2 01/57] docker: docker.py wrap StringIO import
From: |
Daniel P . Berrangé |
Subject: |
Re: [Qemu-devel] [PULL v2 01/57] docker: docker.py wrap StringIO import for python3 |
Date: |
Thu, 21 Jun 2018 10:13:45 +0100 |
User-agent: |
Mutt/1.9.5 (2018-04-13) |
On Thu, Jun 21, 2018 at 09:49:55AM +0100, Peter Maydell wrote:
> On 21 June 2018 at 07:25, Alex Bennée <address@hidden> wrote:
> > Although the docker.py is nominally python2 we actually invoke it with
> > the configured python from the configure script.
> >
> > Signed-off-by: Alex Bennée <address@hidden>
> >
> > diff --git a/tests/docker/docker.py b/tests/docker/docker.py
> > index 306e14cf69..e4095270eb 100755
> > --- a/tests/docker/docker.py
> > +++ b/tests/docker/docker.py
> > @@ -26,7 +26,10 @@ import tempfile
> > import re
> > import signal
> > from tarfile import TarFile, TarInfo
> > -from StringIO import StringIO
> > +try:
> > + from StringIO import StringIO
> > +except ImportError:
> > + from io import StringIO
> > from shutil import copy, rmtree
> > from pwd import getpwuid
>
> This is fairly trivial, but it is a new unreviewed patch:
> would one of the python experts like to review it ?
Yes, this is the normal fix for this particular scenario.
Reviewed-by: Daniel P. Berrangé <address@hidden>
Regards,
Daniel
--
|: https://berrange.com -o- https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org -o- https://fstop138.berrange.com :|
|: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|
- [Qemu-devel] [PULL v2 00/57] add check-tcg and associated machinery, Alex Bennée, 2018/06/21
- [Qemu-devel] [PULL v2 04/57] configure: allow user to specify --cross-cc-cflags-foo=, Alex Bennée, 2018/06/21
- [Qemu-devel] [PULL v2 03/57] configure: move i386_cc to cross_cc_i386, Alex Bennée, 2018/06/21
- [Qemu-devel] [PULL v2 01/57] docker: docker.py wrap StringIO import for python3, Alex Bennée, 2018/06/21
- [Qemu-devel] [PULL v2 06/57] docker: Add "cc" subcommand, Alex Bennée, 2018/06/21
- [Qemu-devel] [PULL v2 05/57] configure: set cross_cc_FOO for host compiler, Alex Bennée, 2018/06/21
- [Qemu-devel] [PULL v2 02/57] configure: add support for --cross-cc-FOO, Alex Bennée, 2018/06/21
- [Qemu-devel] [PULL v2 07/57] docker: extend "cc" command to accept compiler, Alex Bennée, 2018/06/21
- [Qemu-devel] [PULL v2 09/57] docker: Makefile.include introduce DOCKER_SCRIPT, Alex Bennée, 2018/06/21
- [Qemu-devel] [PULL v2 08/57] docker: allow "cc" command to run in user context, Alex Bennée, 2018/06/21
- [Qemu-devel] [PULL v2 10/57] tests/tcg: move architecture independent tests into subdir, Alex Bennée, 2018/06/21
- [Qemu-devel] [PULL v2 48/57] tests/tcg: override runners for broken tests, Alex Bennée, 2018/06/21
- [Qemu-devel] [PULL v2 12/57] tests/tcg/multiarch: enable additional linux-test tests, Alex Bennée, 2018/06/21
- [Qemu-devel] [PULL v2 53/57] docker: docker.py add check sub-command, Alex Bennée, 2018/06/21