aboutsummaryrefslogtreecommitdiff
path: root/youtube_dl/extractor/clipsyndicate.py
diff options
context:
space:
mode:
authorJaime Marquínez Ferrándiz <jaime.marquinez.ferrandiz@gmail.com>2013-12-10 21:03:53 +0100
committerJaime Marquínez Ferrándiz <jaime.marquinez.ferrandiz@gmail.com>2013-12-10 21:03:53 +0100
commit182583623583c8e71af9b4e24acf8c409fcff197 (patch)
treec049216db457bd6b4592862eab000afb66a4088e /youtube_dl/extractor/clipsyndicate.py
parenta0088bdf9342408a1fc5033a0f4599bae3b9aa0b (diff)
downloadyoutube-dl-182583623583c8e71af9b4e24acf8c409fcff197.tar.xz
Use `_download_xml` in more extractors
Diffstat (limited to 'youtube_dl/extractor/clipsyndicate.py')
-rw-r--r--youtube_dl/extractor/clipsyndicate.py10
1 files changed, 4 insertions, 6 deletions
diff --git a/youtube_dl/extractor/clipsyndicate.py b/youtube_dl/extractor/clipsyndicate.py
index d4fc86973..c60089ad3 100644
--- a/youtube_dl/extractor/clipsyndicate.py
+++ b/youtube_dl/extractor/clipsyndicate.py
@@ -1,9 +1,9 @@
import re
-import xml.etree.ElementTree
from .common import InfoExtractor
from ..utils import (
find_xpath_attr,
+ fix_xml_all_ampersand,
)
@@ -30,12 +30,10 @@ class ClipsyndicateIE(InfoExtractor):
# it includes a required token
flvars = self._search_regex(r'flvars: "(.*?)"', js_player, u'flvars')
- playlist_page = self._download_webpage(
+ pdoc = self._download_xml(
'http://eplayer.clipsyndicate.com/osmf/playlist?%s' % flvars,
- video_id, u'Downloading video info')
- # Fix broken xml
- playlist_page = re.sub('&', '&amp;', playlist_page)
- pdoc = xml.etree.ElementTree.fromstring(playlist_page.encode('utf-8'))
+ video_id, u'Downloading video info',
+ transform_source=fix_xml_all_ampersand)
track_doc = pdoc.find('trackList/track')
def find_param(name):