Merge branch 'fix/call_esptool_v5.0' into 'release/v5.0'

Tools: Fix esptool wrappers by avoiding importing the module (v5.0) See merge request espressif/esp-idf!21182
espressif · Nov 22, 2022 · 3d1c15c · 3d1c15c
2 parents 1f614bd + c93c631
commit 3d1c15c
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 39 deletions.
diff --git a/components/esptool_py/esptool/espefuse.py b/components/esptool_py/esptool/espefuse.py
@@ -4,19 +4,8 @@
 # SPDX-License-Identifier: Apache-2.0
 #
 
-import os
+import subprocess
 import sys
 
-try:
-    sys.path.remove(os.path.dirname(os.path.realpath(__file__)))  # do not import this script
-except ValueError:
-    pass
-
-try:
-    import espefuse
-except ImportError:
-    raise ModuleNotFoundError('No module named "espefuse" please install espefuse.py by running '
-                              'the install and export scripts.')
-
 if __name__ == '__main__':
-    espefuse._main()  # type: ignore
+    sys.exit(subprocess.run([sys.executable, '-m', 'espefuse'] + sys.argv[1:]).returncode)
diff --git a/components/esptool_py/esptool/espsecure.py b/components/esptool_py/esptool/espsecure.py
@@ -4,19 +4,8 @@
 # SPDX-License-Identifier: Apache-2.0
 #
 
-import os
+import subprocess
 import sys
 
-try:
-    sys.path.remove(os.path.dirname(os.path.realpath(__file__)))  # do not import this script
-except ValueError:
-    pass
-
-try:
-    import espsecure
-except ImportError:
-    raise ModuleNotFoundError('No module named "espsecure" please install espsecure.py by running '
-                              'the install and export scripts.')
-
 if __name__ == '__main__':
-    espsecure._main()  # type: ignore
+    sys.exit(subprocess.run([sys.executable, '-m', 'espsecure'] + sys.argv[1:]).returncode)
diff --git a/components/esptool_py/esptool/esptool.py b/components/esptool_py/esptool/esptool.py
@@ -4,19 +4,8 @@
 # SPDX-License-Identifier: Apache-2.0
 #
 
-import os
+import subprocess
 import sys
 
-try:
-    sys.path.remove(os.path.dirname(os.path.realpath(__file__)))  # do not import this script
-except ValueError:
-    pass
-
-try:
-    import esptool
-except ImportError:
-    raise ModuleNotFoundError('No module named "esptool" please install esptool.py by running '
-                              'the install and export scripts.')
-
 if __name__ == '__main__':
-    esptool._main()  # type: ignore
+    sys.exit(subprocess.run([sys.executable, '-m', 'esptool'] + sys.argv[1:]).returncode)