README.md

@@ -1809,7 +1809,7 @@ The following extractors use this feature:
 * `formats`: Change the types of formats to return. `dashy` (convert HTTP to DASH), `duplicate` (identical content but different URLs or protocol; includes `dashy`), `incomplete` (cannot be downloaded completely - live dash and post-live m3u8)
 * `innertube_host`: Innertube API host to use for all API requests; e.g. `studio.youtube.com`, `youtubei.googleapis.com`. Note that cookies exported from one subdomain will not work on others
 * `innertube_key`: Innertube API key to use for all API requests
-* `raise_incomplete_data`: `Incomplete Data Received` raises an error instead of reporting a warning
+* `raise_incomplete_data`: `Incomplete Data` error should raise an error instead of a warning.
 
 #### youtubetab (YouTube playlists, channels, feeds, etc.)
 * `skip`: One or more of `webpage` (skip initial webpage download), `authcheck` (allow the download of playlists requiring authentication when no initial webpage is downloaded. This may cause unwanted behavior, see [#1122](https://github.com/yt-dlp/yt-dlp/pull/1122) for more details)

yt_dlp/extractor/youtube.py

@@ -941,12 +941,10 @@ class YoutubeBaseInfoExtractor(InfoExtractor):
     def _extract_response(self, item_id, query, note='Downloading API JSON', headers=None,
                           ytcfg=None, check_get_keys=None, ep='browse', fatal=True, api_hostname=None,
                           default_client='web'):
-        raise_for_incomplete = bool(self._configuration_arg('raise_incomplete_data', ie_key=YoutubeIE))
-        icd_retries = iter(self.RetryManager(fatal=raise_for_incomplete))
-        icd_rm = next(icd_retries)
-        main_retries = iter(self.RetryManager())
-        main_rm = next(main_retries)
-        for _ in range(main_rm.retries + icd_rm.retries + 1):
+        for icd_retry in self.RetryManager(
+            fatal=self._configuration_arg('raise_incomplete_data', [False], ie_key=YoutubeIE)[0] is not False
+        ):
+            for retry in self.RetryManager():
                 try:
                     response = self._call_api(
                         ep=ep, fatal=True, headers=headers,
@@ -958,8 +956,7 @@ class YoutubeBaseInfoExtractor(InfoExtractor):
                     if not isinstance(e.cause, network_exceptions):
                         return self._error_or_warning(e, fatal=fatal)
                     elif not isinstance(e.cause, HTTPError):
-                    main_rm.error = e
-                    next(main_retries)
+                        retry.error = e
                         continue
 
                     first_bytes = e.cause.response.read(512)
@@ -975,8 +972,7 @@ class YoutubeBaseInfoExtractor(InfoExtractor):
                     # We also want to catch all other network exceptions since errors in later pages can be troublesome
                     # See https://github.com/yt-dlp/yt-dlp/issues/507#issuecomment-880188210
                     if e.cause.status not in (403, 429):
-                    main_rm.error = e
-                    next(main_retries)
+                        retry.error = e
                         continue
                     return self._error_or_warning(e, fatal=fatal)
 
@@ -986,17 +982,13 @@ class YoutubeBaseInfoExtractor(InfoExtractor):
                     # YouTube servers may return errors we want to retry on in a 200 OK response
                     # See: https://github.com/yt-dlp/yt-dlp/issues/839
                     if 'unknown error' in e.msg.lower():
-                    main_rm.error = e
-                    next(main_retries)
+                        retry.error = e
                         continue
                     return self._error_or_warning(e, fatal=fatal)
                 # Youtube sometimes sends incomplete data
                 # See: https://github.com/ytdl-org/youtube-dl/issues/28194
                 if not traverse_obj(response, *variadic(check_get_keys)):
-                icd_rm.error = ExtractorError('Incomplete data received', expected=True)
-                should_retry = next(icd_retries, None)
-                if not should_retry:
-                    return None
+                    icd_retry.error = ExtractorError('Incomplete data received', expected=True)
                     continue
 
                 return response