mirror of
				https://github.com/ytdl-org/youtube-dl
				synced 2025-11-04 03:33:46 +00:00 
			
		
		
		
	[compat] Use more conventional name for compat SimpleCookie
This commit is contained in:
		
							parent
							
								
									6b315d96bc
								
							
						
					
					
						commit
						70d0d4f9be
					
				@ -74,13 +74,13 @@ except ImportError:  # Python 2
 | 
			
		||||
    import Cookie as compat_cookies
 | 
			
		||||
 | 
			
		||||
if sys.version_info[0] == 2:
 | 
			
		||||
    class compat_SimpleCookie(compat_cookies.SimpleCookie):
 | 
			
		||||
    class compat_cookies_SimpleCookie(compat_cookies.SimpleCookie):
 | 
			
		||||
        def load(self, rawdata):
 | 
			
		||||
            if isinstance(rawdata, compat_str):
 | 
			
		||||
                rawdata = str(rawdata)
 | 
			
		||||
            return super(compat_SimpleCookie, self).load(rawdata)
 | 
			
		||||
            return super(compat_cookies_SimpleCookie, self).load(rawdata)
 | 
			
		||||
else:
 | 
			
		||||
    compat_SimpleCookie = compat_cookies.SimpleCookie
 | 
			
		||||
    compat_cookies_SimpleCookie = compat_cookies.SimpleCookie
 | 
			
		||||
 | 
			
		||||
try:
 | 
			
		||||
    import html.entities as compat_html_entities
 | 
			
		||||
@ -3002,7 +3002,6 @@ __all__ = [
 | 
			
		||||
    'compat_HTMLParseError',
 | 
			
		||||
    'compat_HTMLParser',
 | 
			
		||||
    'compat_HTTPError',
 | 
			
		||||
    'compat_SimpleCookie',
 | 
			
		||||
    'compat_Struct',
 | 
			
		||||
    'compat_b64decode',
 | 
			
		||||
    'compat_basestring',
 | 
			
		||||
@ -3010,6 +3009,7 @@ __all__ = [
 | 
			
		||||
    'compat_cookiejar',
 | 
			
		||||
    'compat_cookiejar_Cookie',
 | 
			
		||||
    'compat_cookies',
 | 
			
		||||
    'compat_cookies_SimpleCookie',
 | 
			
		||||
    'compat_ctypes_WINFUNCTYPE',
 | 
			
		||||
    'compat_etree_Element',
 | 
			
		||||
    'compat_etree_fromstring',
 | 
			
		||||
 | 
			
		||||
@ -17,13 +17,13 @@ import math
 | 
			
		||||
 | 
			
		||||
from ..compat import (
 | 
			
		||||
    compat_cookiejar_Cookie,
 | 
			
		||||
    compat_cookies_SimpleCookie,
 | 
			
		||||
    compat_etree_Element,
 | 
			
		||||
    compat_etree_fromstring,
 | 
			
		||||
    compat_getpass,
 | 
			
		||||
    compat_integer_types,
 | 
			
		||||
    compat_http_client,
 | 
			
		||||
    compat_os_name,
 | 
			
		||||
    compat_SimpleCookie,
 | 
			
		||||
    compat_str,
 | 
			
		||||
    compat_urllib_error,
 | 
			
		||||
    compat_urllib_parse_unquote,
 | 
			
		||||
@ -2901,10 +2901,10 @@ class InfoExtractor(object):
 | 
			
		||||
        self._downloader.cookiejar.set_cookie(cookie)
 | 
			
		||||
 | 
			
		||||
    def _get_cookies(self, url):
 | 
			
		||||
        """ Return a compat_SimpleCookie with the cookies for the url """
 | 
			
		||||
        """ Return a compat_cookies_SimpleCookie with the cookies for the url """
 | 
			
		||||
        req = sanitized_Request(url)
 | 
			
		||||
        self._downloader.cookiejar.add_cookie_header(req)
 | 
			
		||||
        return compat_SimpleCookie(req.get_header('Cookie'))
 | 
			
		||||
        return compat_cookies_SimpleCookie(req.get_header('Cookie'))
 | 
			
		||||
 | 
			
		||||
    def _apply_first_set_cookie_header(self, url_handle, cookie):
 | 
			
		||||
        """
 | 
			
		||||
 | 
			
		||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user