diff options
| author | Philipp Hagemeister <phihag@phihag.de> | 2013-08-28 12:47:27 +0200 |
|---|---|---|
| committer | Philipp Hagemeister <phihag@phihag.de> | 2013-08-28 12:47:27 +0200 |
| commit | a5caba1eb02665cdc982d6be4a933aafd79243de (patch) | |
| tree | a41ee92e8f5c5ee117d6e8d64a93f9b1dc228291 | |
| parent | edde6c56ac20af57d7fd494810834125bbd3728d (diff) | |
| download | youtube-dl-a5caba1eb02665cdc982d6be4a933aafd79243de.tar.xz | |
[generic] simply use urljoin
| -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: |