From 8a3e7b1c95f08696ca2a026c1b462aeb8faf6904 Mon Sep 17 00:00:00 2001
From: Lesmiscore <nao20010128@gmail.com>
Date: Tue, 24 May 2022 03:01:52 +0900
Subject: [yahoo:gyao] Fix extractor

This fixes 400 error for /title/ URLs.
---
 yt_dlp/extractor/yahoo.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'yt_dlp/extractor/yahoo.py')

diff --git a/yt_dlp/extractor/yahoo.py b/yt_dlp/extractor/yahoo.py
index 3fe6192bf..171fbf585 100644
--- a/yt_dlp/extractor/yahoo.py
+++ b/yt_dlp/extractor/yahoo.py
@@ -434,7 +434,7 @@ class YahooGyaOIE(InfoExtractor):
         page = 1
         while True:
             playlist = self._download_json(
-                f'https://gyao.yahoo.co.jp/api/programs/{program_id}/videos?page={page}', program_id,
+                f'https://gyao.yahoo.co.jp/api/programs/{program_id}/videos?page={page}&serviceId=gy', program_id,
                 note=f'Downloading JSON metadata page {page}')
             if not playlist:
                 break
-- 
cgit v1.2.3


From ac668111128b5f124b4271b3aa4c35f6e71a4749 Mon Sep 17 00:00:00 2001
From: pukkandan <pukkandan.ytdlp@gmail.com>
Date: Fri, 24 Jun 2022 13:40:17 +0530
Subject: [compat] Remove more functions

Removing any more will require changes to a large number of extractors
---
 yt_dlp/extractor/yahoo.py | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

(limited to 'yt_dlp/extractor/yahoo.py')

diff --git a/yt_dlp/extractor/yahoo.py b/yt_dlp/extractor/yahoo.py
index 171fbf585..8811df6d8 100644
--- a/yt_dlp/extractor/yahoo.py
+++ b/yt_dlp/extractor/yahoo.py
@@ -1,15 +1,15 @@
 import hashlib
 import itertools
 import re
+import urllib.parse
 
+from .brightcove import BrightcoveNewIE
 from .common import InfoExtractor, SearchInfoExtractor
-from ..compat import (
-    compat_str,
-    compat_urllib_parse,
-)
+from .youtube import YoutubeIE
+from ..compat import compat_str
 from ..utils import (
-    clean_html,
     ExtractorError,
+    clean_html,
     int_or_none,
     mimetype2ext,
     parse_iso8601,
@@ -18,9 +18,6 @@ from ..utils import (
     url_or_none,
 )
 
-from .brightcove import BrightcoveNewIE
-from .youtube import YoutubeIE
-
 
 class YahooIE(InfoExtractor):
     IE_DESC = 'Yahoo screen and movies'
@@ -333,7 +330,7 @@ class YahooSearchIE(SearchInfoExtractor):
 
     def _search_results(self, query):
         for pagenum in itertools.count(0):
-            result_url = 'http://video.search.yahoo.com/search/?p=%s&fr=screen&o=js&gs=0&b=%d' % (compat_urllib_parse.quote_plus(query), pagenum * 30)
+            result_url = 'http://video.search.yahoo.com/search/?p=%s&fr=screen&o=js&gs=0&b=%d' % (urllib.parse.quote_plus(query), pagenum * 30)
             info = self._download_json(result_url, query,
                                        note='Downloading results page ' + str(pagenum + 1))
             yield from (self.url_result(result['rurl']) for result in info['results'])
-- 
cgit v1.2.3