projects
/
youtube-dl
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
edde6c5
)
[generic] simply use urljoin
author
Philipp Hagemeister
<phihag@phihag.de>
Wed, 28 Aug 2013 10:47:27 +0000
(12:47 +0200)
committer
Philipp Hagemeister
<phihag@phihag.de>
Wed, 28 Aug 2013 10:47:27 +0000
(12:47 +0200)
youtube_dl/extractor/generic.py
patch
|
blob
|
history
diff --git
a/youtube_dl/extractor/generic.py
b/youtube_dl/extractor/generic.py
index bfc9bff493af635560469e37ba146f58b29c3c90..dc4dea4adf63937722a1bf81ead5e10fe09f34e3 100644
(file)
--- 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,
from ..utils import (
compat_urllib_error,
compat_urllib_parse,
- compat_urllib_parse_urlparse,
compat_urllib_request,
compat_urllib_request,
+ compat_urlparse,
ExtractorError,
)
ExtractorError,
)
@@
-163,15
+163,7
@@
class GenericIE(InfoExtractor):
raise ExtractorError(u'Invalid URL: %s' % url)
video_url = compat_urllib_parse.unquote(mobj.group(1))
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:
video_id = os.path.basename(video_url)
# here's a fun little line of code for you: