Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Apply right name to Route when created from methods #1553

Merged
merged 13 commits into from Apr 8, 2022
Merged

Apply right name to Route when created from methods #1553

Show file tree
Hide file tree
Changes from 12 commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
2ba3353
add support to read route names from methods
Mar 25, 2022
ea4bffc
Merge branch 'master' into method-route-naming
Kludex Mar 27, 2022
c269b22
simplify implementation
Mar 28, 2022
c282914
Merge remote-tracking branch 'origin/method-route-naming' into method…
Mar 28, 2022
a04485d
Merge branch 'master' into method-route-naming
flxdot Mar 28, 2022
0a681dc
Merge branch 'master' into method-route-naming
flxdot Apr 5, 2022
b8ffc22
Merge branch 'master' into method-route-naming
Kludex Apr 7, 2022
9831f62
add tests for automatic route naming
Apr 8, 2022
4d2dc29
simplify tests
Apr 8, 2022
a0655d6
Apply suggestions from code review
Kludex Apr 8, 2022
2635947
Update tests/test_routing.py
Kludex Apr 8, 2022
64c6f6c
format with black
Apr 8, 2022
cc99f1f
Apply suggestions from code review
Kludex Apr 8, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion starlette/routing.py
View file
Open in desktop
Expand Up @@ -84,7 +84,7 @@ async def app(scope: Scope, receive: Receive, send: Send) -> None:


def get_name(endpoint: typing.Callable) -> str:
if inspect.isfunction(endpoint) or inspect.isclass(endpoint):
if inspect.isroutine(endpoint) or inspect.isclass(endpoint):
Copy link
Sponsor Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Does the behavior of lambda changes now?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No:

import inspect
my_lambda = lambda: 1
assert inspect.isfunction(my_lambda) == inspect.isroutine(my_lambda)

return endpoint.__name__
return endpoint.__class__.__name__

Expand Down
36 changes: 36 additions & 0 deletions tests/test_routing.py
View file
Open in desktop
@@ -1,4 +1,5 @@
import functools
import typing
import uuid

import pytest
Expand Down Expand Up @@ -710,3 +711,38 @@ def test_duplicated_param_names():
match="Duplicated param names id, name at path /{id}/{name}/{id}/{name}",
):
Route("/{id}/{name}/{id}/{name}", user)


class Endpoint:
async def my_method(self, request):
...
Kludex marked this conversation as resolved.
Show resolved Hide resolved

@classmethod
async def my_classmethod(cls, request):
...
Kludex marked this conversation as resolved.
Show resolved Hide resolved

@staticmethod
async def my_staticmethod(request):
...
Kludex marked this conversation as resolved.
Show resolved Hide resolved

def __call__(self, request):
...
Kludex marked this conversation as resolved.
Show resolved Hide resolved


@pytest.mark.parametrize(
"endpoint, expected_name",
[
pytest.param(func_homepage, "func_homepage", id="function"),
pytest.param(Endpoint().my_method, "my_method", id="method"),
pytest.param(Endpoint.my_classmethod, "my_classmethod", id="classmethod"),
pytest.param(
Endpoint.my_staticmethod,
"my_staticmethod",
id="staticmethod",
),
pytest.param(Endpoint(), "Endpoint", id="object"),
pytest.param(lambda request: ..., "<lambda>", id="lambda"),
],
)
def test_route_name(endpoint: typing.Callable, expected_name: str):
assert Route(path="/", endpoint=endpoint).name == expected_name