diff options
| author | Pierre Rudloff <contact@rudloff.pro> | 2013-08-31 00:37:29 +0200 |
|---|---|---|
| committer | Pierre Rudloff <contact@rudloff.pro> | 2013-08-31 00:37:29 +0200 |
| commit | 847f582290c6ad6ec0c72760ea3cfa6417d28e3c (patch) | |
| tree | c12baa61c649ec00e5fdfe35b1f88f0025d54f99 /youtube_dl/extractor/generic.py | |
| parent | cd9c100963e8b8bf651d1f359e5f7812603ca0fd (diff) | |
| parent | 10f5c016ec6262e5d29327e97fe4f3d1127ccdff (diff) | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'youtube_dl/extractor/generic.py')
| -rw-r--r-- | youtube_dl/extractor/generic.py | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/youtube_dl/extractor/generic.py b/youtube_dl/extractor/generic.py index bfc9bff49..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,15 +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: - up = compat_urllib_parse_urlparse(url) - if video_url.startswith('/'): - video_url = up.scheme + '://' + up.netloc + video_url - else: # relative path - video_url = (up.scheme + '://' + up.netloc + - up.path.rpartition('/')[0] + '/' + 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: |