doc/mkdocdeps.py: Convert execfile to import
authorW. Trevor King <wking@tremily.us>
Sat, 5 Apr 2014 17:31:05 +0000 (10:31 -0700)
committerDavid Bremner <david@tethera.net>
Mon, 21 Apr 2014 12:31:36 +0000 (21:31 +0900)
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

index 71bd1356e5160368038bb0b0ab24f4f40a07139d..de1cbb8f2bedc59c5f5fc46280a7282f22e9503a 100644 (file)
@@ -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])]