X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=youtube_dl%2Fextractor%2Fnoz.py;h=ccafd77232b5f1e69f61dd5a99e904c7775a51a7;hb=HEAD;hp=4e60b13a5098de47ed0722e3543c176fdf283609;hpb=cf6cd07396479940bbf9ca71778a72807208fabb;p=youtube-dl

diff --git a/youtube_dl/extractor/noz.py b/youtube_dl/extractor/noz.py
index 4e60b13a5..ccafd7723 100644
--- a/youtube_dl/extractor/noz.py
+++ b/youtube_dl/extractor/noz.py
@@ -2,9 +2,13 @@
 from __future__ import unicode_literals
 
 from .common import InfoExtractor
-from ..compat import compat_urllib_parse_unquote
+from ..compat import (
+    compat_urllib_parse_unquote,
+    compat_xpath,
+)
 from ..utils import (
     int_or_none,
+    find_xpath_attr,
     xpath_text,
     update_url_query,
 )
@@ -20,7 +24,7 @@ class NozIE(InfoExtractor):
             'duration': 215,
             'title': '3:2 - Deutschland gewinnt Badminton-Länderspiel in Melle',
             'description': 'Vor rund 370 Zuschauern gewinnt die deutsche Badminton-Nationalmannschaft am Donnerstag ein EM-Vorbereitungsspiel gegen Frankreich in Melle. Video Moritz Frankenberg.',
-            'thumbnail': 're:^http://.*\.jpg',
+            'thumbnail': r're:^http://.*\.jpg',
         },
     }]
 
@@ -46,9 +50,10 @@ class NozIE(InfoExtractor):
         duration = int_or_none(xpath_text(
             doc, './/article/movie/file/duration'))
         formats = []
-        for qnode in doc.findall('.//article/movie/file/qualities/qual'):
-            http_url = xpath_text(
-                qnode, './html_urls/video_url[@format="video/mp4"]')
+        for qnode in doc.findall(compat_xpath('.//article/movie/file/qualities/qual')):
+            http_url_ele = find_xpath_attr(
+                qnode, './html_urls/video_url', 'format', 'video/mp4')
+            http_url = http_url_ele.text if http_url_ele is not None else None
             if http_url:
                 formats.append({
                     'url': http_url,
@@ -64,8 +69,10 @@ class NozIE(InfoExtractor):
                     formats.extend(self._extract_f4m_formats(
                         update_url_query(f4m_url, {'hdcore': '3.4.0'}),
                         video_id, f4m_id='hds', fatal=False))
-                m3u8_url = xpath_text(
-                    qnode, './html_urls/video_url[@format="application/vnd.apple.mpegurl"]')
+                m3u8_url_ele = find_xpath_attr(
+                    qnode, './html_urls/video_url',
+                    'format', 'application/vnd.apple.mpegurl')
+                m3u8_url = m3u8_url_ele.text if m3u8_url_ele is not None else None
                 if m3u8_url:
                     formats.extend(self._extract_m3u8_formats(
                         m3u8_url, video_id, 'mp4', 'm3u8_native',