diff options
Diffstat (limited to 'youtube_dl/extractor/openload.py')
| -rw-r--r-- | youtube_dl/extractor/openload.py | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/youtube_dl/extractor/openload.py b/youtube_dl/extractor/openload.py index d51d3d2b4..1d6dd175b 100644 --- a/youtube_dl/extractor/openload.py +++ b/youtube_dl/extractor/openload.py @@ -3,21 +3,17 @@ from __future__ import unicode_literals import json import os -import re import subprocess import tempfile -from .common import InfoExtractor from ..compat import ( compat_urlparse, compat_kwargs, ) from ..utils import ( check_executable, - determine_ext, encodeArgument, ExtractorError, - get_element_by_id, get_exe_version, is_outdated_version, std_headers, @@ -42,9 +38,9 @@ def cookie_to_dict(cookie): if cookie.discard is not None: cookie_dict['discard'] = cookie.discard try: - if (cookie.has_nonstandard_attr('httpOnly') or - cookie.has_nonstandard_attr('httponly') or - cookie.has_nonstandard_attr('HttpOnly')): + if (cookie.has_nonstandard_attr('httpOnly') + or cookie.has_nonstandard_attr('httponly') + or cookie.has_nonstandard_attr('HttpOnly')): cookie_dict['httponly'] = True except TypeError: pass @@ -240,6 +236,8 @@ class PhantomJSwrapper(object): self._load_cookies() return (html, encodeArgument(out)) +<<<<<<< HEAD +======= class OpenloadIE(InfoExtractor): @@ -377,3 +375,4 @@ class OpenloadIE(InfoExtractor): 'http_headers': headers, } return info_dict +>>>>>>> master |