Post merge commit for safety. Building Fortran code works, but tests fail.

2 files changed, 6 insertions, 4 deletions

diff --git a/test/QT/copied-env.py b/test/QT/copied-env.py
index efa91be6..39891439 100644
--- a/test/QT/copied-env.py
+++ b/test/QT/copied-env.py
@@ -20,6 +20,7 @@
 # LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
 # OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+from __future__ import print_function
 
 __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
@@ -70,8 +71,8 @@ moc_MyForm = [x for x in test.stdout().split('\n') if x.find('moc_MyForm') != -1
 MYLIB_IMPL = [x for x in moc_MyForm if x.find('MYLIB_IMPL') != -1]
 
 if not MYLIB_IMPL:
-    print "Did not find MYLIB_IMPL on moc_MyForm compilation line:"
-    print test.stdout()
+    print("Did not find MYLIB_IMPL on moc_MyForm compilation line:")
+    print(test.stdout())
     test.fail_test()
 
 test.pass_test()
diff --git a/test/QT/warnings.py b/test/QT/warnings.py
index a861b24b..a1cf221f 100644
--- a/test/QT/warnings.py
+++ b/test/QT/warnings.py
@@ -21,6 +21,7 @@
 # OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #
+from __future__ import print_function
 
 __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
@@ -59,8 +60,8 @@ scons: warning: Generated moc file 'aaa.moc' is not included by 'aaa.cpp'
 """ + TestSCons.file_expr
 
 if not re.search(match12, test.stderr()):
-    print "Did not find expected regular expression in stderr:"
-    print test.stderr()
+    print("Did not find expected regular expression in stderr:")
+    print(test.stderr())
     test.fail_test()
 
 os.environ['QTDIR'] = test.QT