about summary refs log tree commit diff
path: root/youtube_dl/extractor/stanfordoc.py
diff options
context:
space:
mode:
authorJaime Marquínez Ferrándiz <jaime.marquinez.ferrandiz@gmail.com>2013-12-08 22:24:55 +0100
committerJaime Marquínez Ferrándiz <jaime.marquinez.ferrandiz@gmail.com>2013-12-08 22:24:55 +0100
commitbaa7b1978bc1d77858458c2b31aec3ff819a3e6a (patch)
tree7818c062b4423bba3e7a4f30faf58558025ab0a6 /youtube_dl/extractor/stanfordoc.py
parentac5118bcb92a489eec0e9997e55e07945dc720db (diff)
downloadyoutube-dl-baa7b1978bc1d77858458c2b31aec3ff819a3e6a.tar.gz
youtube-dl-baa7b1978bc1d77858458c2b31aec3ff819a3e6a.tar.xz
youtube-dl-baa7b1978bc1d77858458c2b31aec3ff819a3e6a.zip
Remove the calls to 'compat_urllib_request.urlopen' in a few extractors
Diffstat (limited to 'youtube_dl/extractor/stanfordoc.py')
-rw-r--r--youtube_dl/extractor/stanfordoc.py18
1 files changed, 3 insertions, 15 deletions
diff --git a/youtube_dl/extractor/stanfordoc.py b/youtube_dl/extractor/stanfordoc.py
index d54e01a12..d0d0989f0 100644
--- a/youtube_dl/extractor/stanfordoc.py
+++ b/youtube_dl/extractor/stanfordoc.py
@@ -1,13 +1,8 @@
 import re
-import socket
-import xml.etree.ElementTree
 
 from .common import InfoExtractor
 from ..utils import (
-    compat_http_client,
     compat_str,
-    compat_urllib_error,
-    compat_urllib_request,
 
     ExtractorError,
     orderedSet,
@@ -45,11 +40,7 @@ class StanfordOpenClassroomIE(InfoExtractor):
             self.report_extraction(info['id'])
             baseUrl = 'http://openclassroom.stanford.edu/MainFolder/courses/' + course + '/videos/'
             xmlUrl = baseUrl + video + '.xml'
-            try:
-                metaXml = compat_urllib_request.urlopen(xmlUrl).read()
-            except (compat_urllib_error.URLError, compat_http_client.HTTPException, socket.error) as err:
-                raise ExtractorError(u'Unable to download video info XML: %s' % compat_str(err))
-            mdoc = xml.etree.ElementTree.fromstring(metaXml)
+            mdoc = self._download_xml(xmlUrl, info['id'])
             try:
                 info['title'] = mdoc.findall('./title')[0].text
                 info['url'] = baseUrl + mdoc.findall('./videoFile')[0].text
@@ -95,12 +86,9 @@ class StanfordOpenClassroomIE(InfoExtractor):
                 'upload_date': None,
             }
 
-            self.report_download_webpage(info['id'])
             rootURL = 'http://openclassroom.stanford.edu/MainFolder/HomePage.php'
-            try:
-                rootpage = compat_urllib_request.urlopen(rootURL).read()
-            except (compat_urllib_error.URLError, compat_http_client.HTTPException, socket.error) as err:
-                raise ExtractorError(u'Unable to download course info page: ' + compat_str(err))
+            rootpage = self._download_webpage(rootURL, info['id'],
+                errnote=u'Unable to download course info page')
 
             info['title'] = info['id']