From a866042810446ca47cf7479f25a005f0550a163f Mon Sep 17 00:00:00 2001
From: William Blevins <wblevins001@gmail.com>
Date: Tue, 20 Sep 2016 15:05:06 -0400
Subject: Futurize stage 2 2to3 fixes only.

---
 bin/SConsDoc.py      | 2 +-
 bin/SConsExamples.py | 4 ++--
 bin/caller-tree.py   | 2 +-
 bin/memoicmp.py      | 8 ++++----
 bin/objcounts.py     | 4 ++--
 bin/scons-diff.py    | 2 +-
 bin/scons-proc.py    | 2 +-
 7 files changed, 12 insertions(+), 12 deletions(-)

(limited to 'bin')

diff --git a/bin/SConsDoc.py b/bin/SConsDoc.py
index d5666443..2fe4f73e 100644
--- a/bin/SConsDoc.py
+++ b/bin/SConsDoc.py
@@ -598,7 +598,7 @@ class SConsDocTree:
             # Create xpath context
             self.xpath_context = self.doc.xpathNewContext()
             # Register namespaces
-            for key, val in self.nsmap.items():
+            for key, val in list(self.nsmap.items()):
                 self.xpath_context.xpathRegisterNs(key, val)
             
     def __del__(self):
diff --git a/bin/SConsExamples.py b/bin/SConsExamples.py
index dd9bfaf8..a86968d1 100644
--- a/bin/SConsExamples.py
+++ b/bin/SConsExamples.py
@@ -267,7 +267,7 @@ def ensureExampleOutputsExist(dpath):
         os.mkdir(generated_examples)
 
     examples = readAllExampleInfos(dpath)
-    for key, value in examples.items():
+    for key, value in list(examples.items()):
         # Process all scons_output tags
         for o in value.outputs:
             cpath = os.path.join(generated_examples,
@@ -305,7 +305,7 @@ def createAllExampleOutputs(dpath):
     examples = readAllExampleInfos(dpath)
     total = len(examples)
     idx = 0
-    for key, value in examples.items():
+    for key, value in list(examples.items()):
         # Process all scons_output tags
         print("%.2f%s (%d/%d) %s" % (float(idx + 1) * 100.0 / float(total),
                                      perc, idx + 1, total, key))
diff --git a/bin/caller-tree.py b/bin/caller-tree.py
index 21cda4ba..18cd9e11 100644
--- a/bin/caller-tree.py
+++ b/bin/caller-tree.py
@@ -87,7 +87,7 @@ def print_entry(e, level, calls):
     else:
         print()
 
-for e in [ e for e in AllCalls.values() if not e.calls ]:
+for e in [ e for e in list(AllCalls.values()) if not e.calls ]:
     print_entry(e, 0, '')
 
 # Local Variables:
diff --git a/bin/memoicmp.py b/bin/memoicmp.py
index 7f0369ef..63f6538d 100644
--- a/bin/memoicmp.py
+++ b/bin/memoicmp.py
@@ -31,14 +31,14 @@ def memoize_cmp(filea, fileb):
         ma_o = []
         mb_o = []
         mab  = []
-        for k in ma.keys():
-                if k in mb.keys():
+        for k in list(ma.keys()):
+                if k in list(mb.keys()):
                         if k not in mab:
                                 mab.append(k)
                 else:
                         ma_o.append(k)
-        for k in mb.keys():
-                if k in ma.keys():
+        for k in list(mb.keys()):
+                if k in list(ma.keys()):
                         if k not in mab:
                                 mab.append(k)
                 else:
diff --git a/bin/objcounts.py b/bin/objcounts.py
index 2bd89236..8b550d1c 100644
--- a/bin/objcounts.py
+++ b/bin/objcounts.py
@@ -48,7 +48,7 @@ c1 = fetch_counts(sys.argv[1])
 c2 = fetch_counts(sys.argv[2])
 
 common = {}
-for k in c1.keys():
+for k in list(c1.keys()):
     try:
         common[k] = (c1[k], c2[k])
     except KeyError:
@@ -59,7 +59,7 @@ for k in c1.keys():
         if not '.' in k:
             s = '.'+k
             l = len(s)
-            for k2 in c2.keys():
+            for k2 in list(c2.keys()):
                 if k2[-l:] == s:
                     common[k2] = (c1[k], c2[k2])
                     del c1[k]
diff --git a/bin/scons-diff.py b/bin/scons-diff.py
index 85975011..687e7fae 100644
--- a/bin/scons-diff.py
+++ b/bin/scons-diff.py
@@ -174,7 +174,7 @@ def diff_dir(left, right):
         u[l] = 1
     for r in rlist:
         u[r] = 1
-    for x in sorted([ x for x in u.keys() if x[-4:] != '.pyc' ]):
+    for x in sorted([ x for x in list(u.keys()) if x[-4:] != '.pyc' ]):
         if x in llist:
             if x in rlist:
                 do_diff(os.path.join(left, x),
diff --git a/bin/scons-proc.py b/bin/scons-proc.py
index e09c8538..0747b2cc 100644
--- a/bin/scons-proc.py
+++ b/bin/scons-proc.py
@@ -104,7 +104,7 @@ Link_Entities_Header = """\
 class SCons_XML(object):
     def __init__(self, entries, **kw):
         self.values = entries
-        for k, v in kw.items():
+        for k, v in list(kw.items()):
             setattr(self, k, v)
             
     def fopen(self, name):
-- 
cgit v1.2.1