diff --git a/frysk-core/frysk/debuginfo/TestTypeFactory.java-sh b/frysk-core/frysk/debuginfo/TestTypeFactory.java-sh index 11e51ed5a..38a40ff97 100644 --- a/frysk-core/frysk/debuginfo/TestTypeFactory.java-sh +++ b/frysk-core/frysk/debuginfo/TestTypeFactory.java-sh @@ -38,4 +38,4 @@ # version and license this file solely under the GPL without # exception. -python $(dirname $0)/gen-type-expect-tests.py frysk/pkglibdir/funit-type-entry.c $(dirname $0)/../pkglibdir/funit-type-class.cxx +python3 $(dirname $0)/gen-type-expect-tests.py frysk/pkglibdir/funit-type-entry.c $(dirname $0)/../pkglibdir/funit-type-class.cxx diff --git a/frysk-core/frysk/debuginfo/gen-type-expect-tests.py b/frysk-core/frysk/debuginfo/gen-type-expect-tests.py index 6163edcce..f0a81617f 100644 --- a/frysk-core/frysk/debuginfo/gen-type-expect-tests.py +++ b/frysk-core/frysk/debuginfo/gen-type-expect-tests.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/python3 # This file is part of the program FRYSK. # @@ -48,7 +48,7 @@ class j: def open(self): self.name = "TestTypeFactory" def write(self,str): - print str + print(str) def prologue(self,): print('''// Generated by gen-type-expect-tests.py @@ -145,7 +145,7 @@ public class %s extends TestLib { ######################################################################## def usage (): - print "Usage " + sys.argv[0] + " <-help> OutputFile File ..." + print("Usage " + sys.argv[0] + " <-help> OutputFile File ...") sys.exit(1) def open_file (arg): @@ -154,7 +154,7 @@ def open_file (arg): try: file = open(sys.argv[arg], 'r') except IOError: - print (sys.argv[arg] + " not found") + print(sys.argv[arg] + " not found") sys.exit(1) return file @@ -162,18 +162,18 @@ if (len (sys.argv) == 1): usage() for t in sys.argv: if (t == "-help"): - print "Builds TestTypeFactory*.java from input files, using annotations" - print "in the input files to describe the data type to be tested." - print "e.g. Given:" - print "static struct {" - print " int int_var;" - print "} arr_struct [2] = {{1},{2}};" - print "One would use the annotation:" - print "// Name: arr_struct" - print "// Value: {{1},{2}}" - print "// Type: struct {" - print "// Type: int int_var;" - print "// Type: } [2]" + print("Builds TestTypeFactory*.java from input files, using annotations") + print("in the input files to describe the data type to be tested.") + print("e.g. Given:") + print("static struct {") + print(" int int_var;") + print("} arr_struct [2] = {{1},{2}};") + print("One would use the annotation:") + print("// Name: arr_struct") + print("// Value: {{1},{2}}") + print("// Type: struct {") + print("// Type: int int_var;") + print("// Type: } [2]") usage() elif (t.startswith("-")): usage() diff --git a/frysk-core/frysk/pkglibdir/funit-type-entry.c-sh b/frysk-core/frysk/pkglibdir/funit-type-entry.c-sh index 2e7ca2e98..00270c9c7 100644 --- a/frysk-core/frysk/pkglibdir/funit-type-entry.c-sh +++ b/frysk-core/frysk/pkglibdir/funit-type-entry.c-sh @@ -1,4 +1,4 @@ #!/bin/sh # main() # marker so this is know to have a main. -python $(dirname $0)/gen-type-funit-tests.py +python3 $(dirname $0)/gen-type-funit-tests.py diff --git a/frysk-core/frysk/pkglibdir/gen-type-funit-tests.py b/frysk-core/frysk/pkglibdir/gen-type-funit-tests.py index e7e1b7a50..2de6b5e3d 100644 --- a/frysk-core/frysk/pkglibdir/gen-type-funit-tests.py +++ b/frysk-core/frysk/pkglibdir/gen-type-funit-tests.py @@ -1,4 +1,5 @@ -#!/usr/bin/python +#!/usr/bin/python3 + # This file is part of the program FRYSK. # # Copyright 2007, 2008, Red Hat Inc.