##// END OF EJS Templates
silence a PyQt4 warning message reported on IPython-user...
darren.dale -
Show More
@@ -4,7 +4,7 b''
4 All the matplotlib support code was co-developed with John Hunter,
4 All the matplotlib support code was co-developed with John Hunter,
5 matplotlib's author.
5 matplotlib's author.
6
6
7 $Id: Shell.py 3006 2008-02-01 18:00:26Z fperez $"""
7 $Id: Shell.py 3024 2008-02-07 15:34:42Z darren.dale $"""
8
8
9 #*****************************************************************************
9 #*****************************************************************************
10 # Copyright (C) 2001-2006 Fernando Perez <fperez@colorado.edu>
10 # Copyright (C) 2001-2006 Fernando Perez <fperez@colorado.edu>
@@ -982,6 +982,12 b' class IPShellQt4(IPThread):'
982
982
983 from PyQt4 import QtCore, QtGui
983 from PyQt4 import QtCore, QtGui
984
984
985 try:
986 # present in PyQt4-4.2.1 or later
987 QtCore.pyqtRemoveInputHook()
988 except AttributeError:
989 pass
990
985 if QtCore.PYQT_VERSION_STR == '4.3':
991 if QtCore.PYQT_VERSION_STR == '4.3':
986 warn('''PyQt4 version 4.3 detected.
992 warn('''PyQt4 version 4.3 detected.
987 If you experience repeated threading warnings, please update PyQt4.
993 If you experience repeated threading warnings, please update PyQt4.
@@ -1,3 +1,12 b''
1 2008-02-07 Darren Dale <darren.dale@cornell.edu>
2
3 * IPython/Shell.py: Call QtCore.pyqtRemoveInputHook() when creating
4 an IPShellQt4. PyQt4-4.2.1 and later uses PyOS_InputHook to improve
5 interaction in the interpreter (like Tkinter does), but it seems to
6 partially interfere with the IPython implementation and exec_()
7 still seems to block. So we disable the PyQt implementation and
8 stick with the IPython one for now.
9
1 2008-02-02 Walter Doerwald <walter@livinglogic.de>
10 2008-02-02 Walter Doerwald <walter@livinglogic.de>
2
11
3 * ipipe.py: A new ipipe table has been added: ialias produces all
12 * ipipe.py: A new ipipe table has been added: ialias produces all
General Comments 0
You need to be logged in to leave comments. Login now