Yet more PySide compatibility fixes.

IPython/frontend/qt/console/call_tip_widget.py

@@ -100,7 +100,7 class CallTipWidget(QtGui.QLabel):
         """
         painter = QtGui.QStylePainter(self)
         option = QtGui.QStyleOptionFrame()
-        option.init(self)
+        option.initFrom(self)
         painter.drawPrimitive(QtGui.QStyle.PE_PanelTipLabel, option)
         painter.end()
 

IPython/frontend/qt/console/ipython_widget.py

@@ -335,7 +335,7 class IPythonWidget(FrontendWidget):
             block = self._previous_prompt_obj.block
 
             # Make sure the prompt block has not been erased.
-            if block.isValid() and not block.text().isEmpty():
+            if block.isValid() and block.text():
 
                 # Remove the old prompt and insert a new prompt.
                 cursor = QtGui.QTextCursor(block)

IPython/frontend/qt/console/rich_ipython_widget.py

@@ -43,9 +43,7 class RichIPythonWidget(IPythonWidget):
         """
         format = self._control.cursorForPosition(pos).charFormat()
         name = format.stringProperty(QtGui.QTextFormat.ImageName)
-        if name.isEmpty():
-            menu = super(RichIPythonWidget, self)._context_menu_make(pos)
-        else:
+        if name:
             menu = QtGui.QMenu()
 
             menu.addAction('Copy Image', lambda: self._copy_image(name))
@@ -53,11 +51,13 class RichIPythonWidget(IPythonWidget):
             menu.addSeparator()
 
             svg = format.stringProperty(self._svg_text_format_property)
-            if not svg.isEmpty():
+            if svg:
                 menu.addSeparator()
                 menu.addAction('Copy SVG', lambda: svg_to_clipboard(svg))
                 menu.addAction('Save SVG As...', 
                                lambda: save_svg(svg, self._control))
+        else:
+            menu = super(RichIPythonWidget, self)._context_menu_make(pos)
         return menu
 
     #---------------------------------------------------------------------------

IPython/frontend/qt/kernelmanager.py

@@ -102,7 +102,7 class QtSubSocketChannel(SocketChannelQObject, SubSocketChannel):
     pyerr_received = QtCore.Signal(object)
 
     # Emitted when a message of type 'display_data' is received
-    display_data_received = QtCore.pyqtSignal(object)
+    display_data_received = QtCore.Signal(object)
 
     # Emitted when a crash report message is received from the kernel's
     # last-resort sys.excepthook.