]> gitweb @ CieloNegro.org - youtube-dl.git/commitdiff
[utils] Improve str_to_int
authorSergey M․ <dstftw@gmail.com>
Sun, 15 Dec 2019 16:15:24 +0000 (23:15 +0700)
committerSergey M․ <dstftw@gmail.com>
Sun, 15 Dec 2019 16:15:24 +0000 (23:15 +0700)
test/test_utils.py
youtube_dl/utils.py

index fed94a906bd72c733e743596d917fe6f8d4f4145..0896f41506aa6d6cdb45b1c601203d6e717946d6 100644 (file)
@@ -500,6 +500,11 @@ class TestUtil(unittest.TestCase):
         self.assertEqual(str_to_int('123,456'), 123456)
         self.assertEqual(str_to_int('123.456'), 123456)
         self.assertEqual(str_to_int(523), 523)
+        # Python 3 has no long
+        if sys.version_info < (3, 0):
+            eval('self.assertEqual(str_to_int(123456L), 123456)')
+        self.assertEqual(str_to_int('noninteger'), None)
+        self.assertEqual(str_to_int([]), None)
 
     def test_url_basename(self):
         self.assertEqual(url_basename('http://foo.de/'), '')
index 328f037a8aa8313158e543e3c2abf8491ae3d1af..f6204692a81002cdfc44b02d183126e755283bd9 100644 (file)
@@ -46,6 +46,7 @@ from .compat import (
     compat_html_entities,
     compat_html_entities_html5,
     compat_http_client,
+    compat_integer_types,
     compat_kwargs,
     compat_os_name,
     compat_parse_qs,
@@ -3519,10 +3520,11 @@ def str_or_none(v, default=None):
 
 def str_to_int(int_str):
     """ A more relaxed version of int_or_none """
-    if not isinstance(int_str, compat_str):
+    if isinstance(int_str, compat_integer_types):
         return int_str
-    int_str = re.sub(r'[,\.\+]', '', int_str)
-    return int(int_str)
+    elif isinstance(int_str, compat_str):
+        int_str = re.sub(r'[,\.\+]', '', int_str)
+        return int_or_none(int_str)
 
 
 def float_or_none(v, scale=1, invscale=1, default=None):