X-Git-Url: https://jfr.im/git/yt-dlp.git/blobdiff_plain/6a39ee13f7613767905a4669d1d0247aafc5a12c..9f14daf22b4080ae1531a772ee7574959af4e2fa:/yt_dlp/extractor/lynda.py

diff --git a/yt_dlp/extractor/lynda.py b/yt_dlp/extractor/lynda.py
index 06662be1a..768ce913e 100644
--- a/yt_dlp/extractor/lynda.py
+++ b/yt_dlp/extractor/lynda.py
@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 import re
 
 from .common import InfoExtractor
@@ -21,9 +19,6 @@ class LyndaBaseIE(InfoExtractor):
     _ACCOUNT_CREDENTIALS_HINT = 'Use --username and --password options to provide lynda.com account credentials.'
     _NETRC_MACHINE = 'lynda'
 
-    def _real_initialize(self):
-        self._login()
-
     @staticmethod
     def _check_error(json_string, key_or_keys):
         keys = [key_or_keys] if isinstance(key_or_keys, compat_str) else key_or_keys
@@ -32,7 +27,7 @@ def _check_error(json_string, key_or_keys):
             if error:
                 raise ExtractorError('Unable to login: %s' % error, expected=True)
 
-    def _login_step(self, form_html, fallback_action_url, extra_form_data, note, referrer_url):
+    def _perform_login_step(self, form_html, fallback_action_url, extra_form_data, note, referrer_url):
         action_url = self._search_regex(
             r'<form[^>]+action=(["\'])(?P<url>.+?)\1', form_html,
             'post url', default=fallback_action_url, group='url')
@@ -55,11 +50,7 @@ def _login_step(self, form_html, fallback_action_url, extra_form_data, note, ref
 
         return response, action_url
 
-    def _login(self):
-        username, password = self._get_login_info()
-        if username is None:
-            return
-
+    def _perform_login(self, username, password):
         # Step 1: download signin page
         signin_page = self._download_webpage(
             self._SIGNIN_URL, None, 'Downloading signin page')
@@ -128,7 +119,7 @@ def _raise_unavailable(self, video_id):
             'Video %s is only available for members' % video_id)
 
     def _real_extract(self, url):
-        mobj = re.match(self._VALID_URL, url)
+        mobj = self._match_valid_url(url)
         video_id = mobj.group('id')
         course_id = mobj.group('course_id')
 
@@ -166,7 +157,6 @@ def _real_extract(self, url):
                         'format_id': '%s-%s' % (cdn, format_id) if cdn else format_id,
                         'height': int_or_none(format_id),
                     })
-            self._sort_formats(formats)
 
             conviva = self._download_json(
                 'https://www.lynda.com/ajax/player/conviva', video_id,
@@ -216,7 +206,6 @@ def _real_extract(self, url):
                 } for format_id, video_url in prioritized_stream.items()])
 
         self._check_formats(formats, video_id)
-        self._sort_formats(formats)
 
         subtitles = self.extract_subtitles(video_id)
 
@@ -281,7 +270,7 @@ class LyndaCourseIE(LyndaBaseIE):
     }]
 
     def _real_extract(self, url):
-        mobj = re.match(self._VALID_URL, url)
+        mobj = self._match_valid_url(url)
         course_path = mobj.group('coursepath')
         course_id = mobj.group('courseid')