mirror of
https://github.com/espressif/esp-idf.git
synced 2025-08-06 14:14:33 +02:00
Merge branch 'bugfix/place-typing-import-try' into 'master'
Fixed ImportError for Python2 caused by missing `typing` Closes IDF-3172 See merge request espressif/esp-idf!13336
This commit is contained in:
@@ -13,7 +13,11 @@
|
|||||||
# limitations under the License.
|
# limitations under the License.
|
||||||
|
|
||||||
import textwrap
|
import textwrap
|
||||||
|
|
||||||
|
try:
|
||||||
from typing import Optional
|
from typing import Optional
|
||||||
|
except ImportError:
|
||||||
|
pass
|
||||||
|
|
||||||
import serial.tools.miniterm as miniterm
|
import serial.tools.miniterm as miniterm
|
||||||
|
|
||||||
|
@@ -14,7 +14,11 @@
|
|||||||
|
|
||||||
|
|
||||||
import sys
|
import sys
|
||||||
|
|
||||||
|
try:
|
||||||
from typing import Optional
|
from typing import Optional
|
||||||
|
except ImportError:
|
||||||
|
pass
|
||||||
|
|
||||||
# ANSI terminal codes (if changed, regular expressions in LineMatcher need to be udpated)
|
# ANSI terminal codes (if changed, regular expressions in LineMatcher need to be udpated)
|
||||||
ANSI_RED = '\033[1;31m'
|
ANSI_RED = '\033[1;31m'
|
||||||
|
@@ -13,7 +13,11 @@
|
|||||||
# limitations under the License.
|
# limitations under the License.
|
||||||
|
|
||||||
import threading
|
import threading
|
||||||
|
|
||||||
|
try:
|
||||||
from typing import Optional
|
from typing import Optional
|
||||||
|
except ImportError:
|
||||||
|
pass
|
||||||
|
|
||||||
|
|
||||||
class StoppableThread(object):
|
class StoppableThread(object):
|
||||||
|
Reference in New Issue
Block a user