diff options
| author | Steven Knight <knight@baldmt.com> | 2010-08-27 19:23:59 (GMT) |
|---|---|---|
| committer | Steven Knight <knight@baldmt.com> | 2010-08-27 19:23:59 (GMT) |
| commit | 017f807a0745357b4b9b16c52738ef5949f84b90 (patch) | |
| tree | f8592e5ada48a821e83ad3df2a38e28baa4c2c88 /src/engine/SCons/UtilTests.py | |
| parent | 06a72d788b7695cfc6a6e53e9d3808a12d929b9d (diff) | |
| download | SCons-017f807a0745357b4b9b16c52738ef5949f84b90.zip SCons-017f807a0745357b4b9b16c52738ef5949f84b90.tar.gz SCons-017f807a0745357b4b9b16c52738ef5949f84b90.tar.bz2 | |
Python 2.7 fixes in four tests.
Diffstat (limited to 'src/engine/SCons/UtilTests.py')
| -rw-r--r-- | src/engine/SCons/UtilTests.py | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/src/engine/SCons/UtilTests.py b/src/engine/SCons/UtilTests.py index 3f65456..a1e6756 100644 --- a/src/engine/SCons/UtilTests.py +++ b/src/engine/SCons/UtilTests.py @@ -668,7 +668,7 @@ class UtilTestCase(unittest.TestCase): def test_LogicalLines(self): """Test the LogicalLines class""" - fobj = io.StringIO(r""" + content = r""" foo \ bar \ baz @@ -676,7 +676,12 @@ foo bling \ bling \ bling bling -""") +""" + try: + fobj = io.StringIO(content) + except TypeError: + # Python 2.7 and beyond require unicode strings. + fobj = io.StringIO(unicode(content)) lines = LogicalLines(fobj).readlines() assert lines == [ |