Update upstream source from tag 'upstream/2019.01.17'

[youtubedl] / youtube_dl / extractor / academicearth.py

diff --git a/youtube_dl/extractor/academicearth.py b/youtube_dl/extractor/academicearth.py
index c983ef0f519c303f880f471d357db4b60657ef17..34095501cfa342e7ccb4afdb77e14b9514ca389c 100644 (file)
--- a/youtube_dl/extractor/academicearth.py
+++ b/youtube_dl/extractor/academicearth.py
@@ -1,4 +1,5 @@
 from __future__ import unicode_literals
 from __future__ import unicode_literals

+

 import re
 
 from .common import InfoExtractor
 import re
 
 from .common import InfoExtractor


@@ -14,19 +15,18 @@ class AcademicEarthCourseIE(InfoExtractor):
             'title': 'Laws of Nature',
             'description': 'Introduce yourself to the laws of nature with these free online college lectures from Yale, Harvard, and MIT.',
         },
             'title': 'Laws of Nature',
             'description': 'Introduce yourself to the laws of nature with these free online college lectures from Yale, Harvard, and MIT.',
         },

-        'playlist_count': 4,
+        'playlist_count': 3,

     }
 
     def _real_extract(self, url):
     }
 
     def _real_extract(self, url):

-        m = re.match(self._VALID_URL, url)
-        playlist_id = m.group('id')
+        playlist_id = self._match_id(url)

 
         webpage = self._download_webpage(url, playlist_id)
         title = self._html_search_regex(
 
         webpage = self._download_webpage(url, playlist_id)
         title = self._html_search_regex(

-            r'<h1 class="playlist-name"[^>]*?>(.*?)</h1>', webpage, u'title')
+            r'<h1 class="playlist-name"[^>]*?>(.*?)</h1>', webpage, 'title')

         description = self._html_search_regex(
             r'<p class="excerpt"[^>]*?>(.*?)</p>',
         description = self._html_search_regex(
             r'<p class="excerpt"[^>]*?>(.*?)</p>',

-            webpage, u'description', fatal=False)
+            webpage, 'description', fatal=False)

         urls = re.findall(
             r'<li class="lecture-preview">\s*?<a target="_blank" href="([^"]+)">',
             webpage)
         urls = re.findall(
             r'<li class="lecture-preview">\s*?<a target="_blank" href="([^"]+)">',
             webpage)