[canalplus] Modernize

youtube_dl/extractor/canalplus.py

@@ -106,15 +106,11 @@ class CanalplusIE(InfoExtractor):
                 continue
             format_id = fmt.tag
             if format_id == 'HLS':
-                hls_formats = self._extract_m3u8_formats(format_url, video_id, 'mp4')
+                formats.extend(self._extract_m3u8_formats(
-                for fmt in hls_formats:
+                    format_url, video_id, 'mp4', preference=preference(format_id)))
-                    fmt['preference'] = preference(format_id)
-                formats.extend(hls_formats)
             elif format_id == 'HDS':
-                hds_formats = self._extract_f4m_formats(format_url + '?hdcore=2.11.3', video_id)
+                formats.extend(self._extract_f4m_formats(
-                for fmt in hds_formats:
+                    format_url + '?hdcore=2.11.3', video_id, preference=preference(format_id)))
-                    fmt['preference'] = preference(format_id)
-                formats.extend(hds_formats)
             else:
                 formats.append({
                     'url': format_url,