Merge pull request #1997 from rg3/simplify-url_basename

Simplify url_basename
pull/2006/head
Philipp Hagemeister 11 years ago
commit f5567e401c

@ -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]

Loading…
Cancel
Save