Skip to content

Commit

Permalink
Merge branch 'fix/call_esptool' into 'master'
Browse files Browse the repository at this point in the history
Tools: Fix esptool wrappers by avoiding importing the module

Closes IDFGH-8395

See merge request espressif/esp-idf!21053
  • Loading branch information
dobairoland committed Nov 21, 2022
2 parents 71968a4 + 43deee5 commit c51a14b
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 39 deletions.
15 changes: 2 additions & 13 deletions components/esptool_py/esptool/espefuse.py
Expand Up @@ -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 changes: 2 additions & 13 deletions components/esptool_py/esptool/espsecure.py
Expand Up @@ -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 changes: 2 additions & 13 deletions components/esptool_py/esptool/esptool.py
Expand Up @@ -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)

0 comments on commit c51a14b

Please sign in to comment.