Apply right name to Route when created from methods

starlette/routing.py

@@ -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):
         return endpoint.__name__
     return endpoint.__class__.__name__
 

tests/test_routing.py

@@ -1,11 +1,20 @@
 import functools
 import uuid
+import typing
 
 import pytest
 
 from starlette.applications import Starlette
 from starlette.responses import JSONResponse, PlainTextResponse, Response
-from starlette.routing import Host, Mount, NoMatchFound, Route, Router, WebSocketRoute
+from starlette.routing import (
+    get_name,
+    Host,
+    Mount,
+    NoMatchFound,
+    Route,
+    Router,
+    WebSocketRoute,
+)
 from starlette.websockets import WebSocket, WebSocketDisconnect
 
 
@@ -710,3 +719,54 @@ def test_duplicated_param_names():
         match="Duplicated param names id, name at path /{id}/{name}/{id}/{name}",
     ):
         Route("/{id}/{name}/{id}/{name}", user)
+
+
+class EndpointCollectionObject:
+    async def my_method(self, request):
+        return JSONResponse({"endpoint_type": "method"})
+
+    @classmethod
+    async def my_classmethod(self, request):
+        return JSONResponse({"endpoint_type": "classmethod"})
+
+    @staticmethod
+    async def my_staticmethod(self, request):
+        return JSONResponse({"endpoint_type": "staticmethod"})
+
+
+class EndpointObject:
+    def __call__(self, request):
+        return JSONResponse({"endpoint_type": "class"})
+
+
+@pytest.mark.parametrize(
+    "endpoint, expected_name",
+    [
+        pytest.param(func_homepage, "func_homepage", id="function"),
+        pytest.param(EndpointCollectionObject().my_method, "my_method", id="method"),
+        pytest.param(
+            EndpointCollectionObject.my_classmethod, "my_classmethod", id="classmethod"
+        ),
+        pytest.param(
+            EndpointCollectionObject.my_staticmethod,
+            "my_staticmethod",
+            id="staticmethod",
+        ),
+        pytest.param(EndpointObject, "EndpointObject", id="object"),
+        pytest.param(
+            lambda request: JSONResponse({"endpoint_type": "lambda"}),
+            "<lambda>",
+            id="lambda",
+        ),
+    ],
+)
+def test_route_name_automatic(endpoint: typing.Callable, expected_name: str):
+
+    # Path does not matter here, as we only care about how the route name is created.
+    assert Route(path="/", endpoint=endpoint).name == expected_name
+
+
+def test_route_name_manual():
+
+    name = "my_custom_endpoint"
+    assert Route(path="/", endpoint=func_homepage, name=name).name == name