From: Ralf Jung <post@ralfj.de>
Date: Mon, 23 Sep 2013 15:33:50 +0000 (+0200)
Subject: Move loading a module by filename into a helper function
X-Git-Url: https://git.ralfj.de/mass-build.git/commitdiff_plain/eefd5614c5adc07d987de55e58de4e2d0089d887?ds=inline;hp=b1a7ca874f864a9ddda2d97eaa188e1935d1300d

Move loading a module by filename into a helper function
---

diff --git a/mass_build.py b/mass_build.py
index 88db907..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, importlib.machinery
+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 = importlib.machinery.SourceFileLoader('config', args.config).load_module().__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