From: remitamine <remitamine@gmail.com>
Date: Tue, 15 Mar 2016 19:54:55 +0000 (+0100)
Subject: [noz] fix extraction in python 2.6
X-Git-Url: http://git.oshgnacknak.de/?a=commitdiff_plain;h=0c9ff2404119bc93fe9755fa5ecdf8e8dd53b146;p=youtube-dl

[noz] fix extraction in python 2.6
---

diff --git a/youtube_dl/extractor/noz.py b/youtube_dl/extractor/noz.py
index 4e60b13a5..656443c49 100644
--- a/youtube_dl/extractor/noz.py
+++ b/youtube_dl/extractor/noz.py
@@ -5,6 +5,7 @@ from .common import InfoExtractor
 from ..compat import compat_urllib_parse_unquote
 from ..utils import (
     int_or_none,
+    find_xpath_attr,
     xpath_text,
     update_url_query,
 )
@@ -47,8 +48,9 @@ class NozIE(InfoExtractor):
             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"]')
+            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 +66,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',