mirror of
				https://gitlab.com/ytdl-org/youtube-dl.git
				synced 2025-11-03 18:57:08 -05:00 
			
		
		
		
	Fix flake8 issues after #14225
This commit is contained in:
		@@ -2452,7 +2452,7 @@ class InfoExtractor(object):
 | 
			
		||||
    def _set_cookie(self, domain, name, value, expire_time=None, port=None,
 | 
			
		||||
                    path='/', secure=False, discard=False, rest={}, **kwargs):
 | 
			
		||||
        cookie = compat_cookiejar.Cookie(
 | 
			
		||||
            0, name, value, port, not port is None, domain, True,
 | 
			
		||||
            0, name, value, port, port is not None, domain, True,
 | 
			
		||||
            domain.startswith('.'), path, True, secure, expire_time,
 | 
			
		||||
            discard, None, None, rest)
 | 
			
		||||
        self._downloader.cookiejar.set_cookie(cookie)
 | 
			
		||||
 
 | 
			
		||||
@@ -3830,18 +3830,18 @@ def cookie_to_dict(cookie):
 | 
			
		||||
    cookie_dict = {
 | 
			
		||||
        'name': cookie.name,
 | 
			
		||||
        'value': cookie.value,
 | 
			
		||||
    };
 | 
			
		||||
    }
 | 
			
		||||
    if cookie.port_specified:
 | 
			
		||||
        cookie_dict['port'] = cookie.port
 | 
			
		||||
    if cookie.domain_specified:
 | 
			
		||||
        cookie_dict['domain'] = cookie.domain
 | 
			
		||||
    if cookie.path_specified:
 | 
			
		||||
        cookie_dict['path'] = cookie.path
 | 
			
		||||
    if not cookie.expires is None:
 | 
			
		||||
    if cookie.expires is not None:
 | 
			
		||||
        cookie_dict['expires'] = cookie.expires
 | 
			
		||||
    if not cookie.secure is None:
 | 
			
		||||
    if cookie.secure is not None:
 | 
			
		||||
        cookie_dict['secure'] = cookie.secure
 | 
			
		||||
    if not cookie.discard is None:
 | 
			
		||||
    if cookie.discard is not None:
 | 
			
		||||
        cookie_dict['discard'] = cookie.discard
 | 
			
		||||
    try:
 | 
			
		||||
        if (cookie.has_nonstandard_attr('httpOnly') or
 | 
			
		||||
@@ -3957,7 +3957,7 @@ class PhantomJSwrapper(object):
 | 
			
		||||
            cookies = json.loads(f.read().decode('utf-8'))
 | 
			
		||||
        for cookie in cookies:
 | 
			
		||||
            if cookie['httponly'] is True:
 | 
			
		||||
                cookie['rest'] = { 'httpOnly': None }
 | 
			
		||||
                cookie['rest'] = {'httpOnly': None}
 | 
			
		||||
            if 'expiry' in cookie:
 | 
			
		||||
                cookie['expire_time'] = cookie['expiry']
 | 
			
		||||
            self.extractor._set_cookie(**cookie)
 | 
			
		||||
@@ -4024,13 +4024,14 @@ class PhantomJSwrapper(object):
 | 
			
		||||
        else:
 | 
			
		||||
            self.extractor.to_screen('%s: %s' % (video_id, note2))
 | 
			
		||||
 | 
			
		||||
        p = subprocess.Popen([self.exe, '--ssl-protocol=any',
 | 
			
		||||
            self._TMP_FILES['script'].name], stdout=subprocess.PIPE,
 | 
			
		||||
            stderr=subprocess.PIPE)
 | 
			
		||||
        p = subprocess.Popen([
 | 
			
		||||
            self.exe, '--ssl-protocol=any',
 | 
			
		||||
            self._TMP_FILES['script'].name
 | 
			
		||||
        ], stdout=subprocess.PIPE, stderr=subprocess.PIPE)
 | 
			
		||||
        out, err = p.communicate()
 | 
			
		||||
        if p.returncode != 0:
 | 
			
		||||
            raise ExtractorError('Executing JS failed\n:'
 | 
			
		||||
                                 + encodeArgument(err))
 | 
			
		||||
            raise ExtractorError(
 | 
			
		||||
                'Executing JS failed\n:' + encodeArgument(err))
 | 
			
		||||
        with open(self._TMP_FILES['html'].name, 'rb') as f:
 | 
			
		||||
            html = f.read().decode('utf-8')
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user