projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[youtube] Fix extraction.
[youtube-dl]
/
youtube_dl
/
extractor
/
tumblr.py
diff --git
a/youtube_dl/extractor/tumblr.py
b/youtube_dl/extractor/tumblr.py
index 89e6eb5abb3f8f12d36caa5a138c9a293d6fadeb..ae584ad697bdf3f460eff033b8f43e75776942ee 100644
(file)
--- a/
youtube_dl/extractor/tumblr.py
+++ b/
youtube_dl/extractor/tumblr.py
@@
-4,7
+4,6
@@
from __future__ import unicode_literals
import re
from .common import InfoExtractor
import re
from .common import InfoExtractor
-from ..compat import compat_str
from ..utils import (
ExtractorError,
int_or_none,
from ..utils import (
ExtractorError,
int_or_none,
@@
-108,7
+107,7
@@
class TumblrIE(InfoExtractor):
self._login()
def _login(self):
self._login()
def _login(self):
-
(username, password)
= self._get_login_info()
+
username, password
= self._get_login_info()
if username is None:
return
if username is None:
return
@@
-151,7
+150,7
@@
class TumblrIE(InfoExtractor):
url = 'http://%s.tumblr.com/post/%s/' % (blog, video_id)
webpage, urlh = self._download_webpage_handle(url, video_id)
url = 'http://%s.tumblr.com/post/%s/' % (blog, video_id)
webpage, urlh = self._download_webpage_handle(url, video_id)
- redirect_url =
compat_str(urlh.geturl()
)
+ redirect_url =
urlh.geturl(
)
if 'tumblr.com/safe-mode' in redirect_url or redirect_url.startswith('/safe-mode'):
raise ExtractorError(
'This Tumblr may contain sensitive media. '
if 'tumblr.com/safe-mode' in redirect_url or redirect_url.startswith('/safe-mode'):
raise ExtractorError(
'This Tumblr may contain sensitive media. '