mirror of
https://github.com/espressif/esp-idf.git
synced 2024-09-20 00:36:01 -04:00
Merge branch 'bugfix/idf_tools_py_splittype_deprecation' into 'master'
idf_tools.py: avoid splittype call deprecated in python3.8 Closes IDFGH-4364 See merge request espressif/esp-idf!11956
This commit is contained in:
commit
19d2e4cca1
@ -64,11 +64,10 @@ except ImportError:
|
||||
pass
|
||||
|
||||
try:
|
||||
from urllib.parse import splittype
|
||||
from urllib.request import urlopen
|
||||
from urllib.error import ContentTooShortError
|
||||
except ImportError:
|
||||
from urllib import urlopen, splittype, ContentTooShortError
|
||||
from urllib import urlopen, ContentTooShortError
|
||||
|
||||
try:
|
||||
from exceptions import WindowsError
|
||||
@ -305,6 +304,14 @@ def unpack(filename, destination):
|
||||
archive_obj.extractall(destination)
|
||||
|
||||
|
||||
def splittype(url):
|
||||
match = re.match('([^/:]+):(.*)', url, re.DOTALL)
|
||||
if match:
|
||||
scheme, data = match.groups()
|
||||
return scheme.lower(), data
|
||||
return None, url
|
||||
|
||||
|
||||
# An alternative version of urlretrieve which takes SSL context as an argument
|
||||
def urlretrieve_ctx(url, filename, reporthook=None, data=None, context=None):
|
||||
url_type, path = splittype(url)
|
||||
|
Loading…
Reference in New Issue
Block a user