From d6d135367931bcab667ce5d636e905d9712d6370 Mon Sep 17 00:00:00 2001 From: Steven Knight Date: Mon, 2 Mar 2009 23:10:32 +0000 Subject: Issue 2360: fix a TypeError from attempts to intern() unicode objects returned to the ClassicCPPScanner. --- src/CHANGES.txt | 2 ++ src/engine/SCons/Scanner/ScannerTests.py | 11 +++++++++++ src/engine/SCons/Scanner/__init__.py | 8 +++++++- 3 files changed, 20 insertions(+), 1 deletion(-) diff --git a/src/CHANGES.txt b/src/CHANGES.txt index 5897240..49dfcfa 100644 --- a/src/CHANGES.txt +++ b/src/CHANGES.txt @@ -17,6 +17,8 @@ RELEASE X.X.X - XXX - Fix scanning of Unicode files for both UTF-16 endian flavors. + - Fix a TypeError on #include of file names with Unicode characters. + RELEASE 1.2.0.d20090223 - Mon, 23 Feb 2009 08:41:06 -0800 diff --git a/src/engine/SCons/Scanner/ScannerTests.py b/src/engine/SCons/Scanner/ScannerTests.py index e3fa4ed..518e0ed 100644 --- a/src/engine/SCons/Scanner/ScannerTests.py +++ b/src/engine/SCons/Scanner/ScannerTests.py @@ -568,6 +568,17 @@ class ClassicCPPTestCase(unittest.TestCase): assert n == 'path/bbb', n assert i == 'bbb', i + # TODO(1.5): remove when 2.2 is minimal; replace ccc + # variable in find_include() call below with in-line u'ccc'. + try: + ccc = eval("u'ccc'") + except SyntaxError: + ccc = 'ccc' + + n, i = s.find_include(('<', ccc), 'foo', ('path',)) + assert n == 'path/ccc', n + assert i == 'ccc', i + finally: SCons.Node.FS.find_file = save diff --git a/src/engine/SCons/Scanner/__init__.py b/src/engine/SCons/Scanner/__init__.py index 6863aa1..c0d84b9 100644 --- a/src/engine/SCons/Scanner/__init__.py +++ b/src/engine/SCons/Scanner/__init__.py @@ -405,7 +405,13 @@ class ClassicCPP(Classic): n = SCons.Node.FS.find_file(include[1], paths) - return n, intern(include[1]) + i = include[1] + try: + i = intern(i) + except TypeError: + # Probably a unicode object; just don't worry about intern(). + pass + return n, i def sort_key(self, include): return SCons.Node.FS._my_normcase(string.join(include)) -- cgit v0.12