Skip to content

Commit 0cb0452

Browse files
committed
Drop IPython<4.0 compat
1 parent b9f2e2b commit 0cb0452

File tree

2 files changed

+0
-48
lines changed

2 files changed

+0
-48
lines changed

pandas/core/frame.py

-10
Original file line numberDiff line numberDiff line change
@@ -640,16 +640,6 @@ def _repr_html_(self):
640640
641641
Mainly for IPython notebook.
642642
"""
643-
# qtconsole doesn't report its line width, and also
644-
# behaves badly when outputting an HTML table
645-
# that doesn't fit the window, so disable it.
646-
# XXX: In IPython 3.x and above, the Qt console will not attempt to
647-
# display HTML, so this check can be removed when support for
648-
# IPython 2.x is no longer needed.
649-
if console.in_qtconsole():
650-
# 'HTML output is disabled in QtConsole'
651-
return None
652-
653643
if self._info_repr():
654644
buf = StringIO(u(""))
655645
self.info(buf=buf)

pandas/io/formats/console.py

-38
Original file line numberDiff line numberDiff line change
@@ -108,44 +108,6 @@ def check_main():
108108
return check_main()
109109

110110

111-
def in_qtconsole():
112-
"""
113-
check if we're inside an IPython qtconsole
114-
115-
.. deprecated:: 0.14.1
116-
This is no longer needed, or working, in IPython 3 and above.
117-
"""
118-
try:
119-
ip = get_ipython() # noqa
120-
front_end = (
121-
ip.config.get('KernelApp', {}).get('parent_appname', "") or
122-
ip.config.get('IPKernelApp', {}).get('parent_appname', ""))
123-
if 'qtconsole' in front_end.lower():
124-
return True
125-
except NameError:
126-
return False
127-
return False
128-
129-
130-
def in_ipnb():
131-
"""
132-
check if we're inside an IPython Notebook
133-
134-
.. deprecated:: 0.14.1
135-
This is no longer needed, or working, in IPython 3 and above.
136-
"""
137-
try:
138-
ip = get_ipython() # noqa
139-
front_end = (
140-
ip.config.get('KernelApp', {}).get('parent_appname', "") or
141-
ip.config.get('IPKernelApp', {}).get('parent_appname', ""))
142-
if 'notebook' in front_end.lower():
143-
return True
144-
except NameError:
145-
return False
146-
return False
147-
148-
149111
def in_ipython_frontend():
150112
"""
151113
check if we're inside an an IPython zmq frontend

0 commit comments

Comments
 (0)