From cf465dae0c24223e43870fa7e0524a67edf3cf0a Mon Sep 17 00:00:00 2001
From: Sebastien Bourdeauducq <sb@m-labs.hk>
Date: Sun, 31 Jan 2016 20:33:17 +0100
Subject: [PATCH] tools/file_import: make sure sys.path is always restored

---
 artiq/tools.py | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/artiq/tools.py b/artiq/tools.py
index d8abc603a..ef666cabf 100644
--- a/artiq/tools.py
+++ b/artiq/tools.py
@@ -85,11 +85,11 @@ def file_import(filename, prefix="file_import_"):
 
     path = os.path.dirname(os.path.realpath(filename))
     sys.path.insert(0, path)
-
-    loader = importlib.machinery.SourceFileLoader(modname, filename)
-    module = loader.load_module()
-
-    sys.path.remove(path)
+    try:
+        loader = importlib.machinery.SourceFileLoader(modname, filename)
+        module = loader.load_module()
+    finally:
+        sys.path.remove(path)
 
     return module