projects
/
youtube-dl
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
1f80e36
)
[extractor/generic] Use compat_urllib_parse_unquote
author
Sergey M․
<dstftw@gmail.com>
Fri, 17 Jul 2015 17:39:32 +0000
(23:39 +0600)
committer
Sergey M․
<dstftw@gmail.com>
Fri, 17 Jul 2015 17:39:32 +0000
(23:39 +0600)
youtube_dl/extractor/generic.py
patch
|
blob
|
history
diff --git
a/youtube_dl/extractor/generic.py
b/youtube_dl/extractor/generic.py
index fc1bf2b6e22dc356a280e15098a725d0cbedc5ec..a62287e50d34f36840aab34ad3cb3988f85b0193 100644
(file)
--- a/
youtube_dl/extractor/generic.py
+++ b/
youtube_dl/extractor/generic.py
@@
-8,7
+8,6
@@
import re
from .common import InfoExtractor
from .youtube import YoutubeIE
from ..compat import (
from .common import InfoExtractor
from .youtube import YoutubeIE
from ..compat import (
- compat_urllib_parse,
compat_urllib_parse_unquote,
compat_urllib_request,
compat_urlparse,
compat_urllib_parse_unquote,
compat_urllib_request,
compat_urlparse,
@@
-1369,7
+1368,7
@@
class GenericIE(InfoExtractor):
return self.url_result(mobj.group('url'))
mobj = re.search(r'class=["\']embedly-embed["\'][^>]src=["\'][^"\']*url=(?P<url>[^&]+)', webpage)
if mobj is not None:
return self.url_result(mobj.group('url'))
mobj = re.search(r'class=["\']embedly-embed["\'][^>]src=["\'][^"\']*url=(?P<url>[^&]+)', webpage)
if mobj is not None:
- return self.url_result(compat_urllib_parse
.
unquote(mobj.group('url')))
+ return self.url_result(compat_urllib_parse
_
unquote(mobj.group('url')))
# Look for funnyordie embed
matches = re.findall(r'<iframe[^>]+?src="(https?://(?:www\.)?funnyordie\.com/embed/[^"]+)"', webpage)
# Look for funnyordie embed
matches = re.findall(r'<iframe[^>]+?src="(https?://(?:www\.)?funnyordie\.com/embed/[^"]+)"', webpage)
@@
-1682,7
+1681,7
@@
class GenericIE(InfoExtractor):
entries = []
for video_url in found:
video_url = compat_urlparse.urljoin(url, video_url)
entries = []
for video_url in found:
video_url = compat_urlparse.urljoin(url, video_url)
- video_id = compat_urllib_parse
.
unquote(os.path.basename(video_url))
+ video_id = compat_urllib_parse
_
unquote(os.path.basename(video_url))
# Sometimes, jwplayer extraction will result in a YouTube URL
if YoutubeIE.suitable(video_url):
# Sometimes, jwplayer extraction will result in a YouTube URL
if YoutubeIE.suitable(video_url):