Merged revisions 61038,61042-61045,61047,61050,61053,61055-61056,61061-61062,61066,61068,61070,61083,61085,61092-61097,61103-61104,61110-61112,61114-61115,61117,61120-61122,61126-61136 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r61128 | martin.v.loewis | 2008-02-29 17:59:21 +0100 (Fr, 29 Feb 2008) | 1 line
Make _hashlib a separate project.
........
r61132 | georg.brandl | 2008-02-29 19:15:36 +0100 (Fr, 29 Feb 2008) | 2 lines
Until we got downloadable docs, stop confusing viewers by talking about a nonexisting table.
........
r61133 | martin.v.loewis | 2008-02-29 19:17:23 +0100 (Fr, 29 Feb 2008) | 1 line
Build db-4.4.20 with VS9; remove VS2003 build if necessary.
........
r61135 | georg.brandl | 2008-02-29 19:21:29 +0100 (Fr, 29 Feb 2008) | 2 lines
#2208: allow for non-standard HHC location.
........
r61136 | martin.v.loewis | 2008-02-29 19:54:45 +0100 (Fr, 29 Feb 2008) | 1 line
Port build_ssl.py to 2.4; support HOST_PYTHON variable
........
diff --git a/PCbuild/build_ssl.py b/PCbuild/build_ssl.py
index 2ccceec..f24c906 100644
--- a/PCbuild/build_ssl.py
+++ b/PCbuild/build_ssl.py
@@ -102,8 +102,11 @@
"""
if not os.path.isfile(m32):
return
- with open(m32) as fin:
- with open(makefile, 'w') as fout:
+ # 2.4 compatibility
+ fin = open(m32)
+ if 1: # with open(m32) as fin:
+ fout = open(makefile, 'w')
+ if 1: # with open(makefile, 'w') as fout:
for line in fin:
line = line.replace("=tmp32", "=tmp64")
line = line.replace("=out32", "=out64")
@@ -121,9 +124,13 @@
"""
if not os.path.isfile(makefile):
return
- with open(makefile) as fin:
+ # 2.4 compatibility
+ fin = open(makefile)
+ if 1: # with open(makefile) as fin:
lines = fin.readlines()
- with open(makefile, 'w') as fout:
+ fin.close()
+ fout = open(makefile, 'w')
+ if 1: # with open(makefile, 'w') as fout:
for line in lines:
if line.startswith("PERL="):
continue
@@ -139,6 +146,7 @@
line = line + noalgo
line = line + '\n'
fout.write(line)
+ fout.close()
def run_configure(configure, do_script):
print("perl Configure "+configure)