36 lines
1.3 KiB
Diff
36 lines
1.3 KiB
Diff
Index: build/generator/gen_base.py
|
|
===================================================================
|
|
--- a/build/generator/gen_base.py (revision 1900778)
|
|
+++ b/build/generator/gen_base.py (working copy)
|
|
@@ -76,7 +76,7 @@ class GeneratorBase:
|
|
|
|
# Now read and parse build.conf
|
|
parser = configparser.ConfigParser()
|
|
- parser.readfp(open(fname))
|
|
+ parser.read_file(open(fname))
|
|
|
|
self.conf = build_path(os.path.abspath(fname))
|
|
|
|
Index: build/win32/make_dist.py
|
|
===================================================================
|
|
--- a/build/win32/make_dist.py (revision 1900778)
|
|
+++ b/build/win32/make_dist.py (working copy)
|
|
@@ -383,7 +383,7 @@ def _read_config():
|
|
|
|
cfg = configparser.ConfigParser(path_defaults)
|
|
try:
|
|
- cfg.readfp(open(os.path.join(_scriptdir, 'make_dist.conf'), 'r'))
|
|
+ cfg.read_file(open(os.path.join(_scriptdir, 'make_dist.conf'), 'r'))
|
|
except:
|
|
_stderr.write('Unable to open and read make_dist.conf\n')
|
|
_exit(1)
|
|
@@ -390,7 +390,7 @@ def _read_config():
|
|
|
|
# Read the options config generated by gen-make.py
|
|
optcfg = configparser.ConfigParser()
|
|
- optcfg.readfp(open(os.path.join(_srcdir, 'gen-make.opts'), 'r'))
|
|
+ optcfg.read_file(open(os.path.join(_srcdir, 'gen-make.opts'), 'r'))
|
|
|
|
# Move the runtime options into the DEFAULT section
|
|
for opt in optcfg.options('options'):
|