From: Sergey M․ <dstftw@gmail.com>
Date: Wed, 14 Oct 2015 16:36:37 +0000 (+0600)
Subject: [utils] Do not fail in float_or_none on non-numeric data
X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=commitdiff_plain;h=caf80631f0c57b29187e2aa909fa1a3a6325d6e6;p=youtube-dl

[utils] Do not fail in float_or_none on non-numeric data
---

diff --git a/youtube_dl/utils.py b/youtube_dl/utils.py
index 86c693358..83b44caaa 100644
--- a/youtube_dl/utils.py
+++ b/youtube_dl/utils.py
@@ -1392,7 +1392,12 @@ def str_to_int(int_str):
 
 
 def float_or_none(v, scale=1, invscale=1, default=None):
-    return default if v is None else (float(v) * invscale / scale)
+    if v is None:
+        return default
+    try:
+        return float(v) * invscale / scale
+    except ValueError:
+        return default
 
 
 def parse_duration(s):