[Python-checkins] cpython (2.7): Close #23963: Fix building with original OpenSSL sources.

[zach.ware]

https://hg.python.org/cpython/rev/d1f4d14bd550
changeset:   96915:d1f4d14bd550
branch:      2.7
parent:      96905:f93149f31ace
user:        Zachary Ware <zachary.ware at gmail.com>
date:        Wed Jul 15 23:33:15 2015 -0500
summary:
  Close #23963: Fix building with original OpenSSL sources.

Backport of bcf93e3766e8.

files:
  PCbuild/build_ssl.py |  13 +++++--------
  1 files changed, 5 insertions(+), 8 deletions(-)


diff --git a/PCbuild/build_ssl.py b/PCbuild/build_ssl.py
--- a/PCbuild/build_ssl.py
+++ b/PCbuild/build_ssl.py
@@ -24,6 +24,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.
@@ -98,13 +99,10 @@
     """
     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
@@ -120,11 +118,10 @@
                         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)
 

-- 
Repository URL: https://hg.python.org/cpython