diff options
Diffstat (limited to 'test')
-rw-r--r-- | test/Subst/TypeError.py | 2 | ||||
-rw-r--r-- | test/option/profile.py | 10 |
2 files changed, 7 insertions, 5 deletions
diff --git a/test/Subst/TypeError.py b/test/Subst/TypeError.py index ed000fd..a996a77 100644 --- a/test/Subst/TypeError.py +++ b/test/Subst/TypeError.py @@ -35,7 +35,7 @@ test = TestSCons.TestSCons(match = TestSCons.match_re_dotall) -expect_build = r"""scons: \*\*\*%s TypeError `(unsubscriptable object|'NoneType' object is unsubscriptable)' trying to evaluate `%s' +expect_build = r"""scons: \*\*\*%s TypeError `(unsubscriptable object|'NoneType' object is (not |un)subscriptable)' trying to evaluate `%s' """ expect_read = "\n" + expect_build + TestSCons.file_expr diff --git a/test/option/profile.py b/test/option/profile.py index 5a4b392..d53c690 100644 --- a/test/option/profile.py +++ b/test/option/profile.py @@ -25,16 +25,18 @@ __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__" import sys try: - from io import StringIO as _StringIO + import io + _StringIO = io.StringIO except (ImportError, AttributeError): # Pre-2.6 Python has no "io" module. exec('from cStringIO import StringIO') else: - # TODO(2.6): The 2.6 io.StringIO.write() method requires unicode strings. - # This subclass can be removed when we drop support for Python 2.6. + # TODO(2.6): In 2.6 and beyond, the io.StringIO.write() method + # requires unicode strings. This subclass can probably be removed + # when we drop support for Python 2.6. class StringIO(_StringIO): def write(self, s): - super(_StringIO, self).write(unicode(s)) + _StringIO.write(self, unicode(s)) import TestSCons |