projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[malltv] Add extractor (closes #18058)
[youtube-dl]
/
youtube_dl
/
utils.py
diff --git
a/youtube_dl/utils.py
b/youtube_dl/utils.py
index d2d3c1a9fde82510f47b8fcd43c726b51bedf9d6..f5a0bb4b05ea860011809fcd76610383cc525ca6 100644
(file)
--- a/
youtube_dl/utils.py
+++ b/
youtube_dl/utils.py
@@
-184,7
+184,7
@@
DATE_FORMATS_MONTH_FIRST.extend([
])
PACKED_CODES_RE = r"}\('(.+)',(\d+),(\d+),'([^']+)'\.split\('\|'\)"
])
PACKED_CODES_RE = r"}\('(.+)',(\d+),(\d+),'([^']+)'\.split\('\|'\)"
-JSON_LD_RE = r'(?is)<script[^>]+type=(["\'])application/ld\+json\1[^>]*>(?P<json_ld>.+?)</script>'
+JSON_LD_RE = r'(?is)<script[^>]+type=(["\']
?
)application/ld\+json\1[^>]*>(?P<json_ld>.+?)</script>'
def preferredencoding():
def preferredencoding():
@@
-1868,7
+1868,7
@@
def urljoin(base, path):
path = path.decode('utf-8')
if not isinstance(path, compat_str) or not path:
return None
path = path.decode('utf-8')
if not isinstance(path, compat_str) or not path:
return None
- if re.match(r'^(?:
https?
:)?//', path):
+ if re.match(r'^(?:
[a-zA-Z][a-zA-Z0-9+-.]*
:)?//', path):
return path
if isinstance(base, bytes):
base = base.decode('utf-8')
return path
if isinstance(base, bytes):
base = base.decode('utf-8')