Merge pull request #1997 from rg3/simplify-url_basename

Simplify url_basename
2013-12-17 07:08:48 -08:00 · 2013-12-17 07:08:48 -08:00 · f5567e401c
parent 6086d121cb 9b8aaeed85
commit f5567e401c
1 changed files with 2 additions and 4 deletions
--- a/youtube_dl/utils.py
+++ b/youtube_dl/utils.py
@ -1092,7 +1092,5 @@ def remove_start(s, start):


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