Skip to content

Commit 49f1bf7

Browse files
author
y-p
committed
ENH: let display.notebook_repr_html control HTML repr in qtconsole again.
Where it belongs. #2275 (comment) It'll probably never happen that QTconsole will report it's width, let alone in characters (variable-width font and all). Best let the user decide.
1 parent 7c59e57 commit 49f1bf7

File tree

2 files changed

+2
-3
lines changed

2 files changed

+2
-3
lines changed

RELEASE.rst

+2-1
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,8 @@ pandas 0.11.0
173173
when invalid shapes are passed
174174
- Don't suppress TypeError in GroupBy.agg (GH3238_)
175175
- Methods return None when inplace=True (GH1893_)
176-
176+
- HTML repr output for dataframs is once again controlled by the option
177+
`display.notebook_repr_html`, and on by default.
177178
- ``HDFStore``
178179

179180
- added the method ``select_column`` to select a single column from a table as a Series.

pandas/core/frame.py

-2
Original file line numberDiff line numberDiff line change
@@ -726,8 +726,6 @@ def _repr_html_(self):
726726
Return a html representation for a particular DataFrame.
727727
Mainly for IPython notebook.
728728
"""
729-
if com.in_qtconsole():
730-
raise ValueError('Disable HTML output in QtConsole')
731729

732730
if get_option("display.notebook_repr_html"):
733731
fits_vertical = self._repr_fits_vertical_()

0 commit comments

Comments
 (0)