From b10b12da890d31819e411aec5158dca99359e830 Mon Sep 17 00:00:00 2001 From: "W. Trevor King" Date: Sat, 5 Apr 2014 10:31:05 -0700 Subject: [PATCH] doc/mkdocdeps.py: Convert execfile to import excefile is gone in Python 3 [1]. Instead of exec-ing the configuration, it's easier to insert the source directory in Python's path [2], and just import the configuration. With this change, mkdocdeps.py is compatible with both Python 2 and 3. [1]: https://docs.python.org/3.0/whatsnew/3.0.html#builtins [2]: https://docs.python.org/3/library/sys.html#sys.path --- doc/mkdocdeps.py | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/doc/mkdocdeps.py b/doc/mkdocdeps.py index 71bd1356..de1cbb8f 100644 --- a/doc/mkdocdeps.py +++ b/doc/mkdocdeps.py @@ -1,15 +1,16 @@ -from sys import argv -srcdir = argv[1] -builddir = argv[2] -outfile = argv[3] +import sys -execfile(srcdir + '/conf.py') +srcdir = sys.argv[1] +builddir = sys.argv[2] +outfile = sys.argv[3] +sys.path.insert(0, srcdir) +import conf roff_files = [] rst_files = [] out=open(outfile,'w') -for page in man_pages: +for page in conf.man_pages: rst_files = rst_files + ["{0:s}/{1:s}.rst".format(srcdir,page[0])] roff_files = roff_files + ["{0:s}/man/{1:s}.{2:d}".format(builddir,page[0],page[4])]