projects
/
youtube-dl
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
fca6dba
)
Remove no longer needed compat_str around geturl
author
Sergey M․
<dstftw@gmail.com>
Sat, 29 Feb 2020 12:17:27 +0000
(19:17 +0700)
committer
Sergey M․
<dstftw@gmail.com>
Sat, 29 Feb 2020 12:19:24 +0000
(19:19 +0700)
12 files changed:
youtube_dl/extractor/common.py
patch
|
blob
|
history
youtube_dl/extractor/eporner.py
patch
|
blob
|
history
youtube_dl/extractor/generic.py
patch
|
blob
|
history
youtube_dl/extractor/lecturio.py
patch
|
blob
|
history
youtube_dl/extractor/linuxacademy.py
patch
|
blob
|
history
youtube_dl/extractor/mediaset.py
patch
|
blob
|
history
youtube_dl/extractor/mediasite.py
patch
|
blob
|
history
youtube_dl/extractor/platzi.py
patch
|
blob
|
history
youtube_dl/extractor/safari.py
patch
|
blob
|
history
youtube_dl/extractor/teachable.py
patch
|
blob
|
history
youtube_dl/extractor/tumblr.py
patch
|
blob
|
history
youtube_dl/extractor/vimeo.py
patch
|
blob
|
history
diff --git
a/youtube_dl/extractor/common.py
b/youtube_dl/extractor/common.py
index ab7d473d049c4aaf95e9e98b82b5cb29cb7bb60d..eaae5e484f99311ccf018301f773c87f9c8cf544 100644
(file)
--- a/
youtube_dl/extractor/common.py
+++ b/
youtube_dl/extractor/common.py
@@
-2341,7
+2341,7
@@
class InfoExtractor(object):
return []
ism_doc, urlh = res
return []
ism_doc, urlh = res
- return self._parse_ism_formats(ism_doc,
compat_str(urlh.geturl()
), ism_id)
+ return self._parse_ism_formats(ism_doc,
urlh.geturl(
), ism_id)
def _parse_ism_formats(self, ism_doc, ism_url, ism_id=None):
"""
def _parse_ism_formats(self, ism_doc, ism_url, ism_id=None):
"""
diff --git
a/youtube_dl/extractor/eporner.py
b/youtube_dl/extractor/eporner.py
index c050bf9df3fb7ececed5b3e03a70aea9b2c37417..fe42821c731c711e8f0974fd4ce48f5c9aee8e8f 100644
(file)
--- a/
youtube_dl/extractor/eporner.py
+++ b/
youtube_dl/extractor/eporner.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 (
encode_base_n,
ExtractorError,
from ..utils import (
encode_base_n,
ExtractorError,
@@
-55,7
+54,7
@@
class EpornerIE(InfoExtractor):
webpage, urlh = self._download_webpage_handle(url, display_id)
webpage, urlh = self._download_webpage_handle(url, display_id)
- video_id = self._match_id(
compat_str(urlh.geturl()
))
+ video_id = self._match_id(
urlh.geturl(
))
hash = self._search_regex(
r'hash\s*:\s*["\']([\da-f]{32})', webpage, 'hash')
hash = self._search_regex(
r'hash\s*:\s*["\']([\da-f]{32})', webpage, 'hash')
diff --git
a/youtube_dl/extractor/generic.py
b/youtube_dl/extractor/generic.py
index 04c026984b12086085ca094673d1e84bf4419745..d1ec56be97d81de050793f240a8b3fdbddade1f1 100644
(file)
--- a/
youtube_dl/extractor/generic.py
+++ b/
youtube_dl/extractor/generic.py
@@
-2287,7
+2287,7
@@
class GenericIE(InfoExtractor):
if head_response is not False:
# Check for redirect
if head_response is not False:
# Check for redirect
- new_url =
compat_str(head_response.geturl()
)
+ new_url =
head_response.geturl(
)
if url != new_url:
self.report_following_redirect(new_url)
if force_videoid:
if url != new_url:
self.report_following_redirect(new_url)
if force_videoid:
@@
-2387,12
+2387,12
@@
class GenericIE(InfoExtractor):
return self.playlist_result(
self._parse_xspf(
doc, video_id, xspf_url=url,
return self.playlist_result(
self._parse_xspf(
doc, video_id, xspf_url=url,
- xspf_base_url=
compat_str(full_response.geturl()
)),
+ xspf_base_url=
full_response.geturl(
)),
video_id)
elif re.match(r'(?i)^(?:{[^}]+})?MPD$', doc.tag):
info_dict['formats'] = self._parse_mpd_formats(
doc,
video_id)
elif re.match(r'(?i)^(?:{[^}]+})?MPD$', doc.tag):
info_dict['formats'] = self._parse_mpd_formats(
doc,
- mpd_base_url=
compat_str(full_response.geturl()
).rpartition('/')[0],
+ mpd_base_url=
full_response.geturl(
).rpartition('/')[0],
mpd_url=url)
self._sort_formats(info_dict['formats'])
return info_dict
mpd_url=url)
self._sort_formats(info_dict['formats'])
return info_dict
diff --git
a/youtube_dl/extractor/lecturio.py
b/youtube_dl/extractor/lecturio.py
index 6ed7da4abaa7a2a45f924b4bf9f919261a40bec9..1b2dcef46621237fd7c7ce376165a6bc5c674606 100644
(file)
--- a/
youtube_dl/extractor/lecturio.py
+++ b/
youtube_dl/extractor/lecturio.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 (
clean_html,
determine_ext,
from ..utils import (
clean_html,
determine_ext,
@@
-36,7
+35,7
@@
class LecturioBaseIE(InfoExtractor):
self._LOGIN_URL, None, 'Downloading login popup')
def is_logged(url_handle):
self._LOGIN_URL, None, 'Downloading login popup')
def is_logged(url_handle):
- return self._LOGIN_URL not in
compat_str(url_handle.geturl()
)
+ return self._LOGIN_URL not in
url_handle.geturl(
)
# Already logged in
if is_logged(urlh):
# Already logged in
if is_logged(urlh):
diff --git
a/youtube_dl/extractor/linuxacademy.py
b/youtube_dl/extractor/linuxacademy.py
index a78c6556e105220a09b66dac94d8fc27780e3dc5..23ca965d977b1ec682101f048684f20f1b70834c 100644
(file)
--- a/
youtube_dl/extractor/linuxacademy.py
+++ b/
youtube_dl/extractor/linuxacademy.py
@@
-8,7
+8,6
@@
from .common import InfoExtractor
from ..compat import (
compat_b64decode,
compat_HTTPError,
from ..compat import (
compat_b64decode,
compat_HTTPError,
- compat_str,
)
from ..utils import (
ExtractorError,
)
from ..utils import (
ExtractorError,
@@
-99,7
+98,7
@@
class LinuxAcademyIE(InfoExtractor):
'sso': 'true',
})
'sso': 'true',
})
- login_state_url =
compat_str(urlh.geturl()
)
+ login_state_url =
urlh.geturl(
)
try:
login_page = self._download_webpage(
try:
login_page = self._download_webpage(
@@
-129,7
+128,7
@@
class LinuxAcademyIE(InfoExtractor):
})
access_token = self._search_regex(
})
access_token = self._search_regex(
- r'access_token=([^=&]+)',
compat_str(urlh.geturl()
),
+ r'access_token=([^=&]+)',
urlh.geturl(
),
'access token')
self._download_webpage(
'access token')
self._download_webpage(
diff --git
a/youtube_dl/extractor/mediaset.py
b/youtube_dl/extractor/mediaset.py
index 027a790b8b182541dd8b592b183b0dbaff505322..933df14952d5cc16857485e306be07f2d32384d3 100644
(file)
--- a/
youtube_dl/extractor/mediaset.py
+++ b/
youtube_dl/extractor/mediaset.py
@@
-6,7
+6,6
@@
import re
from .theplatform import ThePlatformBaseIE
from ..compat import (
compat_parse_qs,
from .theplatform import ThePlatformBaseIE
from ..compat import (
compat_parse_qs,
- compat_str,
compat_urllib_parse_urlparse,
)
from ..utils import (
compat_urllib_parse_urlparse,
)
from ..utils import (
@@
-114,7
+113,7
@@
class MediasetIE(ThePlatformBaseIE):
continue
urlh = ie._request_webpage(
embed_url, video_id, note='Following embed URL redirect')
continue
urlh = ie._request_webpage(
embed_url, video_id, note='Following embed URL redirect')
- embed_url =
compat_str(urlh.geturl()
)
+ embed_url =
urlh.geturl(
)
program_guid = _program_guid(_qs(embed_url))
if program_guid:
entries.append(embed_url)
program_guid = _program_guid(_qs(embed_url))
if program_guid:
entries.append(embed_url)
diff --git
a/youtube_dl/extractor/mediasite.py
b/youtube_dl/extractor/mediasite.py
index 694a264d672288b47c2700b9265bfc0635158ff2..d6eb1574065dece67e28a4b36fa43478dd48dfa3 100644
(file)
--- a/
youtube_dl/extractor/mediasite.py
+++ b/
youtube_dl/extractor/mediasite.py
@@
-129,7
+129,7
@@
class MediasiteIE(InfoExtractor):
query = mobj.group('query')
webpage, urlh = self._download_webpage_handle(url, resource_id) # XXX: add UrlReferrer?
query = mobj.group('query')
webpage, urlh = self._download_webpage_handle(url, resource_id) # XXX: add UrlReferrer?
- redirect_url =
compat_str(urlh.geturl()
)
+ redirect_url =
urlh.geturl(
)
# XXX: might have also extracted UrlReferrer and QueryString from the html
service_path = compat_urlparse.urljoin(redirect_url, self._html_search_regex(
# XXX: might have also extracted UrlReferrer and QueryString from the html
service_path = compat_urlparse.urljoin(redirect_url, self._html_search_regex(
diff --git
a/youtube_dl/extractor/platzi.py
b/youtube_dl/extractor/platzi.py
index 602207bebdd6a01d7f33dbf08302ab5a75ccf207..23c8256b59dab4a92ae79ef48dc8e3b0adf0ff68 100644
(file)
--- a/
youtube_dl/extractor/platzi.py
+++ b/
youtube_dl/extractor/platzi.py
@@
-46,7
+46,7
@@
class PlatziBaseIE(InfoExtractor):
headers={'Referer': self._LOGIN_URL})
# login succeeded
headers={'Referer': self._LOGIN_URL})
# login succeeded
- if 'platzi.com/login' not in
compat_str(urlh.geturl()
):
+ if 'platzi.com/login' not in
urlh.geturl(
):
return
login_error = self._webpage_read_content(
return
login_error = self._webpage_read_content(
diff --git
a/youtube_dl/extractor/safari.py
b/youtube_dl/extractor/safari.py
index 4942437c7dbe918bd408bf805f8b76cc1d7967e4..2cc66512241dbc6f65589e52d842cf70b7250ccb 100644
(file)
--- a/
youtube_dl/extractor/safari.py
+++ b/
youtube_dl/extractor/safari.py
@@
-8,7
+8,6
@@
from .common import InfoExtractor
from ..compat import (
compat_parse_qs,
from ..compat import (
compat_parse_qs,
- compat_str,
compat_urlparse,
)
from ..utils import (
compat_urlparse,
)
from ..utils import (
@@
-39,13
+38,13
@@
class SafariBaseIE(InfoExtractor):
'Downloading login page')
def is_logged(urlh):
'Downloading login page')
def is_logged(urlh):
- return 'learning.oreilly.com/home/' in
compat_str(urlh.geturl()
)
+ return 'learning.oreilly.com/home/' in
urlh.geturl(
)
if is_logged(urlh):
self.LOGGED_IN = True
return
if is_logged(urlh):
self.LOGGED_IN = True
return
- redirect_url =
compat_str(urlh.geturl()
)
+ redirect_url =
urlh.geturl(
)
parsed_url = compat_urlparse.urlparse(redirect_url)
qs = compat_parse_qs(parsed_url.query)
next_uri = compat_urlparse.urljoin(
parsed_url = compat_urlparse.urlparse(redirect_url)
qs = compat_parse_qs(parsed_url.query)
next_uri = compat_urlparse.urljoin(
diff --git
a/youtube_dl/extractor/teachable.py
b/youtube_dl/extractor/teachable.py
index cca89a4a82fd3f12fff5c83f2c59c26b81db6b0e..4316a69623c507a3613d6fa302bd57a70a0881f2 100644
(file)
--- a/
youtube_dl/extractor/teachable.py
+++ b/
youtube_dl/extractor/teachable.py
@@
-4,7
+4,6
@@
import re
from .common import InfoExtractor
from .wistia import WistiaIE
from .common import InfoExtractor
from .wistia import WistiaIE
-from ..compat import compat_str
from ..utils import (
clean_html,
ExtractorError,
from ..utils import (
clean_html,
ExtractorError,
@@
-58,7
+57,7
@@
class TeachableBaseIE(InfoExtractor):
self._logged_in = True
return
self._logged_in = True
return
- login_url =
compat_str(urlh.geturl()
)
+ login_url =
urlh.geturl(
)
login_form = self._hidden_inputs(login_page)
login_form = self._hidden_inputs(login_page)
diff --git
a/youtube_dl/extractor/tumblr.py
b/youtube_dl/extractor/tumblr.py
index edbb0aa6944ba82b36415875f2d99e570b3373fc..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,
@@
-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. '
diff --git
a/youtube_dl/extractor/vimeo.py
b/youtube_dl/extractor/vimeo.py
index f378aa283e3d61f6a2afbfa5134c73171b317bfd..1da4ced96c537cb9fbfcee9e2a757083b6ce633a 100644
(file)
--- a/
youtube_dl/extractor/vimeo.py
+++ b/
youtube_dl/extractor/vimeo.py
@@
-591,7
+591,7
@@
class VimeoIE(VimeoBaseInfoExtractor):
# Retrieve video webpage to extract further information
webpage, urlh = self._download_webpage_handle(
url, video_id, headers=headers)
# Retrieve video webpage to extract further information
webpage, urlh = self._download_webpage_handle(
url, video_id, headers=headers)
- redirect_url =
compat_str(urlh.geturl()
)
+ redirect_url =
urlh.geturl(
)
except ExtractorError as ee:
if isinstance(ee.cause, compat_HTTPError) and ee.cause.code == 403:
errmsg = ee.cause.read()
except ExtractorError as ee:
if isinstance(ee.cause, compat_HTTPError) and ee.cause.code == 403:
errmsg = ee.cause.read()