From: Christian Heimes <christian@cheimes.de>
Date: Fri, 28 Nov 2008 11:03:48 +0000 (+0000)
Subject: Merged revisions 67414 via svnmerge from
X-Git-Tag: v2.6.1~9
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=268be91d0137febefd7d1db47f9ccab078b82dac;p=thirdparty%2FPython%2Fcpython.git

Merged revisions 67414 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r67414 | christian.heimes | 2008-11-28 12:02:32 +0100 (Fri, 28 Nov 2008) | 1 line

  Fixed issue ##3741: DISTUTILS_USE_SDK set causes msvc9compiler.py to raise an exception
........
---

diff --git a/Lib/distutils/msvc9compiler.py b/Lib/distutils/msvc9compiler.py
index 804f1751ceb2..4f72e78096b2 100644
--- a/Lib/distutils/msvc9compiler.py
+++ b/Lib/distutils/msvc9compiler.py
@@ -316,7 +316,7 @@ class MSVCCompiler(CCompiler) :
         self.__version = VERSION
         self.__root = r"Software\Microsoft\VisualStudio"
         # self.__macros = MACROS
-        self.__path = []
+        self.__paths = []
         # target platform (.plat_name is consistent with 'bdist')
         self.plat_name = None
         self.__arch = None # deprecated name
diff --git a/Misc/NEWS b/Misc/NEWS
index 0e2c036c8ee2..0ec79ff536f0 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -52,6 +52,9 @@ Core and Builtins
 Library
 -------
 
+- Issue #3741: DISTUTILS_USE_SDK set causes msvc9compiler.py to raise an
+  exception.
+
 - Issue #4363: The uuid.uuid1() and uuid.uuid4() functions now work even if
   the ctypes module is not present.