Merge branch 'master' of https://github.com/tinproject/pandas into tinproject-master

Conflicts:
	doc/source/release.rst

Author: jreback

doc/source/release.rst

@@ -171,6 +171,7 @@ Improvements to existing features
     ``tupleize_cols`` and ``thousands`` parameters (:issue:`4770`).
   - :meth:`~pandas.io.json.json_normalize` is a new method to allow you to create a flat table
     from semi-structured JSON data. :ref:`See the docs<io.json_normalize>` (:issue:`1067`)
+  - ``DataFrame.from_records()`` will now accept generators (:issue:`4910`)
 
 API Changes
 ~~~~~~~~~~~

pandas/core/frame.py

@@ -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)

pandas/tests/test_frame.py

@@ -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),