[Python-checkins] r76657 - in python/tags/r311: Lib/distutils/msvc9compiler.py Misc/NEWS

[martin.v.loewis]

Author: martin.v.loewis
Date: Thu Dec  3 22:11:40 2009
New Revision: 76657

Log:
Restore tag.


Modified:
   python/tags/r311/   (props changed)
   python/tags/r311/Lib/distutils/msvc9compiler.py
   python/tags/r311/Misc/NEWS

Modified: python/tags/r311/Lib/distutils/msvc9compiler.py
==============================================================================
--- python/tags/r311/Lib/distutils/msvc9compiler.py	(original)
+++ python/tags/r311/Lib/distutils/msvc9compiler.py	Thu Dec  3 22:11:40 2009
@@ -17,7 +17,6 @@
 import os
 import subprocess
 import sys
-import re
 
 from distutils.errors import DistutilsExecError, DistutilsPlatformError, \
                              CompileError, LibError, LinkError
@@ -646,28 +645,6 @@
                 mfid = 1
             else:
                 mfid = 2
-                try:
-                    # Remove references to the Visual C runtime, so they will
-                    # fall through to the Visual C dependency of Python.exe.
-                    # This way, when installed for a restricted user (e.g.
-                    # runtimes are not in WinSxS folder, but in Python's own
-                    # folder), the runtimes do not need to be in every folder
-                    # with .pyd's.
-                    manifest_f = open(temp_manifest, "rb")
-                    manifest_buf = manifest_f.read()
-                    manifest_f.close()
-                    pattern = re.compile(
-                        r"""<assemblyIdentity.*?name=("|')Microsoft\."""\
-                        r"""VC\d{2}\.CRT("|').*?(/>|</assemblyIdentity>)""",
-                        re.DOTALL)
-                    manifest_buf = re.sub(pattern, "", manifest_buf)
-                    pattern = "<dependentAssembly>\s*</dependentAssembly>"
-                    manifest_buf = re.sub(pattern, "", manifest_buf)
-                    manifest_f = open(temp_manifest, "wb")
-                    manifest_f.write(manifest_buf)
-                    manifest_f.close()
-                except IOError:
-                    pass
             out_arg = '-outputresource:%s;%s' % (output_filename, mfid)
             try:
                 self.spawn(['mt.exe', '-nologo', '-manifest',

Modified: python/tags/r311/Misc/NEWS
==============================================================================
--- python/tags/r311/Misc/NEWS	(original)
+++ python/tags/r311/Misc/NEWS	Thu Dec  3 22:11:40 2009
@@ -47,9 +47,6 @@
 Library
 -------
 
-- Issue #4120: Drop reference to CRT from manifest when building extensions with
-  msvc9compiler.
-
 - Issue #6106: telnetlib.Telnet.process_rawq doesn't handle default WILL/WONT
   DO/DONT correctly.