From 8c28ce7d799fc711016223d1ef76468ef2570d08 Mon Sep 17 00:00:00 2001 From: r0fls Date: Mon, 1 Jan 2018 02:21:57 -0800 Subject: [PATCH] fix strict_slashes bug when route has slash --- sanic/router.py | 6 +++++- tests/test_routes.py | 8 ++++---- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/sanic/router.py b/sanic/router.py index 2383b915..0d8305ef 100644 --- a/sanic/router.py +++ b/sanic/router.py @@ -129,18 +129,22 @@ class Router: # Add versions with and without trailing / slashed_methods = self.routes_all.get(uri + '/', frozenset({})) + unslashed_methods = self.routes_all.get(uri[:-1], frozenset({})) if isinstance(methods, Iterable): _slash_is_missing = all(method in slashed_methods for method in methods) + _without_slash_is_missing = all(method in unslashed_methods for + method in methods) else: _slash_is_missing = methods in slashed_methods + _without_slash_is_missing = methods in unslashed_methods slash_is_missing = ( not uri[-1] == '/' and not _slash_is_missing ) without_slash_is_missing = ( uri[-1] == '/' and not - self.routes_all.get(uri[:-1], False) and not + _without_slash_is_missing and not uri == '/' ) # add version with trailing slash diff --git a/tests/test_routes.py b/tests/test_routes.py index 162f5e70..fb47203f 100644 --- a/tests/test_routes.py +++ b/tests/test_routes.py @@ -141,16 +141,16 @@ def test_route_slashes_overload(): return text('OK') - request, response = app.test_client.get('/get') + request, response = app.test_client.get('/hello') assert response.text == 'OK' - request, response = app.test_client.get('/get/') + request, response = app.test_client.get('/hello/') assert response.text == 'OK' - request, response = app.test_client.post('/get') + request, response = app.test_client.post('/hello') assert response.text == 'OK' - request, response = app.test_client.post('/get/') + request, response = app.test_client.post('/hello/') assert response.text == 'OK' def test_route_optional_slash():