From f89275b02ae5bb7b6a3d2c9e714cefd2f93e460d Mon Sep 17 00:00:00 2001
From: Sebastien Bourdeauducq <sb@m-labs.hk>
Date: Sun, 20 Mar 2022 18:08:04 +0800
Subject: [PATCH] master: fix compiler access to source code with
 submit-by-content

---
 artiq/master/worker_impl.py | 29 ++++++++++++++++++++++++++---
 1 file changed, 26 insertions(+), 3 deletions(-)

diff --git a/artiq/master/worker_impl.py b/artiq/master/worker_impl.py
index 345ee058b..8d4ee9e36 100644
--- a/artiq/master/worker_impl.py
+++ b/artiq/master/worker_impl.py
@@ -13,7 +13,8 @@ import inspect
 import logging
 import traceback
 from collections import OrderedDict
-import types
+import importlib.util
+import linecache
 
 import h5py
 
@@ -135,9 +136,31 @@ def get_experiment_from_file(file, class_name):
     return tools.get_experiment(module, class_name)
 
 
+class StringLoader:
+    def __init__(self, fake_filename, content):
+        self.fake_filename = fake_filename
+        self.content = content
+
+    def get_source(self, fullname):
+        return self.content
+
+    def create_module(self, spec):
+        return None
+
+    def exec_module(self, module):
+        code = compile(self.get_source(self.fake_filename), self.fake_filename, "exec")
+        exec(code, module.__dict__)
+
+
 def get_experiment_from_content(content, class_name):
-    module = types.ModuleType("expcontent")
-    exec(content, module.__dict__)
+    fake_filename = "expcontent"
+    spec = importlib.util.spec_from_loader(
+        "expmodule",
+        StringLoader(fake_filename, content)
+    )
+    module = importlib.util.module_from_spec(spec)
+    spec.loader.exec_module(module)
+    linecache.lazycache(fake_filename, module.__dict__)
     return tools.get_experiment(module, class_name)