Fix python scripts for python 3 (print now a function rather than a keyword)
diff --git a/scripts/approvalTests.py b/scripts/approvalTests.py
index 77b9265..5db26d7 100644
--- a/scripts/approvalTests.py
+++ b/scripts/approvalTests.py
@@ -1,3 +1,5 @@
+from __future__ import print_function
+
import os
import sys
import subprocess
@@ -66,20 +68,20 @@
rawFile.close()
os.remove( rawResultsPath )
- print
- print baseName + ":"
+ print()
+ print( baseName + ":" )
if os.path.exists( baselinesPath ):
diffResult = subprocess.call([ "diff", baselinesPath, filteredResultsPath ] )
if diffResult == 0:
os.remove( filteredResultsPath )
- print " \033[92mResults matched"
+ print( " \033[92mResults matched" )
else:
- print " \n****************************\n \033[91mResults differed"
+ print( " \n****************************\n \033[91mResults differed" )
if diffResult > overallResult:
overallResult = diffResult
- print "\033[0m"
+ print( "\033[0m" )
else:
- print " first approval"
+ print( " first approval" )
if overallResult == 0:
overallResult = 1
@@ -95,5 +97,5 @@
approve( "xml.sw", ["~_", "-s", "-w", "NoAssertions", "-r", "xml"] )
if overallResult != 0:
- print "run approve.py to approve new baselines"
+ print( "run approve.py to approve new baselines" )
exit( overallResult)
diff --git a/scripts/approve.py b/scripts/approve.py
index 7801b54..f4b66aa 100644
--- a/scripts/approve.py
+++ b/scripts/approve.py
@@ -1,3 +1,5 @@
+from __future__ import print_function
+
import os
import sys
import shutil
@@ -18,12 +20,12 @@
if os.path.exists( approvedFile ):
os.remove( approvedFile )
os.rename( unapprovedFile, approvedFile )
- print "approved " + justFilename
+ print( "approved " + justFilename )
else:
- print "approval file " + justFilename + " does not exist"
+ print( "approval file " + justFilename + " does not exist" )
if len(files) > 0:
for unapprovedFile in files:
approveFile( unapprovedFile.replace( "unapproved.txt", "approved.txt" ), unapprovedFile )
else:
- print "no files to approve"
\ No newline at end of file
+ print( "no files to approve" )
diff --git a/scripts/generateSingleHeader.py b/scripts/generateSingleHeader.py
index 8930c45..dda1630 100644
--- a/scripts/generateSingleHeader.py
+++ b/scripts/generateSingleHeader.py
@@ -1,3 +1,5 @@
+from __future__ import print_function
+
import os
import sys
import re
@@ -33,9 +35,9 @@
elif arg == "noimpl":
includeImpl = False
bumpVersion = False
- print "Not including impl code (and not bumping version)"
+ print( "Not including impl code (and not bumping version)" )
else:
- print "\n** Unrecognised argument: " + arg + " **\n"
+ print( "\n** Unrecognised argument: " + arg + " **\n" )
exit(1)
out = open( outputPath, 'w' )
@@ -144,9 +146,9 @@
out.write( " */\n" )
out.write( "#ifndef TWOBLUECUBES_SINGLE_INCLUDE_CATCH_HPP_INCLUDED\n" )
out.write( "#define TWOBLUECUBES_SINGLE_INCLUDE_CATCH_HPP_INCLUDED\n" )
-
+
parseFile( rootPath, 'catch.hpp' )
-
+
out.write( "#endif // TWOBLUECUBES_SINGLE_INCLUDE_CATCH_HPP_INCLUDED\n\n" )
generateSingleInclude()