Skip to content

Commit 99bf170

Browse files
Merge pull request pandas-dev#11280 from jorisvandenbossche/post0170
DOC: whatsnew fixes
2 parents 4ba1c14 + 22f638e commit 99bf170

File tree

2 files changed

+24
-12
lines changed

2 files changed

+24
-12
lines changed

doc/source/whatsnew/v0.12.0.txt

+23-11
Original file line numberDiff line numberDiff line change
@@ -191,7 +191,7 @@ I/O Enhancements
191191
df = DataFrame({'a': range(3), 'b': list('abc')})
192192
print(df)
193193
html = df.to_html()
194-
alist = pd.read_html(html, infer_types=True, index_col=0)
194+
alist = pd.read_html(html, index_col=0)
195195
print(df == alist[0])
196196

197197
Note that ``alist`` here is a Python ``list`` so ``pd.read_html()`` and
@@ -252,19 +252,31 @@ I/O Enhancements
252252
- Iterator support via ``read_hdf`` that automatically opens and closes the
253253
store when iteration is finished. This is only for *tables*
254254

255-
.. ipython:: python
256-
:okwarning:
255+
.. code-block:: python
257256

258-
path = 'store_iterator.h5'
259-
DataFrame(randn(10,2)).to_hdf(path,'df',table=True)
260-
for df in read_hdf(path,'df', chunksize=3):
261-
print(df)
257+
In [25]: path = 'store_iterator.h5'
258+
259+
In [26]: DataFrame(randn(10,2)).to_hdf(path,'df',table=True)
260+
261+
In [27]: for df in read_hdf(path,'df', chunksize=3):
262+
....: print df
263+
....:
264+
0 1
265+
0 0.713216 -0.778461
266+
1 -0.661062 0.862877
267+
2 0.344342 0.149565
268+
0 1
269+
3 -0.626968 -0.875772
270+
4 -0.930687 -0.218983
271+
5 0.949965 -0.442354
272+
0 1
273+
6 -0.402985 1.111358
274+
7 -0.241527 -0.670477
275+
8 0.049355 0.632633
276+
0 1
277+
9 -1.502767 -1.225492
262278

263-
.. ipython:: python
264-
:suppress:
265279

266-
import os
267-
os.remove(path)
268280

269281
- ``read_csv`` will now throw a more informative error message when a file
270282
contains no columns, e.g., all newline characters

doc/source/whatsnew/v0.17.0.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -517,7 +517,7 @@ Other enhancements
517517

518518
- Allow passing `kwargs` to the interpolation methods (:issue:`10378`).
519519

520-
- Improved error message when concatenating an empty iterable of ``Dataframe``s (:issue:`9157`)
520+
- Improved error message when concatenating an empty iterable of ``Dataframe`` objects (:issue:`9157`)
521521

522522
- ``pd.read_csv`` can now read bz2-compressed files incrementally, and the C parser can read bz2-compressed files from AWS S3 (:issue:`11070`, :issue:`11072`).
523523

0 commit comments

Comments
 (0)