diff --git a/python_payload/st3m/application.py b/python_payload/st3m/application.py index 6f38e9dabe4e8fc051a9dcb4f62eba5a3fae0b99..9dfd13264fcd0affff09d545de969dfda10f2902 100644 --- a/python_payload/st3m/application.py +++ b/python_payload/st3m/application.py @@ -178,11 +178,11 @@ class BundleMetadata: containing_path = os.path.dirname(self.path) package_name = os.path.basename(self.path) - if sys.path[0].endswith("python_payload"): + if sys.path[1].endswith("python_payload"): # We are in the simulator. Hack around to get this to work. prefix = "/flash/sys" assert containing_path.startswith(prefix) - containing_path = containing_path.replace(prefix, sys.path[0]) + containing_path = containing_path.replace(prefix, sys.path[1]) new_sys_path = old_sys_path + [containing_path] self._sys_path_set(new_sys_path) diff --git a/sim/run.py b/sim/run.py index c249494edd812d7d320f7927f4c882183f2b7226..e9436f5eba8c487ffe24e6586fc8f09860baa178 100755 --- a/sim/run.py +++ b/sim/run.py @@ -54,9 +54,9 @@ class UnderscoreFinder(importlib.abc.MetaPathFinder): # sys.meta_path.insert(0, Hook()) sys.path = [ + os.path.join(projectpath, "sim", "fakes"), os.path.join(projectpath, "python_payload"), os.path.join(projectpath, "components", "micropython", "frozen"), - os.path.join(projectpath, "sim", "fakes"), ] builtin = BuiltinImporter()