diff options
| author | William Deegan <bill@baddogconsulting.com> | 2020-03-13 23:43:08 (GMT) |
|---|---|---|
| committer | William Deegan <bill@baddogconsulting.com> | 2020-03-13 23:43:08 (GMT) |
| commit | 38be2897587dfb0781839abb86c59fd19e2f2f55 (patch) | |
| tree | 85bf7733539fcdbbf530341a2771cd285f4505a1 | |
| parent | c697f53e8884d50d2fd785d53c3474507b6cbf44 (diff) | |
| download | SCons-38be2897587dfb0781839abb86c59fd19e2f2f55.zip SCons-38be2897587dfb0781839abb86c59fd19e2f2f55.tar.gz SCons-38be2897587dfb0781839abb86c59fd19e2f2f55.tar.bz2 | |
Purge some py 2.7 code
| -rw-r--r-- | src/engine/SCons/SubstTests.py | 7 | ||||
| -rw-r--r-- | test/Execute.py | 8 |
2 files changed, 1 insertions, 14 deletions
diff --git a/src/engine/SCons/SubstTests.py b/src/engine/SCons/SubstTests.py index 574e714..f2def65 100644 --- a/src/engine/SCons/SubstTests.py +++ b/src/engine/SCons/SubstTests.py @@ -577,10 +577,6 @@ class scons_subst_TestCase(SubstTestCase): scons_subst("${NONE[2]}", env, gvars={'NONE':None}) except SCons.Errors.UserError as e: expect = [ - # Python 2.3, 2.4 - "TypeError `unsubscriptable object' trying to evaluate `${NONE[2]}'", - # Python 2.5, 2.6 - "TypeError `'NoneType' object is unsubscriptable' trying to evaluate `${NONE[2]}'", # Python 2.7 and later "TypeError `'NoneType' object is not subscriptable' trying to evaluate `${NONE[2]}'", # Python 2.7 and later under Fedora @@ -596,9 +592,6 @@ class scons_subst_TestCase(SubstTestCase): scons_subst("${func(1)}", env, gvars={'func':func}) except SCons.Errors.UserError as e: expect = [ - # Python 2.3, 2.4, 2.5 - "TypeError `func() takes exactly 3 arguments (1 given)' trying to evaluate `${func(1)}'", - # Python 3.5 (and 3.x?) "TypeError `func() missing 2 required positional arguments: 'b' and 'c'' trying to evaluate `${func(1)}'" ] diff --git a/test/Execute.py b/test/Execute.py index 9dcafac..693bce4 100644 --- a/test/Execute.py +++ b/test/Execute.py @@ -83,13 +83,7 @@ test.write('k.in', "k.in\n") test.write('l.in', "l.in\n") test.write('m.in', "m.in\n") -if sys.platform == 'win32' and sys.version_info[0] == 2: - # note that nonexistent.in will have a \ on windows with python < 2.7.15 - # and a / on >= 2.7.15 (The third line below) - expect = r"""scons: \*\*\* Error 1 -scons: \*\*\* Error 2 -scons: \*\*\* nonexistent.in(/|\\)\*\.\*: (The system cannot find the path specified|Das System kann den angegebenen Pfad nicht finden)""" -elif sys.platform == 'win32' and sys.version_info[0] == 3: +if sys.platform == 'win32' and sys.version_info[0] == 3: expect = r"""scons: \*\*\* Error 1 scons: \*\*\* Error 2 scons: \*\*\* nonexistent.in: (The system cannot find the path specified|Das System kann den angegebenen Pfad nicht finden)""" |