aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRemita Amine <remitamine@gmail.com>2019-11-29 17:05:06 +0100
committerRemita Amine <remitamine@gmail.com>2019-11-29 17:39:18 +0100
commit348c6bf1c1a00eec323d6e21ff7b9b12699afe04 (patch)
tree57082ca955ddaa2daab11f6a8a98dbcdb1c1fadc
parentb568561eba6f4aceb87419e21aba11567c5de7da (diff)
downloadyoutube-dl-348c6bf1c1a00eec323d6e21ff7b9b12699afe04.tar.xz
[utils] handle int values passed to str_to_int
-rw-r--r--test/test_utils.py1
-rw-r--r--youtube_dl/utils.py4
2 files changed, 3 insertions, 2 deletions
diff --git a/test/test_utils.py b/test/test_utils.py
index e83c8ea11..fed94a906 100644
--- a/test/test_utils.py
+++ b/test/test_utils.py
@@ -499,6 +499,7 @@ class TestUtil(unittest.TestCase):
def test_str_to_int(self):
self.assertEqual(str_to_int('123,456'), 123456)
self.assertEqual(str_to_int('123.456'), 123456)
+ self.assertEqual(str_to_int(523), 523)
def test_url_basename(self):
self.assertEqual(url_basename('http://foo.de/'), '')
diff --git a/youtube_dl/utils.py b/youtube_dl/utils.py
index b14603d8a..328f037a8 100644
--- a/youtube_dl/utils.py
+++ b/youtube_dl/utils.py
@@ -3519,8 +3519,8 @@ def str_or_none(v, default=None):
def str_to_int(int_str):
""" A more relaxed version of int_or_none """
- if int_str is None:
- return None
+ if not isinstance(int_str, compat_str):
+ return int_str
int_str = re.sub(r'[,\.\+]', '', int_str)
return int(int_str)