Plugin cleanup and tweaks

plugins/youtube_download/yt_dlp/extractor/vzaar.py

@@ -1,8 +1,3 @@
-# coding: utf-8
-from __future__ import unicode_literals
-
-import re
-
 from .common import InfoExtractor
 from ..compat import compat_str
 from ..utils import (
@@ -15,6 +10,7 @@ from ..utils import (
 
 class VzaarIE(InfoExtractor):
     _VALID_URL = r'https?://(?:(?:www|view)\.)?vzaar\.com/(?:videos/)?(?P<id>\d+)'
+    _EMBED_REGEX = [r'<iframe[^>]+src=["\'](?P<url>(?:https?:)?//(?:view\.vzaar\.com)/[0-9]+)']
     _TESTS = [{
         # HTTP and HLS
         'url': 'https://vzaar.com/videos/1152805',
@@ -50,12 +46,6 @@ class VzaarIE(InfoExtractor):
         'only_matching': True,
     }]
 
-    @staticmethod
-    def _extract_urls(webpage):
-        return re.findall(
-            r'<iframe[^>]+src=["\']((?:https?:)?//(?:view\.vzaar\.com)/[0-9]+)',
-            webpage)
-
     def _real_extract(self, url):
         video_id = self._match_id(url)
         video_data = self._download_json(
@@ -97,11 +87,9 @@ class VzaarIE(InfoExtractor):
                 m3u8_id='hls', fatal=False)
             if hls_aes:
                 for f in m3u8_formats:
-                    f['_decryption_key_url'] = url_templ % ('goose', '') + qs
+                    f['hls_aes'] = {'uri': url_templ % ('goose', '') + qs}
             formats.extend(m3u8_formats)
 
-        self._sort_formats(formats)
-
         return {
             'id': video_id,
             'title': title,