From: Philipp Hagemeister <phihag@phihag.de>
Date: Mon, 29 Sep 2014 03:48:56 +0000 (+0200)
Subject: [golem] Fix under 2.6
X-Git-Tag: 2014.10.02~38
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=8157ae39042298831afc8f8e5d67619d21e3e00b;p=youtube-dl.git

[golem] Fix under 2.6

It's a sad story; 2.6 does not support any non-trivial xpaths.
---

diff --git a/youtube_dl/extractor/golem.py b/youtube_dl/extractor/golem.py
index bebfe85687..53714f47f1 100644
--- a/youtube_dl/extractor/golem.py
+++ b/youtube_dl/extractor/golem.py
@@ -38,11 +38,9 @@ class GolemIE(InfoExtractor):
         }
 
         formats = []
-        for e in config.findall('./*[url]'):
+        for e in config:
             url = e.findtext('./url')
             if not url:
-                self._downloader.report_warning(
-                    "{0}: url: empty, skipping".format(e.tag))
                 continue
 
             formats.append({
@@ -57,7 +55,7 @@ class GolemIE(InfoExtractor):
         info['formats'] = formats
 
         thumbnails = []
-        for e in config.findall('.//teaser[url]'):
+        for e in config.findall('.//teaser'):
             url = e.findtext('./url')
             if not url:
                 continue