BUG: Ensure df.itertuples() uses plain tuples correctly #30600
Merged
Conversation
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
simongibbons
commented
Jan 1, 2020
pandas/tests/frame/test_api.py
Outdated
|
|
||
| # Dataframes with >=255 columns will fallback to regular tuples | ||
| with pytest.raises(AttributeError): | ||
| result_255_columns.foo_1 |
There was a problem hiding this comment.
Because namedtuple generates a new class when it is used, the only way of determining if something is a namedtuple or a plain one is to try and use it as such.
Hopefully you think this is sufficiently clear with the comment.
jreback
requested changes
Jan 1, 2020
pandas/core/frame.py
Outdated
| @@ -1018,8 +1018,8 @@ def itertuples(self, index=True, name="Pandas"): | |||
| # use integer indexing because of possible duplicate column names | |||
| arrays.extend(self.iloc[:, k] for k in range(len(self.columns))) | |||
|
|
|||
| # Python 3 supports at most 255 arguments to constructor | |||
| if name is not None and len(self.columns) + index < 256: | |||
| # Python versions before 3.7 support at most 255 arguments to constructor | |||
There was a problem hiding this comment.
is it possible to skip the arg len check for >= 3.7? does it work?
There was a problem hiding this comment.
yes, this was simple to do.
pandas/tests/frame/test_api.py
Outdated
| @@ -288,6 +288,22 @@ def test_sequence_like_with_categorical(self): | |||
| for c, col in df.items(): | |||
| str(s) | |||
|
|
|||
| def test_itertuples_fallback_to_regular_tuples(self): | |||
There was a problem hiding this comment.
can you move this next to the other itertuples tests
Currently DataFrame.itertuples() has an off by one error when it inspects whether or not it should return namedtuples or plain tuples in it's response. This PR addresses that bug by correcting the condition that is used when making the check. Closes: pandas-dev#28282
simongibbons
force-pushed
the
fix-28282
branch
from
730b22f to
187196a
Compare
simongibbons
force-pushed
the
fix-28282
branch
from
f6ddc89 to
6de8beb
Compare
1. Ensure we return named tuples in more cases (when using python >= 3.7) 2. Move test around to be with the itertuples test 3. Update docstring with the new behaviour.
simongibbons
force-pushed
the
fix-28282
branch
from
6de8beb to
64b381d
Compare
simongibbons
commented
Jan 1, 2020
| assert isinstance(tup3, tuple) | ||
| if PY37: | ||
| assert hasattr(tup3, "_fields") |
There was a problem hiding this comment.
This test has changed as we will return named tuples always for python >= 3.7 now.
jreback
approved these changes
Jan 2, 2020
|
thanks @simongibbons very nice! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Currently DataFrame.itertuples() has an off by one error
when it inspects whether or not it should return namedtuples
or plain tuples in it's response.
This PR addresses that bug by correcting the condition
that is used when making the check.
Closes: #28282
black pandasgit diff upstream/master -u -- "*.py" | flake8 --diff