From: Martin v. Löwis <martin@v.loewis.de>
Date: Fri, 30 Jul 2010 17:29:39 +0000 (+0000)
Subject: Drop 2.4 support. Add disabled algorithms to Configure options.
X-Git-Tag: v3.2a1~32
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f10021dd80403478b1c9e276b6427b8cb1aa6cfc;p=python

Drop 2.4 support. Add disabled algorithms to Configure options.
---

diff --git a/PCbuild/build_ssl.py b/PCbuild/build_ssl.py
index 5858d5db43..498b48ecfd 100644
--- a/PCbuild/build_ssl.py
+++ b/PCbuild/build_ssl.py
@@ -23,6 +23,7 @@
 # python.exe build_ssl.py Release x64
 # python.exe build_ssl.py Release Win32
 
+from __future__ import with_statement
 import os, sys, re, shutil
 
 # Find all "foo.exe" files on the PATH.
@@ -121,13 +122,10 @@ def fix_makefile(makefile):
     """
     if not os.path.isfile(makefile):
         return
-    # 2.4 compatibility
     fin = open(makefile)
-    if 1: # with open(makefile) as fin:
+    with open(makefile) as fin:
         lines = fin.readlines()
-        fin.close()
-    fout = open(makefile, 'w')
-    if 1: # with open(makefile, 'w') as fout:
+    with open(makefile, 'w') as fout:
         for line in lines:
             if line.startswith("PERL="):
                 continue
@@ -143,11 +141,10 @@ def fix_makefile(makefile):
                         line = line + noalgo
                 line = line + '\n'
             fout.write(line)
-    fout.close()
 
 def run_configure(configure, do_script):
-    print("perl Configure "+configure)
-    os.system("perl Configure "+configure)
+    print("perl Configure "+configure+" no-idea no-mdc2")
+    os.system("perl Configure "+configure+" no-idea no-mdc2")
     print(do_script)
     os.system(do_script)