| Message ID | 20180627021423.18404-5-ehabkost@redhat.com |
|---|---|
| State | New |
| Headers | show |
| Series | docker: Port to Python 3 | expand |
On 06/26/2018 11:14 PM, Eduardo Habkost wrote: > Mapping.iteritems() doesn't exist in Python 3. > > Note that Mapping.items() exists in both Python 3 and Python 2, > but it returns a list (and not an iterator) in Python 2. The > existing code will work on both cases, though. > > Signed-off-by: Eduardo Habkost <ehabkost@redhat.com> Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org> > --- > tests/docker/docker.py | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/tests/docker/docker.py b/tests/docker/docker.py > index db6b463b92..bc34bd872b 100755 > --- a/tests/docker/docker.py > +++ b/tests/docker/docker.py > @@ -355,7 +355,7 @@ class BuildCommand(SubCommand): > cksum += [(filename, _file_checksum(filename))] > > argv += ["--build-arg=" + k.lower() + "=" + v > - for k, v in os.environ.iteritems() > + for k, v in os.environ.items() > if k.lower() in FILTERED_ENV_NAMES] > dkr.build_image(tag, docker_dir, dockerfile, > quiet=args.quiet, user=args.user, argv=argv, >
diff --git a/tests/docker/docker.py b/tests/docker/docker.py index db6b463b92..bc34bd872b 100755 --- a/tests/docker/docker.py +++ b/tests/docker/docker.py @@ -355,7 +355,7 @@ class BuildCommand(SubCommand): cksum += [(filename, _file_checksum(filename))] argv += ["--build-arg=" + k.lower() + "=" + v - for k, v in os.environ.iteritems() + for k, v in os.environ.items() if k.lower() in FILTERED_ENV_NAMES] dkr.build_image(tag, docker_dir, dockerfile, quiet=args.quiet, user=args.user, argv=argv,
Mapping.iteritems() doesn't exist in Python 3. Note that Mapping.items() exists in both Python 3 and Python 2, but it returns a list (and not an iterator) in Python 2. The existing code will work on both cases, though. Signed-off-by: Eduardo Habkost <ehabkost@redhat.com> --- tests/docker/docker.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)