From a97365847f038cbdec09b24a129755bbccb126c0 Mon Sep 17 00:00:00 2001 From: Steven Knight Date: Tue, 30 Aug 2005 02:28:48 +0000 Subject: Fix unicode encoder errors. --- src/engine/SCons/Tool/msvc.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/engine/SCons/Tool/msvc.py b/src/engine/SCons/Tool/msvc.py index 1077931..d6ecbfa 100644 --- a/src/engine/SCons/Tool/msvc.py +++ b/src/engine/SCons/Tool/msvc.py @@ -80,10 +80,9 @@ def _parse_msvc7_overrides(version): try: f = codecs.open(comps, 'r', 'utf16') encoder = codecs.getencoder('ascii') - except LookupError: - lines = codecs.open(comps, 'r', 'utf8').readlines() - else: lines = map(lambda l, e=encoder: e(l)[0], f.readlines()) + except (LookupError, UnicodeError): + lines = codecs.open(comps, 'r', 'utf8').readlines() if lines is None: lines = open(comps, 'r').readlines() -- cgit v0.12