Merge pull request #1997 from rg3/simplify-url_basename

Simplify url_basename

youtube_dl/utils.py

@@ -1092,7 +1092,5 @@ def remove_start(s, start):
 
 
 def url_basename(url):
-    m = re.match(r'(?:https?:|)//[^/]+/(?:[^?#]+/)?([^/?#]+)/?(?:[?#]|$)', url)
+    path = compat_urlparse.urlparse(url).path
-    if not m:
+    return path.strip(u'/').split(u'/')[-1]
-        return u''
-    return m.group(1)