mirror of
				https://github.com/yt-dlp/yt-dlp.git
				synced 2025-10-31 14:45:14 +00:00 
			
		
		
		
	[compat] Remove more functions
Removing any more will require changes to a large number of extractors
This commit is contained in:
		| @@ -26,15 +26,8 @@ import urllib.request | ||||
| from string import ascii_letters | ||||
| 
 | ||||
| from .cache import Cache | ||||
| from .compat import ( | ||||
|     HAS_LEGACY as compat_has_legacy, | ||||
|     compat_get_terminal_size, | ||||
|     compat_os_name, | ||||
|     compat_shlex_quote, | ||||
|     compat_str, | ||||
|     compat_urllib_error, | ||||
|     compat_urllib_request, | ||||
| ) | ||||
| from .compat import HAS_LEGACY as compat_has_legacy | ||||
| from .compat import compat_os_name, compat_shlex_quote, compat_str | ||||
| from .cookies import load_cookies | ||||
| from .downloader import FFmpegFD, get_suitable_downloader, shorten_protocol_name | ||||
| from .downloader.rtmp import rtmpdump_version | ||||
| @@ -644,7 +637,7 @@ class YoutubeDL: | ||||
|             try: | ||||
|                 import pty | ||||
|                 master, slave = pty.openpty() | ||||
|                 width = compat_get_terminal_size().columns | ||||
|                 width = shutil.get_terminal_size().columns | ||||
|                 width_args = [] if width is None else ['-w', str(width)] | ||||
|                 sp_kwargs = {'stdin': subprocess.PIPE, 'stdout': slave, 'stderr': self._out_files.error} | ||||
|                 try: | ||||
| @@ -3724,7 +3717,7 @@ class YoutubeDL: | ||||
|             else: | ||||
|                 proxies = {'http': opts_proxy, 'https': opts_proxy} | ||||
|         else: | ||||
|             proxies = compat_urllib_request.getproxies() | ||||
|             proxies = urllib.request.getproxies() | ||||
|             # Set HTTPS proxy to HTTP one if given (https://github.com/ytdl-org/youtube-dl/issues/805) | ||||
|             if 'http' in proxies and 'https' not in proxies: | ||||
|                 proxies['https'] = proxies['http'] | ||||
| @@ -3740,13 +3733,13 @@ class YoutubeDL: | ||||
|         # default FileHandler and allows us to disable the file protocol, which | ||||
|         # can be used for malicious purposes (see | ||||
|         # https://github.com/ytdl-org/youtube-dl/issues/8227) | ||||
|         file_handler = compat_urllib_request.FileHandler() | ||||
|         file_handler = urllib.request.FileHandler() | ||||
| 
 | ||||
|         def file_open(*args, **kwargs): | ||||
|             raise compat_urllib_error.URLError('file:// scheme is explicitly disabled in yt-dlp for security reasons') | ||||
|             raise urllib.error.URLError('file:// scheme is explicitly disabled in yt-dlp for security reasons') | ||||
|         file_handler.file_open = file_open | ||||
| 
 | ||||
|         opener = compat_urllib_request.build_opener( | ||||
|         opener = urllib.request.build_opener( | ||||
|             proxy_handler, https_handler, cookie_processor, ydlh, redirect_handler, data_handler, file_handler) | ||||
| 
 | ||||
|         # Delete the default user-agent header, which would otherwise apply in | ||||
|   | ||||
		Reference in New Issue
	
	Block a user
	 pukkandan
					pukkandan