X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=youtube_dl%2Fextractor%2Fanitube.py;h=2b019daa997ab3bb5dd15cdf5c2df489e181d177;hb=c3855d28b043ccb61ea38ef108831bd395fba4db;hp=2954966a6e6d8d8517e90aa5efa464d85dcfef81;hpb=ba3881dffd241d8719430c31f107156ed8830996;p=youtube-dl

diff --git a/youtube_dl/extractor/anitube.py b/youtube_dl/extractor/anitube.py
index 2954966a6..2b019daa9 100644
--- a/youtube_dl/extractor/anitube.py
+++ b/youtube_dl/extractor/anitube.py
@@ -1,21 +1,22 @@
 import re
-import xml.etree.ElementTree
 
 from .common import InfoExtractor
 
 
 class AnitubeIE(InfoExtractor):
     IE_NAME = u'anitube.se'
-    _VALID_URL = r'http?://(?:www\.)?anitube\.se/video/(?P<id>\d+)'
+    _VALID_URL = r'https?://(?:www\.)?anitube\.se/video/(?P<id>\d+)'
 
     _TEST = {
         u'url': u'http://www.anitube.se/video/36621',
-        u'md5': u'0c4e4f1051bf50f5982f829f7230f539',
+        u'md5': u'59d0eeae28ea0bc8c05e7af429998d43',
+        u'file': u'36621.mp4',
         u'info_dict': {
             u'id': u'36621',
             u'ext': u'mp4',
             u'title': u'Recorder to Randoseru 01',
         },
+        u'skip': u'Blocked in the US',
     }
 
     def _real_extract(self, url):
@@ -23,27 +24,21 @@ class AnitubeIE(InfoExtractor):
         video_id = mobj.group('id')
 
         webpage = self._download_webpage(url, video_id)
-
         key = self._html_search_regex(r'http://www\.anitube\.se/embed/([A-Za-z0-9_-]*)',
                                       webpage, u'key')
 
-        webpage_config = self._download_webpage('http://www.anitube.se/nuevo/econfig.php?key=%s' % key,
+        config_xml = self._download_xml('http://www.anitube.se/nuevo/econfig.php?key=%s' % key,
                                                 key)
 
-        config_xml = xml.etree.ElementTree.fromstring(webpage_config.encode('utf-8'))
-
         video_title = config_xml.find('title').text
 
-
         formats = []
-
         video_url = config_xml.find('file')
         if video_url is not None:
             formats.append({
                 'format_id': 'sd',
                 'url': video_url.text,
             })
-
         video_url = config_xml.find('filehd')
         if video_url is not None:
             formats.append({
@@ -54,6 +49,5 @@ class AnitubeIE(InfoExtractor):
         return {
             'id': video_id,
             'title': video_title,
-            'ext': 'mp4',
             'formats': formats
         }