aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--test/test_all_urls.py3
-rw-r--r--youtube_dl/extractor/youtube.py2
2 files changed, 4 insertions, 1 deletions
diff --git a/test/test_all_urls.py b/test/test_all_urls.py
index aa8e4e4bd..7a78005a3 100644
--- a/test/test_all_urls.py
+++ b/test/test_all_urls.py
@@ -68,6 +68,9 @@ class TestAllURLsMatching(unittest.TestCase):
def test_youtube_show_matching(self):
self.assertMatch('http://www.youtube.com/show/airdisasters', ['youtube:show'])
+ def test_youtube_truncated(self):
+ self.assertMatch('http://www.youtube.com/watch?', ['youtube:truncated_url'])
+
def test_justin_tv_channelid_matching(self):
self.assertTrue(JustinTVIE.suitable(u"justin.tv/vanillatv"))
self.assertTrue(JustinTVIE.suitable(u"twitch.tv/vanillatv"))
diff --git a/youtube_dl/extractor/youtube.py b/youtube_dl/extractor/youtube.py
index a81036843..059cf8cbd 100644
--- a/youtube_dl/extractor/youtube.py
+++ b/youtube_dl/extractor/youtube.py
@@ -1815,7 +1815,7 @@ class YoutubeTruncatedURLIE(InfoExtractor):
IE_NAME = 'youtube:truncated_url'
IE_DESC = False # Do not list
_VALID_URL = r'''(?x)
- (?:https?://)?[^/]+/watch\?feature=[a-z_]+$|
+ (?:https?://)?[^/]+/watch\?(?:feature=[a-z_]+)?$|
(?:https?://)?(?:www\.)?youtube\.com/attribution_link\?a=[^&]+$
'''