diff options
| author | Allan Zhou <allanzp@gmail.com> | 2013-08-28 09:57:28 -0700 |
|---|---|---|
| committer | Allan Zhou <allanzp@gmail.com> | 2013-08-28 09:57:28 -0700 |
| commit | 591078babff1d783bed872c5b441dc570d354448 (patch) | |
| tree | 6cf813c993ea26eaec1d976b616d973c2bc47583 /youtube_dl/extractor/generic.py | |
| parent | 99859d436cdee9acc9c869254e734eba5b748260 (diff) | |
| parent | 9868c781a1bb3f50385bc7d1e87d82080ffffbc6 (diff) | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'youtube_dl/extractor/generic.py')
| -rw-r--r-- | youtube_dl/extractor/generic.py | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/youtube_dl/extractor/generic.py b/youtube_dl/extractor/generic.py index d034a11bb..dc4dea4ad 100644 --- a/youtube_dl/extractor/generic.py +++ b/youtube_dl/extractor/generic.py @@ -7,8 +7,8 @@ from .common import InfoExtractor from ..utils import ( compat_urllib_error, compat_urllib_parse, - compat_urllib_parse_urlparse, compat_urllib_request, + compat_urlparse, ExtractorError, ) @@ -163,10 +163,7 @@ class GenericIE(InfoExtractor): raise ExtractorError(u'Invalid URL: %s' % url) video_url = compat_urllib_parse.unquote(mobj.group(1)) - if video_url.startswith('//'): - video_url = compat_urllib_parse_urlparse(url).scheme + ':' + video_url - if '://' not in video_url: - video_url = url + ('' if url.endswith('/') else '/') + video_url + video_url = compat_urlparse.urljoin(url, video_url) video_id = os.path.basename(video_url) # here's a fun little line of code for you: |