forked from minhngoc25a/youtube-dl
Fix flake8 issues after #14225
This commit is contained in:
parent
8251af63a1
commit
4ed2d7b7d1
|
@ -2452,7 +2452,7 @@ class InfoExtractor(object):
|
||||||
def _set_cookie(self, domain, name, value, expire_time=None, port=None,
|
def _set_cookie(self, domain, name, value, expire_time=None, port=None,
|
||||||
path='/', secure=False, discard=False, rest={}, **kwargs):
|
path='/', secure=False, discard=False, rest={}, **kwargs):
|
||||||
cookie = compat_cookiejar.Cookie(
|
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,
|
domain.startswith('.'), path, True, secure, expire_time,
|
||||||
discard, None, None, rest)
|
discard, None, None, rest)
|
||||||
self._downloader.cookiejar.set_cookie(cookie)
|
self._downloader.cookiejar.set_cookie(cookie)
|
||||||
|
|
|
@ -3830,18 +3830,18 @@ def cookie_to_dict(cookie):
|
||||||
cookie_dict = {
|
cookie_dict = {
|
||||||
'name': cookie.name,
|
'name': cookie.name,
|
||||||
'value': cookie.value,
|
'value': cookie.value,
|
||||||
};
|
}
|
||||||
if cookie.port_specified:
|
if cookie.port_specified:
|
||||||
cookie_dict['port'] = cookie.port
|
cookie_dict['port'] = cookie.port
|
||||||
if cookie.domain_specified:
|
if cookie.domain_specified:
|
||||||
cookie_dict['domain'] = cookie.domain
|
cookie_dict['domain'] = cookie.domain
|
||||||
if cookie.path_specified:
|
if cookie.path_specified:
|
||||||
cookie_dict['path'] = cookie.path
|
cookie_dict['path'] = cookie.path
|
||||||
if not cookie.expires is None:
|
if cookie.expires is not None:
|
||||||
cookie_dict['expires'] = cookie.expires
|
cookie_dict['expires'] = cookie.expires
|
||||||
if not cookie.secure is None:
|
if cookie.secure is not None:
|
||||||
cookie_dict['secure'] = cookie.secure
|
cookie_dict['secure'] = cookie.secure
|
||||||
if not cookie.discard is None:
|
if cookie.discard is not None:
|
||||||
cookie_dict['discard'] = cookie.discard
|
cookie_dict['discard'] = cookie.discard
|
||||||
try:
|
try:
|
||||||
if (cookie.has_nonstandard_attr('httpOnly') or
|
if (cookie.has_nonstandard_attr('httpOnly') or
|
||||||
|
@ -4024,13 +4024,14 @@ class PhantomJSwrapper(object):
|
||||||
else:
|
else:
|
||||||
self.extractor.to_screen('%s: %s' % (video_id, note2))
|
self.extractor.to_screen('%s: %s' % (video_id, note2))
|
||||||
|
|
||||||
p = subprocess.Popen([self.exe, '--ssl-protocol=any',
|
p = subprocess.Popen([
|
||||||
self._TMP_FILES['script'].name], stdout=subprocess.PIPE,
|
self.exe, '--ssl-protocol=any',
|
||||||
stderr=subprocess.PIPE)
|
self._TMP_FILES['script'].name
|
||||||
|
], stdout=subprocess.PIPE, stderr=subprocess.PIPE)
|
||||||
out, err = p.communicate()
|
out, err = p.communicate()
|
||||||
if p.returncode != 0:
|
if p.returncode != 0:
|
||||||
raise ExtractorError('Executing JS failed\n:'
|
raise ExtractorError(
|
||||||
+ encodeArgument(err))
|
'Executing JS failed\n:' + encodeArgument(err))
|
||||||
with open(self._TMP_FILES['html'].name, 'rb') as f:
|
with open(self._TMP_FILES['html'].name, 'rb') as f:
|
||||||
html = f.read().decode('utf-8')
|
html = f.read().decode('utf-8')
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue