From: Michael W. Hudson <mwh@python.net>
Date: Fri, 22 Feb 2002 13:55:28 +0000 (+0000)
Subject: Backport theller's check-in of revision 1.45:
X-Git-Tag: v2.2.1c1~188
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dcaab1fb1b7cff3bfa05249e4fcc00a69948df2a;p=thirdparty%2FPython%2Fcpython.git

Backport theller's check-in of revision 1.45:

Make it 1.5.2 compatible again.

(I'm not sure how having symlinks around the repository interacts with
branches -- I'm going to tread carefully in here)
---

diff --git a/Lib/distutils/msvccompiler.py b/Lib/distutils/msvccompiler.py
index 35336642ae70..79a4901bea15 100644
--- a/Lib/distutils/msvccompiler.py
+++ b/Lib/distutils/msvccompiler.py
@@ -117,10 +117,11 @@ def get_msvc_paths (path, version='6.0', platform='x86'):
                     if string.upper(p) == path:
                         V = string.split(v,';')
                         for v in V:
-                            try:
-                                v = v.encode("mbcs")
-                            except UnicodeError:
-                                pass
+                            if hasattr(v, "encode"):
+                                try:
+                                    v = v.encode("mbcs")
+                                except UnicodeError:
+                                    pass
                             if v == '' or v in L: continue
                             L.append(v)
                         break