aboutsummaryrefslogtreecommitdiffstats
path: root/youtube_dl/extractor/safari.py
diff options
context:
space:
mode:
authorAakash Gajjar <skyqutip@gmail.com>2020-08-26 20:22:32 +0530
committerGitHub <noreply@github.com>2020-08-26 20:22:32 +0530
commit19a107f21c7544b5e49a58040d09d9465f6858b1 (patch)
tree8325ffd206d9da1ce53f24b9ab4690abe175144d /youtube_dl/extractor/safari.py
parent7f7edf837c1af059f64a4968b942a83f86cf6206 (diff)
downloadhypervideo-pre-19a107f21c7544b5e49a58040d09d9465f6858b1.tar.lz
hypervideo-pre-19a107f21c7544b5e49a58040d09d9465f6858b1.tar.xz
hypervideo-pre-19a107f21c7544b5e49a58040d09d9465f6858b1.zip
Revert "pull changes from remote master (#190)" (#193)
This reverts commit b827ee921fe510a8730a9fab070148ed2b8279b5.
Diffstat (limited to 'youtube_dl/extractor/safari.py')
-rw-r--r--youtube_dl/extractor/safari.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/youtube_dl/extractor/safari.py b/youtube_dl/extractor/safari.py
index 2cc665122..bd9ee1647 100644
--- a/youtube_dl/extractor/safari.py
+++ b/youtube_dl/extractor/safari.py
@@ -8,6 +8,7 @@ from .common import InfoExtractor
from ..compat import (
compat_parse_qs,
+ compat_str,
compat_urlparse,
)
from ..utils import (
@@ -38,13 +39,13 @@ class SafariBaseIE(InfoExtractor):
'Downloading login page')
def is_logged(urlh):
- return 'learning.oreilly.com/home/' in urlh.geturl()
+ return 'learning.oreilly.com/home/' in compat_str(urlh.geturl())
if is_logged(urlh):
self.LOGGED_IN = True
return
- redirect_url = urlh.geturl()
+ redirect_url = compat_str(urlh.geturl())
parsed_url = compat_urlparse.urlparse(redirect_url)
qs = compat_parse_qs(parsed_url.query)
next_uri = compat_urlparse.urljoin(
@@ -164,8 +165,7 @@ class SafariIE(SafariBaseIE):
kaltura_session = self._download_json(
'%s/player/kaltura_session/?reference_id=%s' % (self._API_BASE, reference_id),
video_id, 'Downloading kaltura session JSON',
- 'Unable to download kaltura session JSON', fatal=False,
- headers={'Accept': 'application/json'})
+ 'Unable to download kaltura session JSON', fatal=False)
if kaltura_session:
session = kaltura_session.get('session')
if session: