Mercurial Repositories > eric / file diff

--- a/Helpviewer/HelpBrowserWV.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Helpviewer/HelpBrowserWV.py	Mon Mar 25 03:11:06 2013 +0100
@@ -8,6 +8,12 @@
 Module implementing the helpbrowser using QWebView.
 """
 
+from __future__ import unicode_literals    # __IGNORE_WARNING__
+try:
+    str = unicode
+except (NameError):
+    pass
+
 from PyQt4.QtCore import pyqtSlot, pyqtSignal, QObject, QT_TRANSLATE_NOOP, QUrl, \
     QBuffer, QIODevice, QFileInfo, Qt, QTimer, QEvent, QRect, QFile, QPoint, \
     QByteArray, qVersion
@@ -47,7 +53,7 @@
         @param mw reference to the main window 8HelpWindow)
         @param parent reference to the parent object (QObject)
         """
-        super().__init__(parent)
+        super(JavaScriptExternalObject, self).__init__(parent)
         
         self.__mw = mw
     
@@ -96,7 +102,7 @@
         @param mw reference to the main window 8HelpWindow)
         @param parent reference to the parent object (QObject)
         """
-        super().__init__(parent)
+        super(JavaScriptEricObject, self).__init__(parent)
         
         self.__mw = mw
     
@@ -154,7 +160,7 @@
         
         @param parent parent widget of this window (QWidget)
         """
-        super().__init__(parent)
+        super(HelpWebPage, self).__init__(parent)
         
         self.setPluginFactory(self.webPluginFactory())
         
@@ -260,7 +266,7 @@
             info = sip.cast(option, QWebPage.ChooseMultipleFilesExtensionOption)
             files = sip.cast(output, QWebPage.ChooseMultipleFilesExtensionReturn)
             if info is None or files is None:
-                return super().extension(extension, option, output)
+                return super(HelpWebPage, self).extension(extension, option, output)
             
             suggestedFileName = ""
             if info.suggestedFileNames:
@@ -562,9 +568,9 @@
             # the interesting mouse-out behavior like invalidating scrollbars.
             fakeEvent = QMouseEvent(QEvent.MouseMove, QPoint(0, -1),
                                     Qt.NoButton, Qt.NoButton, Qt.NoModifier)
-            return super().event(fakeEvent)
+            return super(HelpWebPage, self).event(fakeEvent)
         
-        return super().event(evt)
+        return super(HelpWebPage, self).event(evt)
 
 ##########################################################################################
 
@@ -605,7 +611,7 @@
         @param parent parent widget of this window (QWidget)
         @param name name of this window (string)
         """
-        super().__init__(parent)
+        super(HelpBrowser, self).__init__(parent)
         self.setObjectName(name)
         self.setWhatsThis(self.trUtf8(
                 """<b>Help Window</b>"""
@@ -1523,7 +1529,7 @@
                     evt.acceptProposedAction()
         
         if not evt.isAccepted():
-            super().dragMoveEvent(evt)
+            super(HelpBrowser, self).dragMoveEvent(evt)
     
     def dropEvent(self, evt):
         """
@@ -1531,7 +1537,7 @@
         
         @param evt reference to the drop event (QDropEvent)
         """
-        super().dropEvent(evt)
+        super(HelpBrowser, self).dropEvent(evt)
         if not evt.isAccepted() and \
            evt.source() != self and \
            evt.possibleActions() & Qt.CopyAction:
@@ -1558,7 +1564,7 @@
         elif evt.button() == Qt.XButton2:
             self.pageAction(QWebPage.Forward).trigger()
         else:
-            super().mousePressEvent(evt)
+            super(HelpBrowser, self).mousePressEvent(evt)
     
     def mouseReleaseEvent(self, evt):
         """
@@ -1601,7 +1607,7 @@
             evt.accept()
             return
         
-        super().wheelEvent(evt)
+        super(HelpBrowser, self).wheelEvent(evt)
     
     def keyPressEvent(self, evt):
         """
@@ -1626,7 +1632,7 @@
                 QTimer.singleShot(300, self.__accessKeyShortcut)
         
         self.ctrlPressed = (evt.key() == Qt.Key_Control)
-        super().keyPressEvent(evt)
+        super(HelpBrowser, self).keyPressEvent(evt)
     
     def keyReleaseEvent(self, evt):
         """
@@ -1638,7 +1644,7 @@
             self.__accessKeysPressed = evt.key() == Qt.Key_Control
         
         self.ctrlPressed = False
-        super().keyReleaseEvent(evt)
+        super(HelpBrowser, self).keyReleaseEvent(evt)
     
     def focusOutEvent(self, evt):
         """
@@ -1650,7 +1656,7 @@
             self.__hideAccessKeys()
             self.__accessKeysPressed = False
         
-        super().focusOutEvent(evt)
+        super(HelpBrowser, self).focusOutEvent(evt)
     
     def event(self, evt):
         """
@@ -1663,7 +1669,7 @@
             self.gestureEvent(evt)
             return True
         
-        return super().event(evt)
+        return super(HelpBrowser, self).event(evt)
     
     def gestureEvent(self, evt):
         """