Skip to content

BUG/TST: Allow generators in DataFrame.from_records #4911

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 1 commit into from
Oct 4, 2013
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions doc/source/release.rst
Original file line number Diff line number Diff line change
Expand Up @@ -169,6 +169,7 @@ Improvements to existing features
high-dimensional arrays).
- :func:`~pandas.read_html` now supports the ``parse_dates``,
``tupleize_cols`` and ``thousands`` parameters (:issue:`4770`).
- ``DataFrame.from_records()`` accept generators (:issue:`4910`)

API Changes
~~~~~~~~~~~
Expand Down
17 changes: 11 additions & 6 deletions pandas/core/frame.py
Original file line number Diff line number Diff line change
Expand Up @@ -724,12 +724,17 @@ def from_records(cls, data, index=None, exclude=None, columns=None,

values = [first_row]

i = 1
for row in data:
values.append(row)
i += 1
if i >= nrows:
break
#if unknown length iterable (generator)
if nrows == None:
#consume whole generator
values += list(data)
else:
i = 1
for row in data:
values.append(row)
i += 1
if i >= nrows:
break

if dtype is not None:
data = np.array(values, dtype=dtype)
Expand Down
30 changes: 30 additions & 0 deletions pandas/tests/test_frame.py
Original file line number Diff line number Diff line change
Expand Up @@ -3739,6 +3739,36 @@ def test_from_records_iterator(self):
nrows=2)
assert_frame_equal(df, xp.reindex(columns=['x','y']), check_dtype=False)

def test_from_records_tuples_generator(self):
def tuple_generator(length):
for i in range(length):
letters = 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'
yield (i, letters[i % len(letters)], i/length)

columns_names = ['Integer', 'String', 'Float']
columns = [[i[j] for i in tuple_generator(10)] for j in range(len(columns_names))]
data = {'Integer': columns[0], 'String': columns[1], 'Float': columns[2]}
expected = DataFrame(data, columns=columns_names)

generator = tuple_generator(10)
result = DataFrame.from_records(generator, columns=columns_names)
assert_frame_equal(result, expected)

def test_from_records_lists_generator(self):
def list_generator(length):
for i in range(length):
letters = 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'
yield [i, letters[i % len(letters)], i/length]

columns_names = ['Integer', 'String', 'Float']
columns = [[i[j] for i in list_generator(10)] for j in range(len(columns_names))]
data = {'Integer': columns[0], 'String': columns[1], 'Float': columns[2]}
expected = DataFrame(data, columns=columns_names)

generator = list_generator(10)
result = DataFrame.from_records(generator, columns=columns_names)
assert_frame_equal(result, expected)

def test_from_records_columns_not_modified(self):
tuples = [(1, 2, 3),
(1, 2, 3),
Expand Down