aboutsummaryrefslogtreecommitdiff
path: root/youtube_dl
diff options
context:
space:
mode:
authorFilippo Valsorda <filippo.valsorda@gmail.com>2013-03-31 03:02:05 +0200
committerFilippo Valsorda <filippo.valsorda@gmail.com>2013-03-31 03:02:49 +0200
commitfa41fbd3189b36300a4558b722dea5857a7e4214 (patch)
tree64cf9f65a8132d57bd55ae87344fa0a704dd944e /youtube_dl
parentfbbdf475b1a534389585d696db5e6c8b3fd212fb (diff)
don't catch YT user URLs in YoutubePlaylistIE (fix #754, fix #763)
Diffstat (limited to 'youtube_dl')
-rwxr-xr-xyoutube_dl/InfoExtractors.py6
1 files changed, 2 insertions, 4 deletions
diff --git a/youtube_dl/InfoExtractors.py b/youtube_dl/InfoExtractors.py
index 2881ae67c..cca7e1b54 100755
--- a/youtube_dl/InfoExtractors.py
+++ b/youtube_dl/InfoExtractors.py
@@ -1710,9 +1710,7 @@ class YoutubePlaylistIE(InfoExtractor):
(?:
(?:course|view_play_list|my_playlists|artist|playlist|watch)
\? (?:.*?&)*? (?:p|a|list)=
- | user/.*?/user/
| p/
- | user/.*?#[pg]/c/
)
((?:PL|EC|UU)?[0-9A-Za-z-_]{10,})
.*
@@ -3796,7 +3794,7 @@ class WorldStarHipHopIE(InfoExtractor):
_title = r"""<title>(.*)</title>"""
mobj = re.search(_title, webpage_src)
-
+
if mobj is not None:
title = mobj.group(1)
else:
@@ -3814,7 +3812,7 @@ class WorldStarHipHopIE(InfoExtractor):
if mobj is not None:
title = mobj.group(1)
thumbnail = None
-
+
results = [{
'id': video_id,
'url' : video_url,