diff options
| author | Ludwig Hähne <pankrat@tigris.org> | 2009-05-17 10:22:30 (GMT) |
|---|---|---|
| committer | Ludwig Hähne <pankrat@tigris.org> | 2009-05-17 10:22:30 (GMT) |
| commit | 3234d7f71a124a2656bb0ad300b6969b4f0f4da2 (patch) | |
| tree | a20763a234605abfde417736aeeb0a248f753e2a /src/engine/SCons/Scanner | |
| parent | 2d548244bc07ab8faf2c9c1196958007c98ad4bf (diff) | |
| download | SCons-3234d7f71a124a2656bb0ad300b6969b4f0f4da2.zip SCons-3234d7f71a124a2656bb0ad300b6969b4f0f4da2.tar.gz SCons-3234d7f71a124a2656bb0ad300b6969b4f0f4da2.tar.bz2 | |
Issue 2415: Tolerate unicode strings when using intern()
Diffstat (limited to 'src/engine/SCons/Scanner')
| -rw-r--r-- | src/engine/SCons/Scanner/__init__.py | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/src/engine/SCons/Scanner/__init__.py b/src/engine/SCons/Scanner/__init__.py index d0c7d3c..cbf829c 100644 --- a/src/engine/SCons/Scanner/__init__.py +++ b/src/engine/SCons/Scanner/__init__.py @@ -358,10 +358,7 @@ class Classic(Current): includes = self.find_include_names (node) # Intern the names of the include files. Saves some memory # if the same header is included many times. - try: - node.includes = map(intern, includes) - except TypeError: - node.includes = includes + node.includes = map(SCons.Util.silent_intern, includes) # This is a hand-coded DSU (decorate-sort-undecorate, or # Schwartzian transform) pattern. The sort key is the raw name @@ -405,12 +402,7 @@ class ClassicCPP(Classic): n = SCons.Node.FS.find_file(include[1], paths) - i = include[1] - try: - i = intern(i) - except TypeError: - # Probably a unicode object; just don't worry about intern(). - pass + i = SCons.Util.silent_intern(include[1]) return n, i def sort_key(self, include): |