X-Git-Url: https://git.ralfj.de/mass-build.git/blobdiff_plain/b8fb01b798441403be79fb586f2ece3a5578214e..eefd5614c5adc07d987de55e58de4e2d0089d887:/mass_build.py?ds=sidebyside

diff --git a/mass_build.py b/mass_build.py
index 93ae5a3..e327b7e 100755
--- a/mass_build.py
+++ b/mass_build.py
@@ -16,10 +16,19 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
-import vcs, build_system, imp
+import vcs, build_system
 import argparse, os, sys, subprocess
 from collections import OrderedDict
 
+# helper funcrions
+def load_module(name, path):
+	import importlib.machinery
+	old_val = sys.dont_write_bytecode
+	sys.dont_write_bytecode = True
+	module = importlib.machinery.SourceFileLoader(name, path).load_module()
+	sys.dont_write_bytecode = old_val
+	return module
+
 # an entire Project
 class Project:
 	def __init__(self, folder, config):
@@ -78,11 +87,8 @@ args = parser.parse_args()
 if args.reset_source and not args.update:
 	raise Exception("Can not reset sources without doing an update")
 
-# load config
-old_val = sys.dont_write_bytecode
-sys.dont_write_bytecode = True
-config = imp.load_source('config', args.config).__dict__
-sys.dont_write_bytecode = old_val
+# load config as dictionary
+config = load_module('config', args.config).__dict__
 
 # initialise variables holding the configuration
 allProjects = OrderedDict() # all projects
@@ -91,7 +97,7 @@ workProjects = [] # projects we work on
 
 # copy all items which don't exist below, except for those in the exclude list
 def inherit(subConfig, superConfig, exclude = ('name', 'projects')):
-	for name in list(superConfig.keys()):
+	for name in superConfig.keys():
 		if (not name in subConfig) and (not name in exclude):
 			subConfig[name] = superConfig[name]