aboutsummaryrefslogtreecommitdiff
path: root/youtube_dl/utils.py
diff options
context:
space:
mode:
authorPhilipp Hagemeister <phihag@phihag.de>2014-07-20 18:32:59 +0200
committerPhilipp Hagemeister <phihag@phihag.de>2014-07-20 18:32:59 +0200
commit71a6eaff83636415f9a0f985bf6e4b35b859ab54 (patch)
tree10d46130dbe5dc641128a291277835839e7cfbfc /youtube_dl/utils.py
parent7fd48d0413f1325619562a0ad0580e4a7fff34e1 (diff)
parent604f292ab7701b9284e50877f68ae7fcadcc34bf (diff)
Merge remote-tracking branch 'origin/master'
Diffstat (limited to 'youtube_dl/utils.py')
-rw-r--r--youtube_dl/utils.py2
1 files changed, 2 insertions, 0 deletions
diff --git a/youtube_dl/utils.py b/youtube_dl/utils.py
index 64a9618ca..919603c62 100644
--- a/youtube_dl/utils.py
+++ b/youtube_dl/utils.py
@@ -1194,6 +1194,8 @@ def format_bytes(bytes):
def str_to_int(int_str):
+ if int_str is None:
+ return None
int_str = re.sub(r'[,\.]', u'', int_str)
return int(int_str)