-
-
Notifications
You must be signed in to change notification settings - Fork 18.4k
TYP: enforce tighter inputs on SingleBlockManager #33092
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
Merged
Merged
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
38f7e4e
TYP: enforce tighter inputs on SingleBlockManager
jbrockmendel b241365
update per comments
jbrockmendel ad81ae3
Merge branch 'master' of https://github.com/pandas-dev/pandas into ty…
jbrockmendel bf0479e
Merge branch 'master' of https://github.com/pandas-dev/pandas into ty…
jbrockmendel 6e89f10
Deprecated fastpath
jbrockmendel 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
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -1515,25 +1515,14 @@ class SingleBlockManager(BlockManager): | |
def __init__( | ||
self, | ||
block: Block, | ||
axis: Union[Index, List[Index]], | ||
axis: Index, | ||
do_integrity_check: bool = False, | ||
fastpath: bool = False, | ||
): | ||
assert isinstance(block, Block), type(block) | ||
assert isinstance(axis, Index), type(axis) | ||
|
||
if isinstance(axis, list): | ||
if len(axis) != 1: | ||
raise ValueError( | ||
"cannot create SingleBlockManager with more than 1 axis" | ||
) | ||
axis = axis[0] | ||
|
||
# passed from constructor, single block, single axis | ||
if fastpath: | ||
self.axes = [axis] | ||
else: | ||
self.axes = [ensure_index(axis)] | ||
|
||
self.axes = [axis] | ||
self.blocks = tuple([block]) | ||
|
||
@classmethod | ||
|
@@ -1633,7 +1622,9 @@ def fast_xs(self, loc): | |
""" | ||
raise NotImplementedError("Use series._values[loc] instead") | ||
|
||
def concat(self, to_concat, new_axis: Index) -> "SingleBlockManager": | ||
def concat( | ||
self, to_concat: List["SingleBlockManager"], new_axis: Index | ||
) -> "SingleBlockManager": | ||
""" | ||
Concatenate a list of SingleBlockManagers into a single | ||
SingleBlockManager. | ||
|
@@ -1649,6 +1640,7 @@ def concat(self, to_concat, new_axis: Index) -> "SingleBlockManager": | |
------- | ||
SingleBlockManager | ||
""" | ||
assert isinstance(new_axis, Index), new_axis | ||
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. this is already asserted in the SingleBlockManager constructor, so is not needed here? |
||
non_empties = [x for x in to_concat if len(x) > 0] | ||
|
||
# check if all series are of the same block type: | ||
|
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
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.
fastpath
has no effect anymore, now? It is still being used in places internally?