projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Prepare widespread unicode literal use
[youtube-dl]
/
youtube_dl
/
extractor
/
collegehumor.py
diff --git
a/youtube_dl/extractor/collegehumor.py
b/youtube_dl/extractor/collegehumor.py
index 0c29acfb13eafebe226e23f603f9f18d13a33304..b27c1dfc52401f3c148d48d2b2897d2b06db3834 100644
(file)
--- a/
youtube_dl/extractor/collegehumor.py
+++ b/
youtube_dl/extractor/collegehumor.py
@@
-1,5
+1,4
@@
import re
import re
-import xml.etree.ElementTree
from .common import InfoExtractor
from ..utils import (
from .common import InfoExtractor
from ..utils import (
@@
-46,11
+45,10
@@
class CollegeHumorIE(InfoExtractor):
self.report_extraction(video_id)
xmlUrl = 'http://www.collegehumor.com/moogaloop/video/' + video_id
self.report_extraction(video_id)
xmlUrl = 'http://www.collegehumor.com/moogaloop/video/' + video_id
- m
etaXml = self._download_webpage
(xmlUrl, video_id,
+ m
doc = self._download_xml
(xmlUrl, video_id,
u'Downloading info XML',
u'Unable to download video info XML')
u'Downloading info XML',
u'Unable to download video info XML')
- mdoc = xml.etree.ElementTree.fromstring(metaXml)
try:
videoNode = mdoc.findall('./video')[0]
youtubeIdNode = videoNode.find('./youtubeID')
try:
videoNode = mdoc.findall('./video')[0]
youtubeIdNode = videoNode.find('./youtubeID')
@@
-65,11
+63,10
@@
class CollegeHumorIE(InfoExtractor):
if next_url.endswith(u'manifest.f4m'):
manifest_url = next_url + '?hdcore=2.10.3'
if next_url.endswith(u'manifest.f4m'):
manifest_url = next_url + '?hdcore=2.10.3'
-
manifestXml = self._download_webpage
(manifest_url, video_id,
+
adoc = self._download_xml
(manifest_url, video_id,
u'Downloading XML manifest',
u'Unable to download video info XML')
u'Downloading XML manifest',
u'Unable to download video info XML')
- adoc = xml.etree.ElementTree.fromstring(manifestXml)
try:
video_id = adoc.findall('./{http://ns.adobe.com/f4m/1.0}id')[0].text
except IndexError:
try:
video_id = adoc.findall('./{http://ns.adobe.com/f4m/1.0}id')[0].text
except IndexError: