python3: `print`, from statement to function

Signed-off-by: Lumir Balhar <lbalhar@redhat.com>
Signed-off-by: Jiri Kastner <jkastner@redhat.com>

3 files changed, 19 insertions, 17 deletions

diff --git a/bitmasklist_test.py b/bitmasklist_test.py
index 4fa9cc4..60a8da3 100755
--- a/bitmasklist_test.py
+++ b/bitmasklist_test.py
@@ -1,4 +1,5 @@
 #!/usr/bin/python
+from __future__ import print_function
 from procfs import bitmasklist
 
 class bitmasklist_test:
@@ -22,16 +23,16 @@ class bitmasklist_test:
 
     # This is the function that actually runs the test
     def bitmasklist_test(self):
-        print "\n##################\n"
+        print("\n##################\n")
         cpu = bitmasklist(self.line, self.nr_entries)
-        print "Converted : ", self.line, "\nto ", cpu
+        print("Converted : ", self.line, "\nto ", cpu)
         if cpu == self.expected_result:
             self.result = 0
-            print "PASS"
+            print("PASS")
         else:
             self.result = 1
-            print "expected : ", self.expected_result
-            print "FAIL"
+            print("expected : ", self.expected_result)
+            print("FAIL")
         self.set_unit_test_result()
 
 # CPU 2
diff --git a/pflags-cmd.py b/pflags-cmd.py
index 391420c..abfcfe9 100755
--- a/pflags-cmd.py
+++ b/pflags-cmd.py
@@ -14,6 +14,7 @@
 #   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 #   General Public License for more details.
 
+from __future__ import print_function
 import procfs, re, fnmatch, sys
 from functools import reduce
 from six.moves import map
@@ -61,7 +62,7 @@ def main(argv):
 		comm = ps[pid].stat["comm"]
 		flags.sort()
 		sflags = reduce(lambda i, j: "%s|%s" % (i, j), [a[3:] for a in flags])
-		print "%6d %*s %s" %(pid, max_comm_len, comm, sflags)
+		print("%6d %*s %s" %(pid, max_comm_len, comm, sflags))
 
 if __name__ == '__main__':
 	main(sys.argv)
diff --git a/procfs/procfs.py b/procfs/procfs.py
index c669275..3eff35d 100755
--- a/procfs/procfs.py
+++ b/procfs/procfs.py
@@ -1022,32 +1022,32 @@ if __name__ == '__main__':
 	ints = interrupts()
 
 	for i in ints.interrupts.keys():
-		print "%s: %s" % (i, ints.interrupts[i])
+		print("%s: %s" % (i, ints.interrupts[i]))
 
 	options = cmdline()
 	for o in options.options.keys():
-		print "%s: %s" % (o, options.options[o])
+		print("%s: %s" % (o, options.options[o]))
 
 	cpu = cpuinfo()
-	print "\ncpuinfo data: %d processors" % cpu.nr_cpus
+	print("\ncpuinfo data: %d processors" % cpu.nr_cpus)
 	for tag in cpu.keys():
-		print "%s=%s" % (tag, cpu[tag])
+		print("%s=%s" % (tag, cpu[tag]))
 
-	print "smaps:\n" + ("-" * 40)
+	print("smaps:\n" + ("-" * 40))
 	s = smaps(int(sys.argv[1]))
 	for i in range(s.nr_entries):
-		print "%#x %s" % (s.entries[i].vm_start, s.entries[i].name)
-	print "-" * 40
+		print("%#x %s" % (s.entries[i].vm_start, s.entries[i].name))
+	print("-" * 40)
 	for a in s.find_by_name_fragment(sys.argv[2]):
-		print a["Size"]
+		print(a["Size"])
 
 	ps = pidstats()
-	print ps[1]
+	print(ps[1])
 
 	cs = cpusstats()
 	while True:
 		time.sleep(1)
 		cs.reload()
 		for cpu in cs:
-			print "%s: %d" % (cpu.name, cpu.usage)
-		print "-" * 10
+			print("%s: %d" % (cpu.name, cpu.usage))
+		print("-" * 10)