TonBERRY/microdot
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Handle 0 as an integer argument (Fixes #212)

Browse Source
This commit is contained in:
Miguel Grinberg
2024-03-06 20:34:00 +00:00
parent 901f4e55b8
commit d0a4cf8fa7
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/microdot/microdot.py
View File

@@ -862,8 +862,6 @@ class URLPattern():
if arg is None: if arg is None:
return return
if 'name' in segment: if 'name' in segment:
if not arg:
return
args[segment['name']] = arg args[segment['name']] = arg
if path is not None: if path is not None:
return return
@@ -879,6 +877,8 @@ class URLPattern():
def _string_segment(self, value): def _string_segment(self, value):
s = value.split('/', 1) s = value.split('/', 1)
if len(s[0]) == 0:
return None, None
return s[0], s[1] if len(s) > 1 else None return s[0], s[1] if len(s) > 1 else None
def _int_segment(self, value): def _int_segment(self, value):

6
tests/test_url_pattern.py
View File

@@ -26,10 +26,14 @@ class TestURLPattern(unittest.TestCase):
p = URLPattern('/<arg>') p = URLPattern('/<arg>')
self.assertEqual(p.match('/foo'), {'arg': 'foo'}) self.assertEqual(p.match('/foo'), {'arg': 'foo'})
self.assertIsNone(p.match('/')) self.assertIsNone(p.match('/'))
self.assertIsNone(p.match('//'))
self.assertIsNone(p.match('')) self.assertIsNone(p.match(''))
self.assertIsNone(p.match('foo/')) self.assertIsNone(p.match('foo/'))
self.assertIsNone(p.match('/foo/')) self.assertIsNone(p.match('/foo/'))
self.assertIsNone(p.match('//foo/'))
self.assertIsNone(p.match('/foo//'))
self.assertIsNone(p.match('/foo/bar')) self.assertIsNone(p.match('/foo/bar'))
self.assertIsNone(p.match('/foo//bar'))
p = URLPattern('/<arg>/') p = URLPattern('/<arg>/')
self.assertEqual(p.match('/foo/'), {'arg': 'foo'}) self.assertEqual(p.match('/foo/'), {'arg': 'foo'})
@@ -64,6 +68,8 @@ class TestURLPattern(unittest.TestCase):
def test_int_argument(self): def test_int_argument(self):
p = URLPattern('/users/<int:id>') p = URLPattern('/users/<int:id>')
self.assertEqual(p.match('/users/123'), {'id': 123}) self.assertEqual(p.match('/users/123'), {'id': 123})
self.assertEqual(p.match('/users/-123'), {'id': -123})
self.assertEqual(p.match('/users/0'), {'id': 0})
self.assertIsNone(p.match('/users/')) self.assertIsNone(p.match('/users/'))
self.assertIsNone(p.match('/users/abc')) self.assertIsNone(p.match('/users/abc'))
self.assertIsNone(p.match('/users/123abc')) self.assertIsNone(p.match('/users/123abc'))