Merge remote-tracking branch 'Dineshs91/f4m-2.0'

[youtube-dl] / youtube_dl / extractor / adultswim.py

diff --git a/youtube_dl/extractor/adultswim.py b/youtube_dl/extractor/adultswim.py
index e4c78a81c6c5f4bfc1081f7b579c7cbcff537220..502a9c25ad8fd6ab8fed0a46f2f52077f988aad9 100644 (file)
--- a/youtube_dl/extractor/adultswim.py
+++ b/youtube_dl/extractor/adultswim.py
@@ -7,6 +7,8 @@ import json
 from .common import InfoExtractor
 from ..utils import (
     ExtractorError,
+    xpath_text,
+    float_or_none,
 )
 
 
@@ -16,7 +18,7 @@ class AdultSwimIE(InfoExtractor):
     _TESTS = [{
         'url': 'http://adultswim.com/videos/rick-and-morty/pilot',
         'playlist': [
-           {
+            {
                 'md5': '247572debc75c7652f253c8daa51a14d',
                 'info_dict': {
                     'id': 'rQxZvXQ4ROaSOqq-or2Mow-0',
@@ -128,7 +130,8 @@ class AdultSwimIE(InfoExtractor):
                 segment_url, segment_title,
                 'Downloading segment information', 'Unable to download segment information')
 
-            segment_duration = idoc.find('.//trt').text.strip()
+            segment_duration = float_or_none(
+                xpath_text(idoc, './/trt', 'segment duration').strip())
 
             formats = []
             file_els = idoc.findall('.//files/file')