commit: acc383b9e3c2d454121c22570c901dd2c689dc26
parent f0812d784836d18fd25ea32f9b5a0c9c6e92425b
Author: dirkf <fieldhouse@gmx.net>
Date: Mon, 4 Mar 2024 20:52:58 +0000
[utils] Let int_or_none() accept a base, like int()
Diffstat:
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/test/test_utils.py b/test/test_utils.py
@@ -525,11 +525,14 @@ class TestUtil(unittest.TestCase):
self.assertEqual(float_or_none(set()), None)
def test_int_or_none(self):
+ self.assertEqual(int_or_none(42), 42)
self.assertEqual(int_or_none('42'), 42)
self.assertEqual(int_or_none(''), None)
self.assertEqual(int_or_none(None), None)
self.assertEqual(int_or_none([]), None)
self.assertEqual(int_or_none(set()), None)
+ self.assertEqual(int_or_none('42', base=8), 34)
+ self.assertRaises(TypeError, int_or_none(42, base=8))
def test_str_to_int(self):
self.assertEqual(str_to_int('123,456'), 123456)
diff --git 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