projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[freesound] Fix extraction and extended (closes #11602)
[youtube-dl]
/
youtube_dl
/
utils.py
diff --git
a/youtube_dl/utils.py
b/youtube_dl/utils.py
index 694e9a600387977cd99f0af5ba63e87d26ba0f5e..39dd6c49f5d80022a913a03bfc90369971396b1f 100644
(file)
--- a/
youtube_dl/utils.py
+++ b/
youtube_dl/utils.py
@@
-501,7
+501,7
@@
def sanitize_path(s):
if drive_or_unc:
norm_path.pop(0)
sanitized_path = [
if drive_or_unc:
norm_path.pop(0)
sanitized_path = [
- path_part if path_part in ['.', '..'] else re.sub(
'(?:[/<>:"\\|\\\\?\
\*]|[\s.]$)', '#', path_part)
+ path_part if path_part in ['.', '..'] else re.sub(
r'(?:[/<>:"\|\\?
\*]|[\s.]$)', '#', path_part)
for path_part in norm_path]
if drive_or_unc:
sanitized_path.insert(0, drive_or_unc + os.path.sep)
for path_part in norm_path]
if drive_or_unc:
sanitized_path.insert(0, drive_or_unc + os.path.sep)
@@
-1183,7
+1183,7
@@
def date_from_str(date_str):
return today
if date_str == 'yesterday':
return today - datetime.timedelta(days=1)
return today
if date_str == 'yesterday':
return today - datetime.timedelta(days=1)
- match = re.match('(now|today)(?P<sign>[+-])(?P<time>\d+)(?P<unit>day|week|month|year)(s)?', date_str)
+ match = re.match(
r
'(now|today)(?P<sign>[+-])(?P<time>\d+)(?P<unit>day|week|month|year)(s)?', date_str)
if match is not None:
sign = match.group('sign')
time = int(match.group('time'))
if match is not None:
sign = match.group('sign')
time = int(match.group('time'))
@@
-1703,9
+1703,9
@@
def base_url(url):
def urljoin(base, path):
if not isinstance(path, compat_str) or not path:
return None
def urljoin(base, path):
if not isinstance(path, compat_str) or not path:
return None
- if re.match(r'
https?:
//', path):
+ if re.match(r'
^(?:https?:)?
//', path):
return path
return path
- if not isinstance(base, compat_str) or not re.match(r'
https?:
//', base):
+ if not isinstance(base, compat_str) or not re.match(r'
^(?:https?:)?
//', base):
return None
return compat_urlparse.urljoin(base, path)
return None
return compat_urlparse.urljoin(base, path)