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

Added route value to scope #804

Closed
wants to merge 4 commits into from
Closed

Added route value to scope #804

Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6b7d2d5
Added route value to scope
victoraugustolls Jan 16, 2020
5dc3170
Added matched routes to scope
victoraugustolls Jan 29, 2020
61f0f72
Updating routing format
victoraugustolls Feb 24, 2020
fd359c1
Merge branch 'master' into feature/route_value
victoraugustolls Sep 4, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion starlette/routing.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,7 +196,10 @@ def matches(self, scope: Scope) -> typing.Tuple[Match, Scope]:
matched_params[key] = self.param_convertors[key].convert(value)
path_params = dict(scope.get("path_params", {}))
path_params.update(matched_params)
child_scope = {"endpoint": self.endpoint, "path_params": path_params}
child_scope = {
"endpoint": self.endpoint,
"path_params": path_params,
}
if self.methods and scope["method"] not in self.methods:
return Match.PARTIAL, child_scope
else:
Expand Down Expand Up @@ -541,17 +544,20 @@ async def __call__(self, scope: Scope, receive: Receive, send: Send) -> None:

partial = None

scope["routes"] = {"full": None, "partial": []}
victoraugustolls marked this conversation as resolved.
Show resolved Hide resolved
for route in self.routes:
# Determine if any route matches the incoming scope,
# and hand over to the matching route if found.
match, child_scope = route.matches(scope)
if match == Match.FULL:
scope.update(child_scope)
scope["routes"]["full"] = route
await route.handle(scope, receive, send)
return
elif match == Match.PARTIAL and partial is None:
partial = route
partial_scope = child_scope
scope["routes"]["partial"].append(route)

if partial is not None:
#  Handle partial matches. These are cases where an endpoint is
Expand Down