aboutsummaryrefslogtreecommitdiff
path: root/youtube_dl
diff options
context:
space:
mode:
Diffstat (limited to 'youtube_dl')
-rw-r--r--youtube_dl/utils.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/youtube_dl/utils.py b/youtube_dl/utils.py
index c249e7168..03c73dff3 100644
--- a/youtube_dl/utils.py
+++ b/youtube_dl/utils.py
@@ -3852,14 +3852,15 @@ class PUTRequest(compat_urllib_request.Request):
return 'PUT'
-def int_or_none(v, scale=1, default=None, get_attr=None, invscale=1):
+def int_or_none(v, scale=1, default=None, get_attr=None, invscale=1, base=None):
if get_attr:
if v is not None:
v = getattr(v, get_attr, None)
if v in (None, ''):
return default
try:
- return int(v) * invscale // scale
+ # like int, raise if base is specified and v is not a string
+ return (int(v) if base is None else int(v, base=base)) * invscale // scale
except (ValueError, TypeError, OverflowError):
return default