summaryrefslogtreecommitdiff
path: root/test/Scanner
diff options
context:
space:
mode:
authorGary Oberbrunner <garyo@oberbrunner.com>2013-09-22 13:08:12 -0400
committerGary Oberbrunner <garyo@oberbrunner.com>2013-09-22 13:08:12 -0400
commit895990cbd5007876709b93e6d3db2b6c069382ea (patch)
treeb95b2144ccf82d8227cec025af152f4eadfa7282 /test/Scanner
parentf094b77fc68787c61efdc9ca095098c88bf52373 (diff)
downloadscons-895990cbd5007876709b93e6d3db2b6c069382ea.tar.gz
Result of raw 2to3 run (2to3-2.7); checkpoint for python3 conversion.
Diffstat (limited to 'test/Scanner')
-rw-r--r--test/Scanner/unicode.py10
1 files changed, 5 insertions, 5 deletions
diff --git a/test/Scanner/unicode.py b/test/Scanner/unicode.py
index 55e22bdd..7a72804e 100644
--- a/test/Scanner/unicode.py
+++ b/test/Scanner/unicode.py
@@ -36,7 +36,7 @@ _python_ = TestSCons._python_
test = TestSCons.TestSCons()
try:
- unicode
+ str
except NameError:
import sys
msg = "Unicode not supported by Python version %s; skipping test\n"
@@ -102,28 +102,28 @@ include utf16be.k
foo.k 1 line 4
""")
-contents = unicode("""\
+contents = str("""\
ascii.k 1 line 1
include ascii.inc
ascii.k 1 line 3
""")
test.write('ascii.k', contents.encode('ascii'))
-contents = unicode("""\
+contents = str("""\
utf8.k 1 line 1
include utf8.inc
utf8.k 1 line 3
""")
test.write('utf8.k', codecs.BOM_UTF8 + contents.encode('utf-8'))
-contents = unicode("""\
+contents = str("""\
utf16le.k 1 line 1
include utf16le.inc
utf16le.k 1 line 3
""")
test.write('utf16le.k', codecs.BOM_UTF16_LE + contents.encode('utf-16-le'))
-contents = unicode("""\
+contents = str("""\
utf16be.k 1 line 1
include utf16be.inc
utf16be.k 1 line 3