Move toards Python 3 - use functional print.

1 files changed, 16 insertions, 16 deletions

diff --git a/deheader b/deheader
index 168b05c..d0f9bb3 100755
--- a/deheader
+++ b/deheader
@@ -1244,20 +1244,20 @@ class InclusionMap:
             if not os.path.isdir(root):
                 if excludes and excludes.search(root):
                     if verbose > 1:
-                        print "deheader: %s excluded" % root
+                        print("deheader: %s excluded" % root)
                 elif InclusionMap.c_source(root):
                     self.files.append(root)
                 else:
-                    print >>sys.stderr, "deheader: can't analyze %s" % root
+                    sys.stderr.write("deheader: can't analyze %s\n" % root)
             else:
                 sublist = []
                 for root, dirs, files in os.walk(root):
-                    dirs = filter(lambda x: not x.startswith("."), dirs)
+                    dirs = [x for x in dirs if not x.startswith(".")]
                     for name in files:
                         path = os.path.join(root, name)
                         if excludes and excludes.search(path):
                             if verbose > 1:
-                                print "deheader: %s excluded" % root
+                                print("deheader: %s excluded" % root)
                         elif InclusionMap.c_source(path):
                             sublist.append(path)
                 sublist.sort()
@@ -1280,15 +1280,15 @@ class InclusionMap:
                     if f is not False:
                         if verbosity >= PROGRESS_DEBUG:
                             name = trim(f)
-                            print "deheader: %s includes %s" % (sourcefile, name)
+                            print("deheader: %s includes %s" % (sourcefile, name))
                         if ignore and ignore.search(line):
                             if verbosity >= PROGRESS_DEBUG:
-                                print "deheader: ignoring %s (exclusion match with %s)." % (name, ignore.pattern)
+                                print("deheader: ignoring %s (exclusion match with %s)." % (name, ignore.pattern))
                             continue
                         if not conditions or conditions == ["S_SPLINT_S"]:
                             includes.append(line)
                         elif verbose > 1:
-                            print "deheader: ignoring %s (conditional inclusion)" % name
+                            print("deheader: ignoring %s (conditional inclusion)" % name)
                 for (r, c, h) in compiled:
                     if c.search(line):
                         if not set(h).issubset(set(seen)):
@@ -1302,7 +1302,7 @@ class InclusionMap:
                 trimmedcount[ref] = trimmedcount.get(ref, 0) + 1
             for ref in trimmedcount:
                 if trimmedcount[ref] > 1:
-                    print "deheader: %s has more than one inclusion of %s" % (sourcefile, ref)
+                    print("deheader: %s has more than one inclusion of %s" % (sourcefile, ref))
     def forget(self, sourcefile, header):
         "Forget a header dependency."
         self.depends_on[sourcefile].remove(header)
@@ -1379,7 +1379,7 @@ def testcompile(source, maker, msg="", verbosity=0, showerrs=False, subdir=""):
     else:
         explain = "succeeded"
     if verbosity >= PROGRESS_DEBUG:
-        print "deheader: %s%s %s." % (source, msg, explain)
+        print("deheader: %s%s %s." % (source, msg, explain))
     if os.path.exists(derived):
         os.remove(derived)
     elif os.path.exists("CMakeList.txt"):
@@ -1406,7 +1406,7 @@ def c_analyze(sourcefile, maker, includes, requires, verbosity, subdir=""):
                     for required in requirements:
                         if required in header:
                             if verbosity >= PROGRESS_DEBUG:
-                                print "deheader: in %s, %s prevents uninclusion of %s" % (os.path.join(subdir, sourcefile), trigger, trim(header))
+                                print("deheader: in %s, %s prevents uninclusion of %s" % (os.path.join(subdir, sourcefile), trigger, trim(header)))
                             retain += 1
                 if not retain:
                     saveit.remove_headers(unneeded + [header])
@@ -1423,10 +1423,10 @@ def c_analyze(sourcefile, maker, includes, requires, verbosity, subdir=""):
             baton.end()
     # Missing-require detection.  Can't be merged with duplicate-header
     # detection because this has to be done after unneeded headers are removed.
-    stillhere = map(trim, includes)
+    stillhere = list(map(trim, includes))
     for (requirement, trigger) in requires:
         if not set(requirement).issubset(stillhere):
-            print "deheader: in %s, %s portability requires %s." % (os.path.join(subdir, sourcefile), trigger, ",".join(requirement))
+            print("deheader: in %s, %s portability requires %s." % (os.path.join(subdir, sourcefile), trigger, ",".join(requirement)))
     return unneeded
 
 def deheader(sourcefile, maker, includes, requires, remove, verbose):
@@ -1445,7 +1445,7 @@ def deheader(sourcefile, maker, includes, requires, remove, verbose):
                                  includes[:], requires, verbose, subdir=subdir)
         if unneeded:
             for line in unneeded:
-                print "deheader: remove %s from %s" % (trim(line), os.path.join(subdir, sourcefile))
+                print("deheader: remove %s from %s" % (trim(line), os.path.join(subdir, sourcefile)))
             if remove:
                 remove_it = SaveForModification(os.path.join(subdir, sourcefile))
                 remove_it.remove_headers(unneeded)
@@ -1453,7 +1453,7 @@ def deheader(sourcefile, maker, includes, requires, remove, verbose):
                 del remove_it
         return Summary([sourcefile], includes, unneeded)
     else:
-        print >>sys.stderr, "deheader: basic compilation failed on %s" % (sourcefile,)
+        sys.stderr.write("deheader: basic compilation failed on %s\n" % (sourcefile,))
         return Summary([sourcefile], includes, [])
 
 # After-action analysis starts here
@@ -1501,7 +1501,7 @@ if __name__ == "__main__":
         elif switch in ('-v', '--verbose'):
             verbose += 1
         elif switch in ('-V', '--version'):
-            print "deheader", version
+            print("deheader", version)
             raise SystemExit(0)
         elif switch in ('-x', '--exclude'):
             exclusions.append(val)
@@ -1527,7 +1527,7 @@ if __name__ == "__main__":
         stats = Summary()
         for summary in summaries:
             stats = stats + summary
-        print "deheader: saw", stats
+        print("deheader: saw %s" % stats)
     raise SystemExit(0)
 
 # End