]> git.bitcoin.ninja Git - youtube-dl/commitdiff
don't catch YT user URLs in YoutubePlaylistIE (fix #754, fix #763)
authorFilippo Valsorda <filippo.valsorda@gmail.com>
Sun, 31 Mar 2013 01:02:05 +0000 (03:02 +0200)
committerFilippo Valsorda <filippo.valsorda@gmail.com>
Sun, 31 Mar 2013 01:02:49 +0000 (03:02 +0200)
youtube_dl/InfoExtractors.py

index 2881ae67c54df152ece3400f86446256bd21ec17..cca7e1b54be0766bdf3086b25ba25a85f2819e98 100755 (executable)
@@ -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,