summary refs log tree commit diff
diff options
context:
space:
mode:
authorSergey M․ <dstftw@gmail.com>2015-01-12 21:06:26 +0600
committerSergey M․ <dstftw@gmail.com>2015-01-12 21:06:26 +0600
commit227d4822fff13ea449f11531ce54c56b2b01432b (patch)
treedbf9894f7db4687c4cf3595ef9bc21e1a215b2bd
parent5c4a81d9345f0520a9d40acbb8212fb94bcc9e24 (diff)
downloadyoutube-dl-227d4822fff13ea449f11531ce54c56b2b01432b.tar.gz
youtube-dl-227d4822fff13ea449f11531ce54c56b2b01432b.tar.xz
youtube-dl-227d4822fff13ea449f11531ce54c56b2b01432b.zip
[utils] Disallow non string types in parse_duration (Closes #4679)
-rw-r--r--youtube_dl/utils.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/youtube_dl/utils.py b/youtube_dl/utils.py
index deaf71803..98732e8e9 100644
--- a/youtube_dl/utils.py
+++ b/youtube_dl/utils.py
@@ -1269,7 +1269,7 @@ def float_or_none(v, scale=1, invscale=1, default=None):
 
 
 def parse_duration(s):
-    if s is None:
+    if not isinstance(s, basestring if sys.version_info < (3, 0) else compat_str):
         return None
 
     s = s.strip()