From 3543dc30c7e53fe912ed31586c2e43e0b9931b27 Mon Sep 17 00:00:00 2001
From: Sebastien Bourdeauducq <sb@m-labs.hk>
Date: Wed, 18 Feb 2015 08:51:44 -0700
Subject: [PATCH] Revert "tools/file_import: use python 3.4 importlib API"

This reverts commit 614a96a3d7cdbb2c12b75ec92e3e80493c95e397.

Conflicts:
	artiq/tools.py
---
 artiq/tools.py | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/artiq/tools.py b/artiq/tools.py
index 6a44e59ef..9296e8253 100644
--- a/artiq/tools.py
+++ b/artiq/tools.py
@@ -1,5 +1,4 @@
 from operator import itemgetter
-import sys
 import importlib.machinery
 import linecache
 import logging
@@ -32,8 +31,7 @@ def file_import(filename):
     sys.path.insert(0, path)
 
     loader = importlib.machinery.SourceFileLoader(modname, filename)
-    module = type(sys)(modname)
-    loader.exec_module(module)
+    module = loader.load_module()
 
     sys.path.remove(path)