From f0167ea98c295c44022dafc29bc2b63a05644c5a Mon Sep 17 00:00:00 2001
From: Sebastian Krzyszkowiak <dos@dosowisko.net>
Date: Mon, 2 Oct 2023 09:12:30 +0200
Subject: [PATCH] simulator: Put fakes first into path
Lets the bl00mbox fake be imported in the simulator.
---
python_payload/st3m/application.py | 4 ++--
sim/run.py | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/python_payload/st3m/application.py b/python_payload/st3m/application.py
index 6f38e9dabe..9dfd13264f 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 c249494edd..e9436f5eba 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()
--
GitLab