aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin v. Löwis <martin@v.loewis.de>2010-07-30 17:29:39 +0000
committerMartin v. Löwis <martin@v.loewis.de>2010-07-30 17:29:39 +0000
commitf10021dd80403478b1c9e276b6427b8cb1aa6cfc (patch)
tree81c81342cb3a26cfc2c45a2f327489c5f603c097 /PCbuild
parentAdd "longlist" and "source" commands, ideas borrowed from pdb++ by Antonio Cuni. (diff)
downloadcpython-f10021dd80403478b1c9e276b6427b8cb1aa6cfc.tar.gz
cpython-f10021dd80403478b1c9e276b6427b8cb1aa6cfc.tar.bz2
cpython-f10021dd80403478b1c9e276b6427b8cb1aa6cfc.zip
Drop 2.4 support. Add disabled algorithms to Configure options.
Diffstat (limited to 'PCbuild')
-rw-r--r--PCbuild/build_ssl.py13
1 files changed, 5 insertions, 8 deletions
diff --git a/PCbuild/build_ssl.py b/PCbuild/build_ssl.py
index 5858d5db43f..498b48ecfd0 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)