X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=youtube_dl%2Futils.py;h=e40b367c255719046bf2d5dd2fd63bc6bb2e4d8a;hb=7a5e7b303c6186f01e475789de7ef8cc3f9eea94;hp=3ecd798d74217011920135199ee59c76d58852c0;hpb=c4f731262dbee921147b94aac5035b5d9ec75502;p=youtube-dl

diff --git a/youtube_dl/utils.py b/youtube_dl/utils.py
index 3ecd798d7..e40b367c2 100644
--- a/youtube_dl/utils.py
+++ b/youtube_dl/utils.py
@@ -242,8 +242,8 @@ else:
 if sys.version_info >= (2,7):
     def find_xpath_attr(node, xpath, key, val):
         """ Find the xpath xpath[@key=val] """
-        assert re.match(r'^[a-zA-Z]+$', key)
-        assert re.match(r'^[a-zA-Z0-9@\s:._]*$', val)
+        assert re.match(r'^[a-zA-Z-]+$', key)
+        assert re.match(r'^[a-zA-Z0-9@\s:._-]*$', val)
         expr = xpath + u"[@%s='%s']" % (key, val)
         return node.find(expr)
 else:
@@ -852,6 +852,8 @@ def unified_strdate(date_str):
     return upload_date
 
 def determine_ext(url, default_ext=u'unknown_video'):
+    if url is None:
+        return default_ext
     guess = url.partition(u'?')[0].rpartition(u'.')[2]
     if re.match(r'^[A-Za-z0-9]+$', guess):
         return guess