diff options
| author | Philipp Hagemeister <phihag@phihag.de> | 2013-12-17 12:32:58 +0100 |
|---|---|---|
| committer | Philipp Hagemeister <phihag@phihag.de> | 2013-12-17 12:32:58 +0100 |
| commit | d6c7a367e88096bb17e323954002c084477fe908 (patch) | |
| tree | 416d5df540c77499748928c73c5b016eb4394ff9 | |
| parent | cecaaf3f58ad9f544dbb79af1e565d9353fa2b2d (diff) | |
[utils] Fix url_basename
| -rw-r--r-- | test/test_utils.py | 3 | ||||
| -rw-r--r-- | youtube_dl/utils.py | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/test/test_utils.py b/test/test_utils.py index 5f4fdb771..e5778cd83 100644 --- a/test/test_utils.py +++ b/test/test_utils.py @@ -188,6 +188,9 @@ class TestUtil(unittest.TestCase): self.assertEqual(url_basename(u'http://foo.de/bar/baz?x=y'), u'baz') self.assertEqual(url_basename(u'http://foo.de/bar/baz#x=y'), u'baz') self.assertEqual(url_basename(u'http://foo.de/bar/baz/'), u'baz') + self.assertEqual( + url_basename(u'http://media.w3.org/2010/05/sintel/trailer.mp4'), + u'trailer.mp4') if __name__ == '__main__': unittest.main() diff --git a/youtube_dl/utils.py b/youtube_dl/utils.py index a249c7ec1..2d12e2df9 100644 --- a/youtube_dl/utils.py +++ b/youtube_dl/utils.py @@ -1087,7 +1087,7 @@ def remove_start(s, start): def url_basename(url): - m = re.match(r'(?:https?:|)//[^/]+/(?:[^/?#]+/)?([^/?#]+)/?(?:[?#]|$)', url) + m = re.match(r'(?:https?:|)//[^/]+/(?:[^?#]+/)?([^/?#]+)/?(?:[?#]|$)', url) if not m: return u'' return m.group(1) |