Merge branch 'feature/upstream' into develop

1 files changed, 7 insertions, 7 deletions

diff --git a/bin/objcounts.py b/bin/objcounts.py
index 0662012..8b550d1 100644
--- a/bin/objcounts.py
+++ b/bin/objcounts.py
@@ -20,6 +20,7 @@
 # LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
 # OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+from __future__ import print_function
 
 import re
 import sys
@@ -27,10 +28,10 @@ import sys
 filenames = sys.argv[1:]
 
 if len(sys.argv) != 3:
-    print """Usage:  objcounts.py file1 file2
+    print("""Usage:  objcounts.py file1 file2
 
 Compare the --debug=object counts from two build logs.
-"""
+""")
     sys.exit(0)
 
 def fetch_counts(fname):
@@ -47,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:
@@ -58,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]
@@ -81,10 +82,9 @@ def diffstr(c1, c2):
     return " %5s/%-5s %-8s" % (c1, c2, d)
 
 def printline(c1, c2, classname):
-    print \
-          diffstr(c1[2], c2[2]) + \
+    print(diffstr(c1[2], c2[2]) + \
           diffstr(c1[3], c2[3]) + \
-          ' ' + classname
+          ' ' + classname)
 
 for k in sorted(common.keys()):
     c = common[k]