alex/esp-idf
alex/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2024-10-05 20:47:46 -04:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

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

Browse Source 
Tools: Fix esptool wrappers by avoiding importing the module (v5.0)

See merge request espressif/esp-idf!21182
This commit is contained in:
Roland Dobai 2022-11-22 23:37:08 +08:00
commit 3d1c15cd94
3 changed files with 6 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
components/esptool_py/esptool/espefuse.py
View File

@ -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)

15
components/esptool_py/esptool/espsecure.py
View File

@ -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)

15
components/esptool_py/esptool/esptool.py
View File

@ -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)