projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[motorsport] Add extractor (Fixes #2688)
[youtube-dl]
/
youtube_dl
/
utils.py
diff --git
a/youtube_dl/utils.py
b/youtube_dl/utils.py
index b5326c0cba027e1f33ecb636a9de9c3c98919782..5f1f664c88f609868839ebf3f1db043a1c69d1d9 100644
(file)
--- a/
youtube_dl/utils.py
+++ b/
youtube_dl/utils.py
@@
-539,7
+539,6
@@
def encodeFilename(s, for_subprocess=False):
encoding = 'utf-8'
return s.encode(encoding, 'ignore')
encoding = 'utf-8'
return s.encode(encoding, 'ignore')
-
def decodeOption(optval):
if optval is None:
return optval
def decodeOption(optval):
if optval is None:
return optval
@@
-1177,12
+1176,12
@@
class HEADRequest(compat_urllib_request.Request):
return "HEAD"
return "HEAD"
-def int_or_none(v, scale=1):
- return
v
if v is None else (int(v) // scale)
+def int_or_none(v, scale=1
, default=None
):
+ return
default
if v is None else (int(v) // scale)
-def float_or_none(v, scale=1):
- return
v
if v is None else (float(v) / scale)
+def float_or_none(v, scale=1
, default=None
):
+ return
default
if v is None else (float(v) / scale)
def parse_duration(s):
def parse_duration(s):
@@
-1265,8
+1264,8
@@
class PagedList(object):
def uppercase_escape(s):
return re.sub(
def uppercase_escape(s):
return re.sub(
- r'\\U
([0-9a-fA-F]{8})
',
- lambda m:
compat_chr(int(m.group(1), base=16)
), s)
+ r'\\U
[0-9a-fA-F]{8}
',
+ lambda m:
m.group(0).decode('unicode-escape'
), s)
try:
struct.pack(u'!I', 0)
try:
struct.pack(u'!I', 0)