-
-
Notifications
You must be signed in to change notification settings - Fork 18.1k
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
TYP: Type hints & assert statements #42044
Closed
Closed
Changes from all commits
Commits
Show all changes
9 commits
Select commit
Hold shift + click to select a range
952283c
Replace assert statements with argument validation
rgkimball 6a3efb9
rebase to master
rgkimball bca799d
Fix line length guidance for value check error messages
rgkimball 1270474
rebase to master
rgkimball ae6f764
Adds None default for dtype argument
rgkimball 346210f
Move Literal import out of type checking block
rgkimball d051c48
Addresses flake8 issues
rgkimball 4e51736
Merge branch 'pandas-dev:master' into type_hinting
rgkimball 2a9cb77
Merge branch 'pandas-dev:master' into type_hinting
rgkimball 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 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 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 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 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 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 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 |
---|---|---|
|
@@ -5691,7 +5691,9 @@ def _validate_indexer(self, form: str_t, key, kind: str_t): | |
if key is not None and not is_integer(key): | ||
raise self._invalid_indexer(form, key) | ||
|
||
def _maybe_cast_slice_bound(self, label, side: str_t, kind=no_default): | ||
def _maybe_cast_slice_bound( | ||
self, label, side: str_t, kind: Literal["loc", "getitem"] = no_default | ||
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. i think needs to be amended to include no_default? |
||
): | ||
""" | ||
This function should be overloaded in subclasses that allow non-trivial | ||
casting on label-slice bounds, e.g. datetime-like indices allowing | ||
|
@@ -5755,7 +5757,10 @@ def get_slice_bound(self, label, side: str_t, kind=None) -> int: | |
int | ||
Index of label. | ||
""" | ||
assert kind in ["loc", "getitem", None] | ||
if kind not in ["loc", "getitem", None]: | ||
raise ValueError( | ||
"Value for kind argument must be one of: loc, getitem or None" | ||
) | ||
|
||
if side not in ("left", "right"): | ||
raise ValueError( | ||
|
This file contains 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 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 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 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 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
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.
sure about this?
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.
Per
_MergeOperation
you can optionally supply a string as the column name, otherwise the indicator is given a default name:pandas/pandas/core/reshape/merge.py
Lines 655 to 658 in f68092a
Maybe I missed this, but is there a "valid column name" definition that would be more specific than
str
?