mirror of
https://github.com/espressif/esp-idf.git
synced 2024-10-05 20:47:46 -04:00
Tools: Fix esptool wrappers by avoiding importing the module
Importing esptool in wrappers could cause importing the wrapper itself. Updating the PATH is not reliable. For example, os.path.realpath() changes the Windows driver letter to uppercase therefore, misses the right path for users with small device letters in their PATH. Removing paths without considering cases could also lead to errors. This fix invokes esptool scripts as modules without the need to importing them. Closes https://github.com/espressif/esp-idf/issues/9861 Closes https://github.com/espressif/vscode-esp-idf-extension/issues/791
This commit is contained in:
parent
6bb28c4cdc
commit
43deee5374
@ -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)
|
||||
|
@ -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)
|
||||
|
@ -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)
|
||||
|
Loading…
Reference in New Issue
Block a user