aboutsummaryrefslogtreecommitdiff
path: root/youtube_dl/extractor/spiegel.py
diff options
context:
space:
mode:
authorremitamine <remitamine@gmail.com>2015-12-03 20:33:22 +0100
committerremitamine <remitamine@gmail.com>2015-12-03 20:33:22 +0100
commit78653a33aa00ba5205940c2baac5d9f019795b88 (patch)
tree246fd038effd402bc66de4c8afb36e6c318efcaa /youtube_dl/extractor/spiegel.py
parent77302fe5c989b9cafcb675c0a03642b80fa557ff (diff)
parent24dc1ed715239f85eb3d5f71a707da1dd2bc7773 (diff)
Merge remote-tracking branch 'upstream/master' into bliptv
Diffstat (limited to 'youtube_dl/extractor/spiegel.py')
-rw-r--r--youtube_dl/extractor/spiegel.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/youtube_dl/extractor/spiegel.py b/youtube_dl/extractor/spiegel.py
index 5bd3c0087..39a7aaf9d 100644
--- a/youtube_dl/extractor/spiegel.py
+++ b/youtube_dl/extractor/spiegel.py
@@ -58,7 +58,8 @@ class SpiegelIE(InfoExtractor):
description = self._html_search_meta('description', webpage, 'description')
base_url = self._search_regex(
- r'var\s+server\s*=\s*"([^"]+)\"', webpage, 'server URL')
+ [r'server\s*:\s*(["\'])(?P<url>.+?)\1', r'var\s+server\s*=\s*"(?P<url>[^"]+)\"'],
+ webpage, 'server URL', group='url')
xml_url = base_url + video_id + '.xml'
idoc = self._download_xml(xml_url, video_id)