-
-
Notifications
You must be signed in to change notification settings - Fork 2k
[Flask-Cors] Update type annotation for origins to also allow Pattern #15825
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.
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
Open
wvanbergen
wants to merge
2
commits into
python:main
Choose a base branch
from
wvanbergen:wvanbergen/Flask-Cors
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+4
−3
Open
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
| @@ -1,6 +1,7 @@ | ||||||
| from collections.abc import Callable, Iterable | ||||||
| from datetime import timedelta | ||||||
| from logging import Logger | ||||||
| from re import Pattern | ||||||
| from typing import Any | ||||||
|
|
||||||
| import flask | ||||||
|
|
@@ -13,7 +14,7 @@ class CORS: | |||||
| app: flask.Flask | flask.Blueprint | None = None, | ||||||
| *, | ||||||
| resources: dict[str, dict[str, Any]] | list[str] | str | None = ..., | ||||||
| origins: str | list[str] | None = ..., | ||||||
| origins: str | Pattern[str] | Iterable[str | Pattern[str]] | None = ..., | ||||||
|
Collaborator
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Per above, it doesn't appear that passing
Suggested change
|
||||||
| methods: str | list[str] | None = ..., | ||||||
| expose_headers: str | list[str] | None = ..., | ||||||
| allow_headers: str | list[str] | None = ..., | ||||||
|
|
@@ -28,7 +29,7 @@ class CORS: | |||||
| app: flask.Flask, | ||||||
| *, | ||||||
| resources: dict[str, dict[str, Any]] | list[str] | str = ..., | ||||||
| origins: str | list[str] = ..., | ||||||
| origins: str | Pattern[str] | Iterable[str | Pattern[str]] = ..., | ||||||
| methods: str | list[str] = ..., | ||||||
| expose_headers: str | list[str] = ..., | ||||||
| allow_headers: str | list[str] = ..., | ||||||
|
|
||||||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Unless I'm missing something, it appears that these function assume that the options have already been processed with
serialize_options, which wraps a single string or pattern object in a list to ensure thatoriginsis iterable. They'll raise aTypeErrorif you attempt to use a plain pattern object.It also doesn't appear that
None(or[None]) is a valid value (will also raise aTypeError). I'm guessing that that was added since the options are accessed withoptions.get(...), which suggests thatNonecould be returned. But in actuality the options dict is pre-populated with the values fromDEFAULT_OPTIONS, which sets non-Nonedefaults, so I don't think aNonevalue is ever valid?A few examples of what I'm talking about:
Does that match your experience?
The same appears to be true for
allow_headers, so I'd suggest using the same type for it. It also appears that some of the other options can't beNonein practice -- up to you if you want to try to fix those while we're here.