summaryrefslogtreecommitdiffstats
path: root/test/D/Issues
diff options
context:
space:
mode:
authorRussel Winder <russel@winder.org.uk>2014-09-15 17:47:05 (GMT)
committerRussel Winder <russel@winder.org.uk>2014-09-15 17:47:05 (GMT)
commit811d3f2115eae697a0132d11d07df54163f3479b (patch)
treea26e4a4dbab128366351712f627f681d1ae8c873 /test/D/Issues
parentf85f29e9f89811b9cf94f245711266f4616ece0b (diff)
downloadSCons-811d3f2115eae697a0132d11d07df54163f3479b.zip
SCons-811d3f2115eae697a0132d11d07df54163f3479b.tar.gz
SCons-811d3f2115eae697a0132d11d07df54163f3479b.tar.bz2
Make the format method work on Python 2.6 as well as later versions.
Diffstat (limited to 'test/D/Issues')
-rw-r--r--test/D/Issues/2939_Ariovistus/Common/correctLinkOptions.py4
-rw-r--r--test/D/Issues/2940_Ariovistus/Common/correctLinkOptions.py4
2 files changed, 4 insertions, 4 deletions
diff --git a/test/D/Issues/2939_Ariovistus/Common/correctLinkOptions.py b/test/D/Issues/2939_Ariovistus/Common/correctLinkOptions.py
index d44c9bd..1b42580 100644
--- a/test/D/Issues/2939_Ariovistus/Common/correctLinkOptions.py
+++ b/test/D/Issues/2939_Ariovistus/Common/correctLinkOptions.py
@@ -43,10 +43,10 @@ def testForTool(tool):
test = TestSCons.TestSCons()
if not isExecutableOfToolAvailable(test, tool) :
- test.skip_test("Required executable for tool '{}' not found, skipping test.\n".format(tool))
+ test.skip_test("Required executable for tool '{0}' not found, skipping test.\n".format(tool))
test.dir_fixture('Project')
- test.write('SConstruct', open('SConstruct_template', 'r').read().format('tools=["{}", "link"]'.format(tool)))
+ test.write('SConstruct', open('SConstruct_template', 'r').read().format('tools=["{0}", "link"]'.format(tool)))
test.run()
diff --git a/test/D/Issues/2940_Ariovistus/Common/correctLinkOptions.py b/test/D/Issues/2940_Ariovistus/Common/correctLinkOptions.py
index 0aaa283..8060add 100644
--- a/test/D/Issues/2940_Ariovistus/Common/correctLinkOptions.py
+++ b/test/D/Issues/2940_Ariovistus/Common/correctLinkOptions.py
@@ -43,7 +43,7 @@ def testForTool(tool):
test = TestSCons.TestSCons()
if not isExecutableOfToolAvailable(test, tool) :
- test.skip_test("Required executable for tool '{}' not found, skipping test.\n".format(tool))
+ test.skip_test("Required executable for tool '{0}' not found, skipping test.\n".format(tool))
platform = Base()['PLATFORM']
if platform == 'posix':
@@ -62,7 +62,7 @@ def testForTool(tool):
test.fail_test('No information about platform: ' + platform)
test.dir_fixture('Project')
- test.write('SConstruct', open('SConstruct_template', 'r').read().format('tools=["{}", "link"]'.format(tool)))
+ test.write('SConstruct', open('SConstruct_template', 'r').read().format('tools=["{0}", "link"]'.format(tool)))
test.run()