mirror of
https://github.com/ytdl-org/youtube-dl
synced 2024-12-23 04:30:10 +09:00
[utils] Do not fail in int_or_none on non-numeric data (Closes #7175)
This commit is contained in:
parent
ab953c64a0
commit
1812afb7b3
@ -1371,7 +1371,12 @@ def int_or_none(v, scale=1, default=None, get_attr=None, invscale=1):
|
|||||||
v = getattr(v, get_attr, None)
|
v = getattr(v, get_attr, None)
|
||||||
if v == '':
|
if v == '':
|
||||||
v = None
|
v = None
|
||||||
return default if v is None else (int(v) * invscale // scale)
|
if v is None:
|
||||||
|
return default
|
||||||
|
try:
|
||||||
|
return int(v) * invscale // scale
|
||||||
|
except ValueError:
|
||||||
|
pass
|
||||||
|
|
||||||
|
|
||||||
def str_or_none(v, default=None):
|
def str_or_none(v, default=None):
|
||||||
|
Loading…
Reference in New Issue
Block a user