diff options
| author | Gary Oberbrunner <garyo@oberbrunner.com> | 2013-09-22 13:08:12 -0400 |
|---|---|---|
| committer | Gary Oberbrunner <garyo@oberbrunner.com> | 2013-09-22 13:08:12 -0400 |
| commit | 895990cbd5007876709b93e6d3db2b6c069382ea (patch) | |
| tree | b95b2144ccf82d8227cec025af152f4eadfa7282 /test/QT | |
| parent | f094b77fc68787c61efdc9ca095098c88bf52373 (diff) | |
| download | scons-895990cbd5007876709b93e6d3db2b6c069382ea.tar.gz | |
Result of raw 2to3 run (2to3-2.7); checkpoint for python3 conversion.
Diffstat (limited to 'test/QT')
| -rw-r--r-- | test/QT/QTFLAGS.py | 2 | ||||
| -rw-r--r-- | test/QT/copied-env.py | 4 | ||||
| -rw-r--r-- | test/QT/warnings.py | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/test/QT/QTFLAGS.py b/test/QT/QTFLAGS.py index 008397a8..b7172fc5 100644 --- a/test/QT/QTFLAGS.py +++ b/test/QT/QTFLAGS.py @@ -147,7 +147,7 @@ test.must_exist(['work1', 'mmmmocFromH.cxx'], ['work1', 'mmmanother_ui_file.cxx']) def _flagTest(test,fileToContentsStart): - for f,c in fileToContentsStart.items(): + for f,c in list(fileToContentsStart.items()): if test.read(test.workpath('work1', f)).find(c) != 0: return 1 return 0 diff --git a/test/QT/copied-env.py b/test/QT/copied-env.py index efa91be6..59a344da 100644 --- a/test/QT/copied-env.py +++ b/test/QT/copied-env.py @@ -70,8 +70,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..5e680f60 100644 --- a/test/QT/warnings.py +++ b/test/QT/warnings.py @@ -59,8 +59,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 |