Updated version 3.0.0 from 'upstream/3.0.0'

with Debian dir 147caafe8506326dfd094432b42ae32c21ed284e

1 files changed, 16 insertions, 14 deletions

diff --git a/bin/memoicmp.py b/bin/memoicmp.py
index 812af66..63f6538 100644
--- a/bin/memoicmp.py
+++ b/bin/memoicmp.py
@@ -3,6 +3,8 @@
 # A script to compare the --debug=memoizer output found in
 # two different files.
 
+from __future__ import print_function
+
 import sys
 
 def memoize_output(fname):
@@ -23,20 +25,20 @@ def memoize_cmp(filea, fileb):
         ma = memoize_output(filea)
         mb = memoize_output(fileb)
 
-        print 'All output: %s / %s [delta]'%(filea, fileb)
-        print '----------HITS---------- ---------MISSES---------'
+        print('All output: %s / %s [delta]'%(filea, fileb))
+        print('----------HITS---------- ---------MISSES---------')
         cfmt='%7d/%-7d [%d]'
         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:
@@ -45,30 +47,30 @@ def memoize_cmp(filea, fileb):
         mab.sort()
         ma_o.sort()
         mb_o.sort()
-        
+
         for k in mab:
                 hits = cfmt%(ma[k][0], mb[k][0], mb[k][0]-ma[k][0])
                 miss = cfmt%(ma[k][1], mb[k][1], mb[k][1]-ma[k][1])
-                print '%-24s %-24s  %s'%(hits, miss, k)
+                print('%-24s %-24s  %s'%(hits, miss, k))
 
         for k in ma_o:
                 hits = '%7d/ --'%(ma[k][0])
                 miss = '%7d/ --'%(ma[k][1])
-                print '%-24s %-24s  %s'%(hits, miss, k)
+                print('%-24s %-24s  %s'%(hits, miss, k))
 
         for k in mb_o:
                 hits = '    -- /%-7d'%(mb[k][0])
                 miss = '    -- /%-7d'%(mb[k][1])
-                print '%-24s %-24s  %s'%(hits, miss, k)
+                print('%-24s %-24s  %s'%(hits, miss, k))
+
+        print('-'*(24+24+1+20))
 
-        print '-'*(24+24+1+20)
-        
 
 if __name__ == "__main__":
         if len(sys.argv) != 3:
-                print """Usage: %s file1 file2
+                print("""Usage: %s file1 file2
 
-Compares --debug=memomize output from file1 against file2."""%sys.argv[0]
+Compares --debug=memomize output from file1 against file2."""%sys.argv[0])
                 sys.exit(1)
 
         memoize_cmp(sys.argv[1], sys.argv[2])