youtube-dl

commit f5567e401cf012de85bc1471efca80fa947ba4c0
parent 6086d121cbc3e49c30e3ef64151cc2c4b22ed713
Author: Philipp Hagemeister <phihag@phihag.de>
Date:   Tue, 17 Dec 2013 07:08:48 -0800

Merge pull request #1997 from rg3/simplify-url_basename

Simplify url_basename
Diffstat:
M
youtube_dl/utils.py
 | 
6
++----

1 file changed, 2 insertions(+), 4 deletions(-)
diff --git 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]