3 files changed, 10 insertions, 10 deletions
diff --git a/tools/build_defs/docker/create_image_config.py b/tools/build_defs/docker/create_image_config.py
index 05ce4a684b..30eef39c4a 100644
--- a/tools/build_defs/docker/create_image_config.py
+++ b/tools/build_defs/docker/create_image_config.py
@@ -100,7 +100,7 @@ def DeepCopySkipNull(data):
   """Do a deep copy, skipping null entry."""
   if isinstance(data, dict):
     return dict((DeepCopySkipNull(k), DeepCopySkipNull(v))
-                for k, v in data.iteritems() if v is not None)
+                for k, v in data.items() if v is not None)
   return copy.deepcopy(data)
 
 
@@ -149,7 +149,7 @@ def CreateImageConfig(data, options):
     # Build a dictionary of existing environment variables (used by Resolve).
     environ_dict = KeyValueToDict(output['config'].get('Env', []))
     # Merge in new environment variables, resolving references.
-    for k, v in options.env.iteritems():
+    for k, v in options.env.items():
       # Resolve handles scenarios like "PATH=$PATH:...".
       environ_dict[k] = Resolve(v, environ_dict)
     output['config']['Env'] = Dict2ConfigValue(environ_dict)
@@ -157,7 +157,7 @@ def CreateImageConfig(data, options):
   # TODO(babel-team) Label is currently docker specific
   if options.labels:
     label_dict = KeyValueToDict(output['config'].get('Label', []))
-    for k, v in options.labels.iteritems():
+    for k, v in options.labels.items():
       label_dict[k] = v
     output['config']['Label'] = Dict2ConfigValue(label_dict)
 
@@ -216,7 +216,7 @@ def main(unused_argv):
     layers.append(utils.ExtractValue(layer))
 
   labels = KeyValueToDict(FLAGS.labels)
-  for label, value in labels.iteritems():
+  for label, value in labels.items():
     if value.startswith('@'):
       with open(value[1:], 'r') as f:
         labels[label] = f.read()
diff --git a/tools/build_defs/docker/join_layers.py b/tools/build_defs/docker/join_layers.py
index 97e47931ab..0928aef70d 100644
--- a/tools/build_defs/docker/join_layers.py
+++ b/tools/build_defs/docker/join_layers.py
@@ -53,10 +53,10 @@ def _add_top(tar, repositories):
   # Walk the single-item dictionary, and if there is a single tag
   # for the single repository, then emit a 'top' file pointing to
   # the single image in this bundle.
-  for (unused_x, tags) in repositories.iteritems():
+  for (unused_x, tags) in repositories.items():
     if len(tags) != 1:
       continue
-    for (unused_y, layer_id) in tags.iteritems():
+    for (unused_y, layer_id) in tags.items():
       tar.add_file('top', content=layer_id)
 
 
diff --git a/tools/build_defs/docker/rewrite_json.py b/tools/build_defs/docker/rewrite_json.py
index 38fd01def0..c06bf459b7 100644
--- a/tools/build_defs/docker/rewrite_json.py
+++ b/tools/build_defs/docker/rewrite_json.py
@@ -122,7 +122,7 @@ def DeepCopySkipNull(data):
   """Do a deep copy, skipping null entry."""
   if type(data) == type(dict()):
     return dict((DeepCopySkipNull(k), DeepCopySkipNull(v))
-                for k, v in data.iteritems() if v is not None)
+                for k, v in data.items() if v is not None)
   return copy.deepcopy(data)
 
 
@@ -187,14 +187,14 @@ def RewriteMetadata(data, options):
     # Build a dictionary of existing environment variables (used by Resolve).
     environ_dict = KeyValueToDict(output['config'].get('Env', []))
     # Merge in new environment variables, resolving references.
-    for k, v in options.env.iteritems():
+    for k, v in options.env.items():
       # Resolve handles scenarios like "PATH=$PATH:...".
       environ_dict[k] = Resolve(v, environ_dict)
     output['config']['Env'] = Dict2ConfigValue(environ_dict)
 
   if options.labels:
     label_dict = KeyValueToDict(output['config'].get('Label', []))
-    for k, v in options.labels.iteritems():
+    for k, v in options.labels.items():
       label_dict[k] = v
     output['config']['Label'] = Dict2ConfigValue(label_dict)
 
@@ -279,7 +279,7 @@ def main(unused_argv):
       name = f.read()
 
   labels = KeyValueToDict(FLAGS.labels)
-  for label, value in labels.iteritems():
+  for label, value in labels.items():
     if value.startswith('@'):
       with open(value[1:], 'r') as f:
         labels[label] = f.read()