From 6b8ef8c490629a623c1339f0e4370537c73dc2af Mon Sep 17 00:00:00 2001
From: whitequark <whitequark@whitequark.org>
Date: Fri, 28 Aug 2015 02:22:59 -0500
Subject: [PATCH] artiq_run: use "artiq_run_" as user code module prefix, not
 "file_import_".

---
 artiq/frontend/artiq_run.py | 2 +-
 artiq/tools.py              | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/artiq/frontend/artiq_run.py b/artiq/frontend/artiq_run.py
index 600275368..0943baf7c 100755
--- a/artiq/frontend/artiq_run.py
+++ b/artiq/frontend/artiq_run.py
@@ -92,7 +92,7 @@ def _build_experiment(dmgr, pdb, rdb, args):
                                  "for ELF kernels")
             return ELFRunner(dmgr, pdb, rdb, file=args.file)
         else:
-            module = file_import(args.file)
+            module = file_import(args.file, prefix="artiq_run_")
         file = args.file
     else:
         module = sys.modules["__main__"]
diff --git a/artiq/tools.py b/artiq/tools.py
index 767e858dd..445f5c9fc 100644
--- a/artiq/tools.py
+++ b/artiq/tools.py
@@ -19,7 +19,7 @@ def parse_arguments(arguments):
     return d
 
 
-def file_import(filename):
+def file_import(filename, prefix="file_import_"):
     linecache.checkcache(filename)
 
     modname = filename
@@ -29,7 +29,7 @@ def file_import(filename):
     i = modname.find(".")
     if i > 0:
         modname = modname[:i]
-    modname = "file_import_" + modname
+    modname = prefix + modname
 
     path = os.path.dirname(os.path.realpath(filename))
     sys.path.insert(0, path)