diff --git a/components/esptool_py/esptool/espefuse.py b/components/esptool_py/esptool/espefuse.py index 78e23980ac..507de8bf2a 100644 --- 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 index 68b0325650..3979e83eaa 100644 --- 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 index 3063556d4d..828129e6d6 100644 --- 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)