eric: changeset 2525:8b507a9a2d40

--- a/Cooperation/ChatWidget.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Cooperation/ChatWidget.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing the chat dialog.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.QtCore import Qt, pyqtSlot, pyqtSignal, QDateTime, QPoint, QFileInfo
 from PyQt4.QtGui import QWidget, QColor, QListWidgetItem, QMenu, QApplication

@@ -53,7 +55,7 @@
         @param port port to be used for the cooperation server (integer)
         @param parent reference to the parent widget (QWidget)
         """
-        super().__init__(parent)
+        super(ChatWidget, self).__init__(parent)
         self.setupUi(self)

         self.shareButton.setIcon(
--- a/Cooperation/Connection.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Cooperation/Connection.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,12 @@
 Module implementing a class representing a peer connection.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+try:
+    str = unicode
+except (NameError):
+    pass
+
 from PyQt4.QtCore import pyqtSignal, QTimer, QTime, QByteArray
 from PyQt4.QtNetwork import QTcpSocket, QHostInfo

@@ -67,7 +73,7 @@

         @param parent referenec to the parent object (QObject)
         """
-        super().__init__(parent)
+        super(Connection, self).__init__(parent)

         self.__greetingMessage = self.trUtf8("undefined")
         self.__username = self.trUtf8("unknown")
--- a/Cooperation/CooperationClient.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Cooperation/CooperationClient.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing the client of the cooperation package.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 import collections

 from PyQt4.QtCore import QObject, pyqtSignal, QProcess, QRegExp
@@ -44,7 +46,7 @@

         @param parent reference to the parent object (QObject)
         """
-        super().__init__(parent)
+        super(CooperationClient, self).__init__(parent)

         self.__chatWidget = parent
--- a/Cooperation/CooperationServer.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Cooperation/CooperationServer.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing the cooperation server.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.QtCore import pyqtSignal
 from PyQt4.QtNetwork import QTcpServer

@@ -31,7 +33,7 @@
         @param address address the server should listen on (QHostAddress)
         @param parent reference to the parent object (QObject)
         """
-        super().__init__(parent)
+        super(CooperationServer, self).__init__(parent)

         self.__address = address
--- a/DataViews/CodeMetrics.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/DataViews/CodeMetrics.py	Mon Mar 25 03:11:06 2013 +0100
@@ -14,6 +14,8 @@
 @exception ValueError the tokenize module is too old
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 import os
 import io
 import keyword
--- a/DataViews/CodeMetricsDialog.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/DataViews/CodeMetricsDialog.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing a code metrics dialog.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 import os
 import fnmatch

@@ -30,7 +32,7 @@

         @param parent parent widget (QWidget)
         """
-        super().__init__(parent)
+        super(CodeMetricsDialog, self).__init__(parent)
         self.setupUi(self)

         self.buttonBox.button(QDialogButtonBox.Close).setEnabled(False)
--- a/DataViews/PyCoverageDialog.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/DataViews/PyCoverageDialog.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing a Python code coverage dialog.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 import os

 from PyQt4.QtCore import pyqtSlot, Qt
@@ -31,7 +33,7 @@

         @param parent parent widget (QWidget)
         """
-        super().__init__(parent)
+        super(PyCoverageDialog, self).__init__(parent)
         self.setupUi(self)

         self.buttonBox.button(QDialogButtonBox.Close).setEnabled(False)
--- a/DataViews/PyProfileDialog.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/DataViews/PyProfileDialog.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing a dialog to display profile data.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 import os
 import pickle

@@ -58,7 +60,7 @@

         @param parent parent widget (QWidget)
         """
-        super().__init__(parent)
+        super(PyProfileDialog, self).__init__(parent)
         self.setupUi(self)

         self.buttonBox.button(QDialogButtonBox.Close).setEnabled(False)
--- a/Debugger/BreakPointModel.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Debugger/BreakPointModel.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing the Breakpoint model.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.QtCore import pyqtSignal, Qt, QAbstractItemModel, QModelIndex


@@ -22,7 +24,7 @@

         @param reference to the parent widget (QObject)
         """
-        super().__init__(parent)
+        super(BreakPointModel, self).__init__(parent)

         self.breakpoints = []
         self.header = [
--- a/Debugger/BreakPointViewer.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Debugger/BreakPointViewer.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing the Breakpoint viewer widget.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.QtCore import pyqtSignal, Qt, qVersion
 from PyQt4.QtGui import QTreeView, QAbstractItemView, QSortFilterProxyModel, \
     QHeaderView, QItemSelectionModel, QMenu, QDialog
@@ -31,7 +33,7 @@

         @param parent the parent (QWidget)
         """
-        super().__init__(parent)
+        super(BreakPointViewer, self).__init__(parent)
         self.setObjectName("BreakPointViewer")

         self.__model = None
@@ -65,7 +67,7 @@
         self.sortingModel = QSortFilterProxyModel()
         self.sortingModel.setDynamicSortFilter(True)
         self.sortingModel.setSourceModel(self.__model)
-        super().setModel(self.sortingModel)
+        super(BreakPointViewer, self).setModel(self.sortingModel)

         header = self.header()
         header.setSortIndicator(0, Qt.AscendingOrder)
--- a/Debugger/CallTraceViewer.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Debugger/CallTraceViewer.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing the Call Trace viewer widget.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.QtCore import pyqtSlot, pyqtSignal, Qt, QRegExp, QFileInfo
 from PyQt4.QtGui import QWidget,  QTreeWidgetItem

@@ -34,7 +36,7 @@

         @param parent reference to the parent widget (QWidget)
         """
-        super().__init__(parent)
+        super(CallTraceViewer, self).__init__(parent)
         self.setupUi(self)

         self.__dbs = debugServer
--- a/Debugger/Config.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Debugger/Config.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module defining the different Python types and their display strings.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 try:
     from PyQt4.QtCore import QT_TRANSLATE_NOOP
--- a/Debugger/DebugProtocol.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Debugger/DebugProtocol.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module defining the debug protocol tokens.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 # The protocol "words".
 RequestOK = '>OK?<'
 RequestEnv = '>Environment<'
--- a/Debugger/DebugServer.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Debugger/DebugServer.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,12 @@
 Module implementing the debug server.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+try:
+    str = unicode
+except (NameError):
+    pass
+
 import os

 from PyQt4.QtCore import pyqtSignal, QModelIndex
@@ -137,7 +143,7 @@
         """
         Constructor
         """
-        super().__init__()
+        super(DebugServer, self).__init__()

         # create our models
         self.breakpointModel = BreakPointModel(self)
--- a/Debugger/DebugUI.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Debugger/DebugUI.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing the debugger UI.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 import os

 from PyQt4.QtCore import pyqtSignal, QObject, Qt
@@ -60,7 +62,7 @@
         @param debugViewer reference to the debug viewer widget
         @param project reference to the project object
         """
-        super().__init__(ui)
+        super(DebugUI, self).__init__(ui)

         self.ui = ui
         self.viewmanager = vm
--- a/Debugger/DebugViewer.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Debugger/DebugViewer.py	Mon Mar 25 03:11:06 2013 +0100
@@ -20,6 +20,8 @@
 </ul>
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 import os

 from PyQt4.QtCore import pyqtSignal
@@ -62,7 +64,7 @@
                 have the file browser in a separate window or embedded
                 in the project browser instead.
         """
-        super().__init__(parent)
+        super(DebugViewer, self).__init__(parent)

         self.debugServer = debugServer
         self.debugUI = None
--- a/Debugger/DebuggerInterfaceNone.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Debugger/DebuggerInterfaceNone.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing a dummy debugger interface for the debug server.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.QtCore import QObject


@@ -36,7 +38,7 @@
         @param debugServer reference to the debug server (DebugServer)
         @param passive flag indicating passive connection mode (boolean)
         """
-        super().__init__()
+        super(DebuggerInterfaceNone, self).__init__()

         self.debugServer = debugServer
         self.passive = passive
--- a/Debugger/DebuggerInterfacePython.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Debugger/DebuggerInterfacePython.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing the Python debugger interface for the debug server.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 import sys
 import os
 import re
@@ -60,7 +62,7 @@
         @param debugServer reference to the debug server (DebugServer)
         @param passive flag indicating passive connection mode (boolean)
         """
-        super().__init__()
+        super(DebuggerInterfacePython, self).__init__()

         self.__isNetworked = True
         self.__autoContinue = not passive
--- a/Debugger/DebuggerInterfacePython3.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Debugger/DebuggerInterfacePython3.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing the Python3 debugger interface for the debug server.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 import sys
 import os

@@ -59,7 +61,7 @@
         @param debugServer reference to the debug server (DebugServer)
         @param passive flag indicating passive connection mode (boolean)
         """
-        super().__init__()
+        super(DebuggerInterfacePython3, self).__init__()

         self.__isNetworked = True
         self.__autoContinue = not passive
--- a/Debugger/DebuggerInterfaceRuby.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Debugger/DebuggerInterfaceRuby.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing the Ruby debugger interface for the debug server.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 import os

 from PyQt4.QtCore import QObject, QTextCodec, QProcess, QTimer
@@ -53,7 +55,7 @@
         @param debugServer reference to the debug server (DebugServer)
         @param passive flag indicating passive connection mode (boolean)
         """
-        super().__init__()
+        super(DebuggerInterfaceRuby, self).__init__()

         self.__isNetworked = True
         self.__autoContinue = not passive
--- a/Debugger/EditBreakpointDialog.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Debugger/EditBreakpointDialog.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing a dialog to edit breakpoint properties.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 import os.path

 from PyQt4.QtCore import pyqtSlot
@@ -38,7 +40,7 @@
         @param name the widget name of this dialog
         @param modal flag indicating a modal dialog
         """
-        super().__init__(parent)
+        super(EditBreakpointDialog, self).__init__(parent)
         self.setupUi(self)
         if name:
             self.setObjectName(name)
--- a/Debugger/EditWatchpointDialog.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Debugger/EditWatchpointDialog.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing a dialog to edit watch expression properties.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.QtGui import QDialog, QDialogButtonBox

 from .Ui_EditWatchpointDialog import Ui_EditWatchpointDialog
@@ -26,7 +28,7 @@
         @param name the widget name of this dialog
         @param modal flag indicating a modal dialog
         """
-        super().__init__(parent)
+        super(EditWatchpointDialog, self).__init__(parent)
         self.setupUi(self)
         if name:
             self.setObjectName(name)
--- a/Debugger/ExceptionLogger.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Debugger/ExceptionLogger.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing the Exception Logger widget.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.QtCore import pyqtSignal, Qt
 from PyQt4.QtGui import QTreeWidget, QTreeWidgetItem, QMenu

@@ -30,7 +32,7 @@

         @param parent the parent widget of this widget
         """
-        super().__init__(parent)
+        super(ExceptionLogger, self).__init__(parent)
         self.setObjectName("ExceptionLogger")

         self.setWindowTitle(self.trUtf8("Exceptions"))
--- a/Debugger/ExceptionsFilterDialog.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Debugger/ExceptionsFilterDialog.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing the exceptions filter dialog.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.QtCore import pyqtSlot
 from PyQt4.QtGui import QDialog, QDialogButtonBox

@@ -25,7 +27,7 @@
         @param ignore flag indicating the ignore exceptions mode (boolean)
         @param parent the parent widget (QWidget)
         """
-        super().__init__(parent)
+        super(ExceptionsFilterDialog, self).__init__(parent)
         self.setupUi(self)
         self.setModal(True)
--- a/Debugger/StartDialog.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Debugger/StartDialog.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing the Start Program dialog.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.QtCore import pyqtSlot
 from PyQt4.QtGui import QDialog, QDialogButtonBox

@@ -55,7 +57,7 @@
         @keyparam autoFork flag indicating the automatic fork mode (boolean)
         @keyparam forkChild flag indicating to debug the child after forking (boolean)
         """
-        super().__init__(parent)
+        super(StartDialog, self).__init__(parent)
         self.setModal(True)

         self.type = type
--- a/Debugger/VariableDetailDialog.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Debugger/VariableDetailDialog.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing the variable detail dialog.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.QtGui import QDialog

 from .Ui_VariableDetailDialog import Ui_VariableDetailDialog
@@ -28,7 +30,7 @@
         @param vtype the variables type (string)
         @param value the variables value (string)
         """
-        super().__init__()
+        super(VariableDetailDialog, self).__init__()
         self.setupUi(self)

         # set the different fields
--- a/Debugger/VariablesFilterDialog.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Debugger/VariablesFilterDialog.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing the variables filter dialog.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.QtGui import QDialog, QDialogButtonBox

 from Debugger.Config import ConfigVarTypeDispStrings
@@ -30,7 +32,7 @@
         @param name name of this dialog (string)
         @param modal flag to indicate a modal dialog (boolean)
         """
-        super().__init__(parent)
+        super(VariablesFilterDialog, self).__init__(parent)
         if name:
             self.setObjectName(name)
         self.setModal(modal)
--- a/Debugger/VariablesViewer.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Debugger/VariablesViewer.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing the variables viewer widget.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.QtCore import Qt, QRegExp, qVersion
 from PyQt4.QtGui import QTreeWidget, QTreeWidgetItem, QApplication, QAbstractItemView, \
     QMenu
@@ -60,7 +62,7 @@
                 if index < len(lines) - 1:
                     dvalue += "<...>"

-        super().__init__(parent, [dvar, dvalue, dtype])
+        super(VariableItem, self).__init__(parent, [dvar, dvalue, dtype])

         self.populated = True

@@ -85,7 +87,7 @@
         """
         if column == 1 and role == Qt.ToolTipRole:
             return self.__tooltip
-        return super().data(column, role)
+        return super(VariableItem, self).data(column, role)

     def attachDummy(self):
         """
@@ -277,7 +279,7 @@
         @param parent the parent (QWidget)
         @param scope flag indicating global (1) or local (0) variables
         """
-        super().__init__(parent)
+        super(VariablesViewer, self).__init__(parent)

         self.indicators = {'list': '[]', 'tuple': '()', 'dict': '{}',   # Python types
                            'Array': '[]', 'Hash': '{}'}                # Ruby types
@@ -700,7 +702,7 @@
             parentItem.expand()
             self.__resort()
         except AttributeError:
-            super().expandItem(parentItem)
+            super(VariablesViewer, self).expandItem(parentItem)

     def collapseItem(self, parentItem):
         """
@@ -714,7 +716,7 @@
         try:
             parentItem.collapse()
         except AttributeError:
-            super().collapseItem(parentItem)
+            super(VariablesViewer, self).collapseItem(parentItem)

     def __resort(self):
         """
--- a/Debugger/WatchPointModel.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Debugger/WatchPointModel.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing the Watch expression model.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.QtCore import pyqtSignal, Qt, QAbstractItemModel, QModelIndex


@@ -22,7 +24,7 @@

         @param reference to the parent widget (QObject)
         """
-        super().__init__(parent)
+        super(WatchPointModel, self).__init__(parent)

         self.watchpoints = []
         self.header = [
--- a/Debugger/WatchPointViewer.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Debugger/WatchPointViewer.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing the watch expression viewer widget.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.QtCore import Qt, QModelIndex, qVersion
 from PyQt4.QtGui import QTreeView, QAbstractItemView, QMenu, QSortFilterProxyModel, \
     QHeaderView, QItemSelectionModel, QDialog
@@ -30,7 +32,7 @@

         @param parent the parent (QWidget)
         """
-        super().__init__(parent)
+        super(WatchPointViewer, self).__init__(parent)
         self.setObjectName("WatchExpressionViewer")

         self.__model = None
@@ -60,7 +62,7 @@
         self.sortingModel = QSortFilterProxyModel()
         self.sortingModel.setDynamicSortFilter(True)
         self.sortingModel.setSourceModel(self.__model)
-        super().setModel(self.sortingModel)
+        super(WatchPointViewer, self).setModel(self.sortingModel)

         header = self.header()
         header.setSortIndicator(0, Qt.AscendingOrder)
--- a/DocumentationTools/APIGenerator.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/DocumentationTools/APIGenerator.py	Mon Mar 25 03:11:06 2013 +0100
@@ -9,6 +9,8 @@
 """


+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 class APIGenerator(object):
     """
     Class implementing the builtin documentation generator.
--- a/DocumentationTools/IndexGenerator.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/DocumentationTools/IndexGenerator.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing the index generator for the builtin documentation generator.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 import sys
 import os
--- a/DocumentationTools/ModuleDocumentor.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/DocumentationTools/ModuleDocumentor.py	Mon Mar 25 03:11:06 2013 +0100
@@ -11,6 +11,8 @@
 this module.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 import sys
 import re
--- a/DocumentationTools/QtHelpGenerator.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/DocumentationTools/QtHelpGenerator.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing the QtHelp generator for the builtin documentation generator.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 import sys
 import os
 import shutil
--- a/DocumentationTools/TemplatesListsStyle.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/DocumentationTools/TemplatesListsStyle.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing templates for the documentation generator (lists style).
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 #################################################
 ##  Common templates for index and docu files  ##
 #################################################
--- a/DocumentationTools/TemplatesListsStyleCSS.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/DocumentationTools/TemplatesListsStyleCSS.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing templates for the documentation generator (lists style).
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 #################################################
 ##  Common templates for index and docu files  ##
 #################################################
--- a/E5Graphics/E5ArrowItem.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/E5Graphics/E5ArrowItem.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing a graphics item subclass for an arrow.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 import math

 from PyQt4.QtCore import QPointF, QRectF, QSizeF, QLineF, Qt
@@ -33,7 +35,7 @@
         @param type arrow type (NormalArrow, WideArrow)
         @keyparam parent reference to the parent object (QGraphicsItem)
         """
-        super().__init__(parent)
+        super(E5ArrowItem, self).__init__(parent)

         self._origin = origin
         self._end = end
--- a/E5Graphics/E5GraphicsView.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/E5Graphics/E5GraphicsView.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing a canvas view class.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 import sys

 from PyQt4.QtCore import pyqtSignal, QRectF, QSize, QSizeF, Qt
@@ -39,7 +41,7 @@
         @param scene reference to the scene object (QGraphicsScene)
         @param parent parent widget (QWidget)
         """
-        super().__init__(scene, parent)
+        super(E5GraphicsView, self).__init__(scene, parent)
         self.setObjectName("E5GraphicsView")

         self.__initialSceneSize = self.scene().sceneRect().size()
--- a/E5Gui/E5Action.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/E5Gui/E5Action.py	Mon Mar 25 03:11:06 2013 +0100
@@ -10,6 +10,8 @@
 shortcuts.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.QtGui import QAction, QActionGroup, QIcon, QKeySequence, qApp


@@ -81,7 +83,7 @@
                 7 + incr, len(args)))

         parent = args[4 + incr]
-        super().__init__(parent)
+        super(E5Action, self).__init__(parent)
         name = args[5 + incr]
         if name:
             self.setObjectName(name)
@@ -145,7 +147,7 @@

         @param shortcut the accelerator (QKeySequence)
         """
-        super().setShortcut(shortcut)
+        super(E5Action, self).setShortcut(shortcut)
         self.__ammendToolTip()

     def setShortcuts(self, shortcuts):
@@ -156,7 +158,7 @@
             or key for a platform dependent list of accelerators
             (QKeySequence.StandardKey)
         """
-        super().setShortcuts(shortcuts)
+        super(E5Action, self).setShortcuts(shortcuts)
         self.__ammendToolTip()

     def setIconText(self, text):
@@ -165,7 +167,7 @@

         @param text new icon text (string)
         """
-        super().setIconText(text)
+        super(E5Action, self).setIconText(text)
         self.__ammendToolTip()

     def __ammendToolTip(self):
--- a/E5Gui/E5Application.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/E5Gui/E5Application.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Class implementing a specialized application class.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.QtCore import QCoreApplication
 from PyQt4.QtGui import QApplication

@@ -21,7 +23,7 @@

         @param argv command line arguments
         """
-        super().__init__(argv)
+        super(E5Application, self).__init__(argv)

         self.__objectRegistry = {}
         self.__pluginObjectRegistry = {}
--- a/E5Gui/E5ClickableLabel.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/E5Gui/E5ClickableLabel.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing a clickable label.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.QtCore import pyqtSignal, Qt, QPoint
 from PyQt4.QtGui import QLabel

@@ -29,7 +31,7 @@

         @param parent reference to the parent widget (QWidget)
         """
-        super().__init__(parent)
+        super(E5ClickableLabel, self).__init__(parent)

     def mouseReleaseEvent(self, evt):
         """
@@ -45,4 +47,4 @@
         elif evt.button() == Qt.MiddleButton and self.rect().contains(evt.pos()):
             self.middleClicked.emit(evt.globalPos())
         else:
-            super().mouseReleaseEvent(evt)
+            super(E5ClickableLabel, self).mouseReleaseEvent(evt)
--- a/E5Gui/E5ComboBox.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/E5Gui/E5ComboBox.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing combobox classes using the eric5 line edits.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.QtGui import QComboBox


@@ -21,7 +23,7 @@
         @param parent reference to the parent widget (QWidget)
         @param inactiveText text to be shown on inactivity (string)
         """
-        super().__init__(parent)
+        super(E5ComboBox, self).__init__(parent)

         self.setMinimumHeight(24)

@@ -59,7 +61,7 @@
         @param parent reference to the parent widget (QWidget)
         @param inactiveText text to be shown on inactivity (string)
         """
-        super().__init__(parent, inactiveText)
+        super(E5ClearableComboBox, self).__init__(parent, inactiveText)

         from .E5LineEdit import E5ClearableLineEdit
         self.__lineedit = E5ClearableLineEdit(self, inactiveText)
--- a/E5Gui/E5Completers.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/E5Gui/E5Completers.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing various kinds of completers.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.QtCore import QDir, Qt
 from PyQt4.QtGui import QCompleter, QDirModel, QStringListModel

@@ -28,7 +30,7 @@
             completer (QCompleter.CompletionMode)
         @keyparam showHidden flag indicating to show hidden entries as well (boolean)
         """
-        super().__init__(parent)
+        super(E5FileCompleter, self).__init__(parent)
         self.__model = QDirModel(self)
         if showHidden:
             self.__model.setFilter(
@@ -60,7 +62,7 @@
             completer (QCompleter.CompletionMode)
         @keyparam showHidden flag indicating to show hidden entries as well (boolean)
         """
-        super().__init__(parent)
+        super(E5DirCompleter, self).__init__(parent)
         self.__model = QDirModel(self)
         if showHidden:
             self.__model.setFilter(
@@ -90,7 +92,7 @@
         @keyparam completionMode completion mode of the
             completer (QCompleter.CompletionMode)
         """
-        super().__init__(parent)
+        super(E5StringListCompleter, self).__init__(parent)
         self.__model = QStringListModel(strings, parent)
         self.setModel(self.__model)
         self.setCompletionMode(completionMode)
--- a/E5Gui/E5FileDialog.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/E5Gui/E5FileDialog.py	Mon Mar 25 03:11:06 2013 +0100
@@ -8,6 +8,8 @@
 to cope with distributor's usage of KDE wrapper dialogs for Qt file dialogs.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.QtGui import QFileDialog

 import Globals
--- a/E5Gui/E5Led.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/E5Gui/E5Led.py	Mon Mar 25 03:11:06 2013 +0100
@@ -9,6 +9,8 @@
 It was inspired by KLed.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.QtCore import Qt, QSize
 from PyQt4.QtGui import QWidget, QColor, QRadialGradient, QPalette, QPainter, QBrush

@@ -29,7 +31,7 @@
         @param shape shape of the LED (E5LedCircular, E5LedRectangular)
         @param rectRation ratio width to height, if shape is rectangular (float)
         """
-        super().__init__(parent)
+        super(E5Led, self).__init__(parent)

         if color is None:
             color = QColor("green")
--- a/E5Gui/E5LineEdit.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/E5Gui/E5LineEdit.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing specialized line edits.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.QtCore import pyqtSignal, Qt, QEvent, qVersion
 from PyQt4.QtGui import QLineEdit, QStyle, QPainter, QPalette, QStyleOptionFrameV2, \
     QWidget, QHBoxLayout, QBoxLayout, QLayout, QApplication, QSpacerItem, QSizePolicy
@@ -26,7 +28,7 @@

         @param parent reference to the parent widget (QWidget)
         """
-        super().__init__(parent)
+        super(E5LineEditSideWidget, self).__init__(parent)

     def event(self, evt):
         """
@@ -54,7 +56,7 @@
         @param parent reference to the parent widget (QWidget)
         @param inactiveText text to be shown on inactivity (string)
         """
-        super().__init__(parent)
+        super(E5LineEdit, self).__init__(parent)

         self.setMinimumHeight(22)

@@ -142,7 +144,7 @@

         @param evt reference to the paint event (QPaintEvent)
         """
-        super().paintEvent(evt)
+        super(E5LineEdit, self).paintEvent(evt)

         if qVersion() < "4.7.0":
             if not self.text() and \
@@ -282,7 +284,7 @@
         """
         assert side in [E5LineEdit.RightSide, E5LineEdit.LeftSide]

-        super().__init__(parent, inactiveText)
+        super(E5ClearableLineEdit, self).__init__(parent, inactiveText)

         from E5Gui.E5LineEditButton import E5LineEditButton
         self.__clearButton = E5LineEditButton(self)
--- a/E5Gui/E5LineEditButton.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/E5Gui/E5LineEditButton.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing a button class to be used with E5LineEdit.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.QtCore import Qt, QPoint, QPointF
 from PyQt4.QtGui import QAbstractButton, QPainter, QPainterPath

@@ -21,7 +23,7 @@

         @param parent reference to the parent widget (QWidget)
         """
-        super().__init__(parent)
+        super(E5LineEditButton, self).__init__(parent)

         self.__menu = None
         self.__image = None
@@ -59,7 +61,7 @@
             self.__image = None
         else:
             self.__image = icon.pixmap(16, 16).toImage()
-        super().setIcon(icon)
+        super(E5LineEditButton, self).setIcon(icon)

     def __clicked(self):
         """
--- a/E5Gui/E5ListView.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/E5Gui/E5ListView.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing specialized list views.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.QtCore import Qt
 from PyQt4.QtGui import QListView, QItemSelectionModel

@@ -26,7 +28,7 @@
             self.removeSelected()
             evt.setAccepted(True)
         else:
-            super().keyPressEvent(evt)
+            super(E5ListView, self).keyPressEvent(evt)

     def removeSelected(self):
         """
--- a/E5Gui/E5MainWindow.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/E5Gui/E5MainWindow.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing a main window class with styling support.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.QtGui import QMainWindow, QStyleFactory,  QApplication

 from .E5Application import e5App
@@ -23,7 +25,7 @@

         @param parent reference to the parent widget (QWidget)
         """
-        super().__init__(parent)
+        super(E5MainWindow, self).__init__(parent)

         self.defaultStyleName = QApplication.style().objectName()
--- a/E5Gui/E5MessageBox.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/E5Gui/E5MessageBox.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing QMessageBox replacements and more convenience function.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.QtCore import Qt
 from PyQt4.QtGui import QMessageBox, QApplication

@@ -78,7 +80,7 @@
         @keyparam buttons set of standard buttons to generate (StandardButtons)
         @keyparam parent parent widget of the message box (QWidget)
         """
-        super().__init__(parent)
+        super(E5MessageBox, self).__init__(parent)
         self.setIcon(icon)
         if modal:
             if parent is not None:
--- a/E5Gui/E5ModelMenu.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/E5Gui/E5ModelMenu.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing a menu populated from a QAbstractItemModel.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.QtCore import pyqtSignal, qVersion, Qt, QModelIndex, QPoint
 from PyQt4.QtGui import QMenu, QFontMetrics, QAction, QApplication, QDrag, QPixmap

@@ -27,7 +29,7 @@

         @param parent reference to the parent widget (QWidget)
         """
-        super().__init__(parent)
+        super(E5ModelMenu, self).__init__(parent)

         self.__maxRows = -1
         self.__firstSeparator = -1
@@ -303,7 +305,7 @@
                 if evt.mimeData().hasFormat(mimeType):
                     evt.acceptProposedAction()

-        super().dragEnterEvent(evt)
+        super(E5ModelMenu, self).dragEnterEvent(evt)

     def dropEvent(self, evt):
         """
@@ -319,7 +321,7 @@
             else:
                 idx = self.index(act)
                 if not idx.isValid():
-                    super().dropEvent(evt)
+                    super(E5ModelMenu, self).dropEvent(evt)
                     return

                 row = idx.row()
@@ -334,7 +336,7 @@
                                       row, 0, parentIndex)
             self.close()

-        super().dropEvent(evt)
+        super(E5ModelMenu, self).dropEvent(evt)

     def mousePressEvent(self, evt):
         """
@@ -344,7 +346,7 @@
         """
         if evt.button() == Qt.LeftButton:
             self.__dragStartPosition = evt.pos()
-        super().mousePressEvent(evt)
+        super(E5ModelMenu, self).mousePressEvent(evt)

     def mouseMoveEvent(self, evt):
         """
@@ -353,26 +355,26 @@
         @param evt reference to the event (QMouseEvent)
         """
         if self.__model is None:
-            super().mouseMoveEvent(evt)
+            super(E5ModelMenu, self).mouseMoveEvent(evt)
             return

         if not (evt.buttons() & Qt.LeftButton):
-            super().mouseMoveEvent(evt)
+            super(E5ModelMenu, self).mouseMoveEvent(evt)
             return

         manhattanLength = (evt.pos() - self.__dragStartPosition).manhattanLength()
         if manhattanLength <= QApplication.startDragDistance():
-            super().mouseMoveEvent(evt)
+            super(E5ModelMenu, self).mouseMoveEvent(evt)
             return

         act = self.actionAt(self.__dragStartPosition)
         if act is None:
-            super().mouseMoveEvent(evt)
+            super(E5ModelMenu, self).mouseMoveEvent(evt)
             return

         idx = self.index(act)
         if not idx.isValid():
-            super().mouseMoveEvent(evt)
+            super(E5ModelMenu, self).mouseMoveEvent(evt)
             return

         drag = QDrag(self)
@@ -402,7 +404,7 @@
         """
         self._mouseButton = evt.button()
         self._keyboardModifiers = evt.modifiers()
-        super().mouseReleaseEvent(evt)
+        super(E5ModelMenu, self).mouseReleaseEvent(evt)

     def resetFlags(self):
         """
--- a/E5Gui/E5ModelToolBar.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/E5Gui/E5ModelToolBar.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing a tool bar populated from a QAbstractItemModel.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.QtCore import pyqtSignal, qVersion, Qt, QModelIndex, QPoint, QEvent
 from PyQt4.QtGui import QApplication, QDrag, QPixmap, QToolBar, QIcon, QToolButton

@@ -27,9 +29,9 @@
         @param parent reference to the parent widget (QWidget)
         """
         if title is not None:
-            super().__init__(title, parent)
+            super(E5ModelToolBar, self).__init__(title, parent)
         else:
-            super().__init__(parent)
+            super(E5ModelToolBar, self).__init__(parent)

         self.__model = None

@@ -182,7 +184,7 @@
                 if evt.mimeData().hasFormat(mimeType):
                     evt.acceptProposedAction()

-        super().dragEnterEvent(evt)
+        super(E5ModelToolBar, self).dragEnterEvent(evt)

     def dropEvent(self, evt):
         """
@@ -209,7 +211,7 @@
             self.__model.dropMimeData(evt.mimeData(), evt.dropAction(),
                                       row, 0, parentIndex)

-        super().dropEvent(evt)
+        super(E5ModelToolBar, self).dropEvent(evt)

     def mouseMoveEvent(self, evt):
         """
@@ -218,21 +220,21 @@
         @param evt reference to the event (QMouseEvent)
         """
         if self.__model is None:
-            super().mouseMoveEvent(evt)
+            super(E5ModelToolBar, self).mouseMoveEvent(evt)
             return

         if not (evt.buttons() & Qt.LeftButton):
-            super().mouseMoveEvent(evt)
+            super(E5ModelToolBar, self).mouseMoveEvent(evt)
             return

         manhattanLength = (evt.pos() - self.__dragStartPosition).manhattanLength()
         if manhattanLength <= QApplication.startDragDistance():
-            super().mouseMoveEvent(evt)
+            super(E5ModelToolBar, self).mouseMoveEvent(evt)
             return

         act = self.actionAt(self.__dragStartPosition)
         if act is None:
-            super().mouseMoveEvent(evt)
+            super(E5ModelToolBar, self).mouseMoveEvent(evt)
             return

         idx = self.index(act)
@@ -259,7 +261,7 @@
         @param evt reference to the hide event (QHideEvent)
         """
         self.clear()
-        super().hideEvent(evt)
+        super(E5ModelToolBar, self).hideEvent(evt)

     def showEvent(self, evt):
         """
@@ -269,7 +271,7 @@
         """
         if len(self.actions()) == 0:
             self._build()
-        super().showEvent(evt)
+        super(E5ModelToolBar, self).showEvent(evt)

     def resetFlags(self):
         """
--- a/E5Gui/E5PassivePopup.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/E5Gui/E5PassivePopup.py	Mon Mar 25 03:11:06 2013 +0100
@@ -8,6 +8,8 @@
 interrupting the user.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.QtCore import pyqtSignal, Qt, QTimer, QPoint, QRect
 from PyQt4.QtGui import QFrame, QVBoxLayout, QApplication

@@ -28,7 +30,7 @@

         @param parent reference to the parent widget (QWidget)
         """
-        super().__init__(None)
+        super(E5PassivePopup, self).__init__(None)

         self.__popupStyle = DEFAULT_POPUP_TYPE
         self.__msgView = None
@@ -70,7 +72,7 @@
         @param visible flag indicating the visibility status (boolean)
         """
         if not visible:
-            super().setVisible(visible)
+            super(E5PassivePopup, self).setVisible(visible)
             return

         if self.size() != self.sizeHint():
@@ -80,7 +82,7 @@
             self.__positionSelf()
         else:
             self.move(self.__fixedPosition)
-        super().setVisible(True)
+        super(E5PassivePopup, self).setVisible(True)

         delay = self.__hideDelay
         if delay < 0:
@@ -96,7 +98,7 @@
         """
         if p is not None:
             self.__fixedPosition = p
-        super().show()
+        super(E5PassivePopup, self).show()

     def setTimeout(self, delay):
         """
--- a/E5Gui/E5PasswordMeter.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/E5Gui/E5PasswordMeter.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing a custom widget indicating the strength of a password.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.QtGui import QProgressBar

 from Utilities.PasswordChecker import PasswordChecker
@@ -22,10 +24,10 @@

         @param parent reference to the parent widget (QWidget)
         """
-        super().__init__(parent)
+        super(E5PasswordMeter, self).__init__(parent)

-        super().setTextVisible(False)
-        super().setMaximum(100)
+        super(E5PasswordMeter, self).setTextVisible(False)
+        super(E5PasswordMeter, self).setMaximum(100)
         self.__increment = 100 // (PasswordChecker.Complexity_VeryStrong + 1)

         self.__indicatorColors = [
@@ -56,7 +58,7 @@
         strength = PasswordChecker().checkPassword(password)
         self.setStyleSheet(self.__styleSheetTemplate.format(
             self.__indicatorColors[strength]))
-        super().setValue((strength + 1) * self.__increment)
+        super(E5PasswordMeter, self).setValue((strength + 1) * self.__increment)

     def setValue(self, value):
         """
--- a/E5Gui/E5SideBar.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/E5Gui/E5SideBar.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing a sidebar class.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.QtCore import QEvent, QSize, Qt, QByteArray, QDataStream, QIODevice
 from PyQt4.QtGui import QTabBar, QWidget, QStackedWidget, QBoxLayout, QToolButton, \
     QSizePolicy
@@ -35,7 +37,7 @@
         @param orientation orientation of the sidebar widget (North, East, South, West)
         @param parent parent widget (QWidget)
         """
-        super().__init__(parent)
+        super(E5SideBar, self).__init__(parent)

         self.__tabBar = QTabBar()
         self.__tabBar.setDrawBase(True)
--- a/E5Gui/E5SingleApplication.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/E5Gui/E5SingleApplication.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing the single application server and client.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 import os

 from E5Gui.E5Application import e5App
--- a/E5Gui/E5SqueezeLabels.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/E5Gui/E5SqueezeLabels.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing labels that squeeze their contents to fit the size of the label.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.QtCore import Qt
 from PyQt4.QtGui import QLabel

@@ -23,7 +25,7 @@

         @param parent reference to the parent Widget (QWidget)
         """
-        super().__init__(parent)
+        super(E5SqueezeLabel, self).__init__(parent)

         self.__text = ''
         self.__elided = ''
@@ -37,10 +39,10 @@
         fm = self.fontMetrics()
         if fm.width(self.__text) > self.contentsRect().width():
             self.__elided = fm.elidedText(self.text(), Qt.ElideMiddle, self.width())
-            super().setText(self.__elided)
+            super(E5SqueezeLabel, self).setText(self.__elided)
         else:
-            super().setText(self.__text)
-        super().paintEvent(event)
+            super(E5SqueezeLabel, self).setText(self.__text)
+        super(E5SqueezeLabel, self).paintEvent(event)

     def setText(self, txt):
         """
@@ -49,7 +51,7 @@
         @param txt the text to be shown (string)
         """
         self.__text = txt
-        super().setText(self.__text)
+        super(E5SqueezeLabel, self).setText(self.__text)


 class E5SqueezeLabelPath(QLabel):
@@ -62,7 +64,7 @@

         @param parent reference to the parent Widget (QWidget)
         """
-        super().__init__(parent)
+        super(E5SqueezeLabelPath, self).__init__(parent)

         self.__path = ''
         self.__surrounding = "{0}"
@@ -74,7 +76,7 @@
         @param surrounding the a string containg placeholders for the path (string)
         """
         self.__surrounding = surrounding
-        super().setText(self.__surrounding.format(self.__path))
+        super(E5SqueezeLabelPath, self).setText(self.__surrounding.format(self.__path))

     def setPath(self, path):
         """
@@ -83,7 +85,7 @@
         @param path path to be shown (string)
         """
         self.__path = path
-        super().setText(self.__surrounding.format(self.__path))
+        super(E5SqueezeLabelPath, self).setText(self.__surrounding.format(self.__path))

     def setTextPath(self, surrounding, path):
         """
@@ -94,7 +96,7 @@
         """
         self.__surrounding = surrounding
         self.__path = path
-        super().setText(self.__surrounding.format(self.__path))
+        super(E5SqueezeLabelPath, self).setText(self.__surrounding.format(self.__path))

     def paintEvent(self, event):
         """
@@ -104,14 +106,14 @@
         """
         fm = self.fontMetrics()
         if fm.width(self.__surrounding.format(self.__path)) > self.contentsRect().width():
-            super().setText(
+            super(E5SqueezeLabelPath, self).setText(
                 self.__surrounding.format(compactPath(self.__path,
                                           self.contentsRect().width(),
                                           self.length))
             )
         else:
-            super().setText(self.__surrounding.format(self.__path))
-        super().paintEvent(event)
+            super(E5SqueezeLabelPath, self).setText(self.__surrounding.format(self.__path))
+        super(E5SqueezeLabelPath, self).paintEvent(event)

     def length(self, txt):
         """
--- a/E5Gui/E5TabWidget.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/E5Gui/E5TabWidget.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing a TabWidget class substituting QTabWidget.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.QtCore import Qt, QPoint, QMimeData, QByteArray, pyqtSignal
 from PyQt4.QtGui import QTabWidget, QTabBar, QApplication, QDrag, QStyle, QLabel, QMovie

@@ -21,7 +23,7 @@

         @param parent reference to the parent widget (QWidget)
         """
-        super().__init__(parent)
+        super(E5WheelTabBar, self).__init__(parent)
         self._tabWidget = parent

     def wheelEvent(self, event):
@@ -138,7 +140,7 @@
         @param parent reference to the parent widget (QWidget)
         @keyparam dnd flag indicating the support for Drag & Drop (boolean)
         """
-        super().__init__(parent)
+        super(E5TabWidget, self).__init__(parent)

         if dnd:
             if not hasattr(self, 'setMovable'):
--- a/E5Gui/E5TableView.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/E5Gui/E5TableView.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing specialized table views.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.QtCore import Qt
 from PyQt4.QtGui import QTableView, QItemSelectionModel

@@ -26,7 +28,7 @@
             self.removeSelected()
             evt.setAccepted(True)
         else:
-            super().keyPressEvent(evt)
+            super(E5TableView, self).keyPressEvent(evt)

     def removeSelected(self):
         """
--- a/E5Gui/E5TextSpinBox.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/E5Gui/E5TextSpinBox.py	Mon Mar 25 03:11:06 2013 +0100
@@ -3,6 +3,8 @@
 # Copyright (c) 2010 - 2013 Detlev Offenbach <detlev@die-offenbachs.de>
 #

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.QtGui import QSpinBox


@@ -16,7 +18,7 @@

         @param parent reference to the parent widget (QWidget)
         """
-        super().__init__(parent)
+        super(E5TextSpinBox, self).__init__(parent)

         self.__items = []
--- a/E5Gui/E5ToolBarDialog.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/E5Gui/E5ToolBarDialog.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing a toolbar configuration dialog.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.QtCore import pyqtSlot, Qt
 from PyQt4.QtGui import QDialog, QDialogButtonBox, QTreeWidgetItem, QColor, \
     QInputDialog, QLineEdit, QListWidgetItem, QAbstractButton
@@ -51,7 +53,7 @@
         @param toolBarManager reference to a toolbar manager object (E5ToolBarManager)
         @param parent reference to the parent widget (QWidget)
         """
-        super().__init__(parent)
+        super(E5ToolBarDialog, self).__init__(parent)
         self.setupUi(self)

         self.__manager = toolBarManager
--- a/E5Gui/E5ToolBarManager.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/E5Gui/E5ToolBarManager.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing a toolbar manager class.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.QtCore import QObject, QByteArray, QDataStream, QIODevice
 from PyQt4.QtGui import QToolBar

@@ -28,7 +30,7 @@
         @param ui reference to the user interface object (UI.UserInterface)
         @param parent reference to the parent object (QObject)
         """
-        super().__init__(parent)
+        super(E5ToolBarManager, self).__init__(parent)

         self.__mainWindow = None
         self.__ui = ui
--- a/E5Gui/E5ToolBox.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/E5Gui/E5ToolBox.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing a horizontal and a vertical toolbox class.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.QtGui import QToolBox, QTabWidget

 from .E5TabWidget import E5TabWidget
@@ -22,7 +24,7 @@

         @param parent reference to the parent widget (QWidget)
         """
-        super().__init__(parent)
+        super(E5VerticalToolBox, self).__init__(parent)


 class E5HorizontalToolBox(E5TabWidget):
--- a/E5Gui/E5TreeSortFilterProxyModel.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/E5Gui/E5TreeSortFilterProxyModel.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing a modified QSortFilterProxyModel.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.QtCore import Qt, QModelIndex
 from PyQt4.QtGui import QSortFilterProxyModel

@@ -24,7 +26,7 @@

         @param parent reference to the parent object (QObject)
         """
-        super().__init__(parent)
+        super(E5TreeSortFilterProxyModel, self).__init__(parent)

         self.setFilterCaseSensitivity(Qt.CaseInsensitive)
--- a/E5Gui/E5TreeView.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/E5Gui/E5TreeView.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing specialized tree views.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.QtCore import Qt
 from PyQt4.QtGui import QTreeView

@@ -26,7 +28,7 @@
             self.removeSelected()
             evt.setAccepted(True)
         else:
-            super().keyPressEvent(evt)
+            super(E5TreeView, self).keyPressEvent(evt)

     def removeSelected(self):
         """
--- a/E5Gui/E5TreeWidget.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/E5Gui/E5TreeWidget.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing specialized tree views.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.QtCore import pyqtSignal, Qt
 from PyQt4.QtGui import QTreeWidget, QTreeWidgetItem, QAbstractItemView

@@ -32,7 +34,7 @@

         @param parent reference to the parent widget (QWidget)
         """
-        super().__init__(parent)
+        super(E5TreeWidget, self).__init__(parent)

         self.__refreshAllItemsNeeded = True
         self.__allTreeItems = []
@@ -126,7 +128,7 @@
         @param item item to be added as a top level item (QTreeWidgetItem)
         """
         self.__allTreeItems.append(item)
-        super().addTopLevelItem(item)
+        super(E5TreeWidget, self).addTopLevelItem(item)

     def addTopLevelItems(self, items):
         """
@@ -135,7 +137,7 @@
         @param items items to be added as top level items (list of QTreeWidgetItem)
         """
         self.__allTreeItems.extend(items)
-        super().addTopLevelItems(items)
+        super(E5TreeWidget, self).addTopLevelItems(items)

     def insertTopLevelItem(self, index, item):
         """
@@ -145,7 +147,7 @@
         @param item item to be inserted as a top level item (QTreeWidgetItem)
         """
         self.__allTreeItems.append(item)
-        super().insertTopLevelItem(index, item)
+        super(E5TreeWidget, self).insertTopLevelItem(index, item)

     def insertTopLevelItems(self, index, items):
         """
@@ -155,7 +157,7 @@
         @param items items to be inserted as top level items (list of QTreeWidgetItem)
         """
         self.__allTreeItems.extend(items)
-        super().insertTopLevelItems(index, items)
+        super(E5TreeWidget, self).insertTopLevelItems(index, items)

     def deleteItem(self, item):
         """
@@ -225,7 +227,7 @@
         Public slot to clear the tree.
         """
         self.__allTreeItems = []
-        super().clear()
+        super(E5TreeWidget, self).clear()

     def __scheduleRefresh(self):
         """
@@ -247,7 +249,7 @@
             self.itemMiddleButtonClicked.emit(self.itemAt(evt.pos()))
             return
         else:
-            super().mousePressEvent(evt)
+            super(E5TreeWidget, self).mousePressEvent(evt)

     def __iterateAllItems(self, parent):
         """
--- a/E5Gui/E5ZoomWidget.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/E5Gui/E5ZoomWidget.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing a zoom widget for the status bar.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.QtCore import pyqtSlot, pyqtSignal
 from PyQt4.QtGui import QWidget

@@ -28,7 +30,7 @@
         @param resetPix pixmap for the zoom reset button (QPixmap)
         @param parent reference to the parent widget (QWidget)
         """
-        super().__init__(parent)
+        super(E5ZoomWidget, self).__init__(parent)
         self.setupUi(self)

         self.zoomOutLabel.setPixmap(outPix.scaled(16, 16))
--- a/E5Network/E5Ftp.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/E5Network/E5Ftp.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing an extension to the Python FTP class to support FTP proxies.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 import ftplib
 from socket import _GLOBAL_DEFAULT_TIMEOUT

@@ -150,9 +152,9 @@
                 raise E5FtpProxyError(
                     "990 Proxy usage requested, but no proxy host given.")

-            return super().connect(self.__proxyHost, self.__proxyPort, self.__timeout)
+            return super(E5Ftp, self).connect(self.__proxyHost, self.__proxyPort, self.__timeout)
         else:
-            return super().connect(self.__host, self.__port, self.__timeout)
+            return super(E5Ftp, self).connect(self.__host, self.__port, self.__timeout)

     def login(self, user="", password="", acct=""):
         """
--- a/E5Network/E5NetworkHeaderDetailsDialog.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/E5Network/E5NetworkHeaderDetailsDialog.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing a dialog to show the data of a response or reply header.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.QtGui import QDialog

 from .Ui_E5NetworkHeaderDetailsDialog import Ui_E5NetworkHeaderDetailsDialog
@@ -22,7 +24,7 @@

         @param parent reference to the parent object (QWidget)
         """
-        super().__init__(parent)
+        super(E5NetworkHeaderDetailsDialog, self).__init__(parent)
         self.setupUi(self)

     def setData(self, name, value):
--- a/E5Network/E5NetworkMonitor.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/E5Network/E5NetworkMonitor.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing a network monitor dialog.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.QtCore import Qt, QAbstractTableModel, QModelIndex, QUrl
 from PyQt4.QtGui import QDialog, QStandardItemModel, QSortFilterProxyModel
 from PyQt4.QtNetwork import QNetworkRequest, QNetworkAccessManager
@@ -69,7 +71,7 @@
             (QNetworkAccessManager)
         @param parent reference to the parent widget (QWidget)
         """
-        super().__init__(parent)
+        super(E5NetworkMonitor, self).__init__(parent)
         self.setupUi(self)

         self.__requestHeaders = QStandardItemModel(self)
@@ -119,14 +121,14 @@
         @param evt reference to the close event object (QCloseEvent)
         """
         self.__class__._monitor = None
-        super().closeEvent(evt)
+        super(E5NetworkMonitor, self).closeEvent(evt)

     def reject(self):
         """
         Public slot to close the dialog with a Reject status.
         """
         self.__class__._monitor = None
-        super().reject()
+        super(E5NetworkMonitor, self).reject()

     def __currentChanged(self, current, previous):
         """
@@ -206,7 +208,7 @@
             (QNetworkAccessManager)
         @param parent reference to the parent object (QObject)
         """
-        super().__init__(parent)
+        super(E5RequestModel, self).__init__(parent)

         self.__headerData = [
             self.trUtf8("Method"),
--- a/E5Network/E5NetworkProxyFactory.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/E5Network/E5NetworkProxyFactory.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing a network proxy factory.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 import os

 from PyQt4.QtCore import QUrl, QCoreApplication
@@ -74,7 +76,7 @@
         """
         Constructor
         """
-        super().__init__()
+        super(E5NetworkProxyFactory, self).__init__()

     def queryProxy(self, query):
         """
--- a/E5Network/E5SslCertificatesDialog.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/E5Network/E5SslCertificatesDialog.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing a dialog to show and edit all certificates.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.QtCore import pyqtSlot, Qt, QByteArray, QFile, QFileInfo, QIODevice, \
     qVersion
 from PyQt4.QtGui import QDialog, QTreeWidgetItem
@@ -36,7 +38,7 @@

         @param parent reference to the parent widget (QWidget)
         """
-        super().__init__(parent)
+        super(E5SslCertificatesDialog, self).__init__(parent)
         self.setupUi(self)

         self.serversViewButton.setIcon(UI.PixmapCache.getIcon("certificates.png"))
--- a/E5Network/E5SslCertificatesInfoDialog.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/E5Network/E5SslCertificatesInfoDialog.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing a dialog to show SSL certificate infos.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.QtGui import QDialog

 from .Ui_E5SslCertificatesInfoDialog import Ui_E5SslCertificatesInfoDialog
@@ -23,7 +25,7 @@
         @param certificateChain SSL certificate chain (list of QSslCertificate)
         @param parent reference to the parent widget (QWidget)
         """
-        super().__init__(parent)
+        super(E5SslCertificatesInfoDialog, self).__init__(parent)
         self.setupUi(self)

         self.sslWidget.showCertificateChain(certificateChain)
--- a/E5Network/E5SslCertificatesInfoWidget.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/E5Network/E5SslCertificatesInfoWidget.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,12 @@
 Module implementing a widget to show SSL certificate infos.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+try:
+    str = unicode
+except (NameError):
+    pass
+
 from PyQt4.QtCore import pyqtSlot, QCryptographicHash, QDateTime, qVersion
 from PyQt4.QtGui import QWidget
 from PyQt4.QtNetwork import QSslCertificate
@@ -26,7 +32,7 @@

         @param parent reference to the parent widget (QWidget)
         """
-        super().__init__(parent)
+        super(E5SslCertificatesInfoWidget, self).__init__(parent)
         self.setupUi(self)

         self.__chain = []
--- a/E5Network/E5SslErrorHandler.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/E5Network/E5SslErrorHandler.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing a SSL error handler.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.QtCore import qVersion, QObject, QByteArray
 from PyQt4.QtNetwork import QSslCertificate, QSslConfiguration, QSslSocket, \
     QSslError, QSsl
@@ -34,7 +36,7 @@

         @param parent reference to the parent object (QObject)
         """
-        super().__init__(parent)
+        super(E5SslErrorHandler, self).__init__(parent)

         caList = self.__getSystemCaCertificates()
         if Preferences.Prefs.settings.contains("Help/CaCertificatesDict"):
--- a/E5Network/E5SslInfoWidget.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/E5Network/E5SslInfoWidget.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing a widget to show SSL information.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.QtCore import qVersion, Qt, QUrl, QPoint
 from PyQt4.QtGui import QMenu, QGridLayout, QLabel, QSizePolicy
 from PyQt4.QtNetwork import QSsl, QSslConfiguration, QSslCertificate
@@ -27,7 +29,7 @@
         @param configuration SSL configuration (QSslConfiguration)
         @param parent reference to the parent widget (QWidget)
         """
-        super().__init__(parent)
+        super(E5SslInfoWidget, self).__init__(parent)

         self.__url = QUrl(url)
         self.__configuration = QSslConfiguration(configuration)
--- a/E5Network/E5UrlInfo.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/E5Network/E5UrlInfo.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing a class replacing QUrlInfo.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.QtCore import QDateTime
--- a/E5XML/DebuggerPropertiesReader.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/E5XML/DebuggerPropertiesReader.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing a class for reading an XML project debugger properties file.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from .Config import debuggerPropertiesFileFormatVersion
 from .XMLStreamReaderBase import XMLStreamReaderBase
--- a/E5XML/DebuggerPropertiesWriter.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/E5XML/DebuggerPropertiesWriter.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing the writer class for writing an XML project debugger properties file.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 import time

 from E5Gui.E5Application import e5App
--- a/E5XML/HighlightingStylesReader.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/E5XML/HighlightingStylesReader.py	Mon Mar 25 03:11:06 2013 +0100
@@ -8,6 +8,8 @@
 Module implementing a class for reading a highlighting styles XML file.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.QtGui import QColor, QFont

 from .Config import highlightingStylesFileFormatVersion
--- a/E5XML/HighlightingStylesWriter.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/E5XML/HighlightingStylesWriter.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing the writer class for writing a highlighting styles XML file.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 import time

 from .XMLStreamWriterBase import XMLStreamWriterBase
--- a/E5XML/MultiProjectReader.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/E5XML/MultiProjectReader.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing a class for reading an XML multi project file.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from .Config import multiProjectFileFormatVersion
 from .XMLStreamReaderBase import XMLStreamReaderBase
--- a/E5XML/MultiProjectWriter.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/E5XML/MultiProjectWriter.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing the writer class for writing an XML multi project file.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 import time

 from .XMLStreamWriterBase import XMLStreamWriterBase
--- a/E5XML/PluginRepositoryReader.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/E5XML/PluginRepositoryReader.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module to read the plug-in repository contents file.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from .Config import pluginRepositoryFileFormatVersion
 from .XMLStreamReaderBase import XMLStreamReaderBase
--- a/E5XML/ProjectReader.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/E5XML/ProjectReader.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing a class for reading an XML project file.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from .Config import projectFileFormatVersion
 from .XMLStreamReaderBase import XMLStreamReaderBase
--- a/E5XML/ProjectWriter.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/E5XML/ProjectWriter.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing the writer class for writing an XML project file.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 import time

 from E5Gui.E5Application import e5App
--- a/E5XML/SessionReader.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/E5XML/SessionReader.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing a class for reading an XML session file.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from E5Gui.E5Application import e5App

 from .Config import sessionFileFormatVersion
--- a/E5XML/SessionWriter.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/E5XML/SessionWriter.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing the writer class for writing an XML session file.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 import time

 from E5Gui.E5Application import e5App
--- a/E5XML/ShortcutsReader.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/E5XML/ShortcutsReader.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing a class for reading an XML shortcuts file.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from .Config import shortcutsFileFormatVersion
 from .XMLStreamReaderBase import XMLStreamReaderBase
--- a/E5XML/ShortcutsWriter.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/E5XML/ShortcutsWriter.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing the writer class for writing an XML shortcuts file.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 import time

 from E5Gui.E5Application import e5App
--- a/E5XML/TasksReader.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/E5XML/TasksReader.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing a class for reading an XML tasks file.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 import time

 from E5Gui.E5Application import e5App
--- a/E5XML/TasksWriter.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/E5XML/TasksWriter.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing the writer class for writing an XML tasks file.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 import time

 from E5Gui.E5Application import e5App
--- a/E5XML/TemplatesReader.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/E5XML/TemplatesReader.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing a class for reading an XML templates file.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from E5Gui.E5Application import e5App

 from .Config import templatesFileFormatVersion
--- a/E5XML/TemplatesWriter.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/E5XML/TemplatesWriter.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing the writer class for writing an XML templates file.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 import time

 from .XMLStreamWriterBase import XMLStreamWriterBase
--- a/E5XML/UserProjectReader.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/E5XML/UserProjectReader.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing a class for reading an XML user project properties file.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from .Config import userProjectFileFormatVersion
 from .XMLStreamReaderBase import XMLStreamReaderBase
--- a/E5XML/UserProjectWriter.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/E5XML/UserProjectWriter.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing the writer class for writing an XML user project properties file.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 import time

 from E5Gui.E5Application import e5App
--- a/E5XML/XMLStreamReaderBase.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/E5XML/XMLStreamReaderBase.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing a base class for all of eric5s XML stream writers.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 import pickle
 import base64

@@ -25,7 +27,7 @@

         @param device reference to the I/O device to read from (QIODevice)
         """
-        super().__init__(device)
+        super(XMLStreamReaderBase, self).__init__(device)

     def toBool(self, value):
         """
--- a/E5XML/XMLStreamWriterBase.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/E5XML/XMLStreamWriterBase.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing a base class for all of eric5s XML stream writers.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 import pickle
 import base64

@@ -23,7 +25,7 @@

         @param device reference to the I/O device to write to (QIODevice)
         """
-        super().__init__(device)
+        super(XMLStreamWriterBase, self).__init__(device)

         self.basics = {
             type(None): self._write_none,
--- a/Globals/AppInfo.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Globals/AppInfo.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing a function to generate an application info.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from UI.Info import Version
--- a/Globals/__init__.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Globals/__init__.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module defining common data to be used by all modules.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 import sys
 import os
--- a/Graphics/ApplicationDiagramBuilder.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Graphics/ApplicationDiagramBuilder.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing a dialog showing an imports diagram of the application.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 import os
 import glob

@@ -34,7 +36,7 @@
         @keyparam noModules flag indicating, that no module names should be
             shown (boolean)
         """
-        super().__init__(dialog, view, project)
+        super(ApplicationDiagramBuilder, self).__init__(dialog, view, project)
         self.setObjectName("ApplicationDiagram")

         self.noModules = noModules
--- a/Graphics/AssociationItem.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Graphics/AssociationItem.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing a graphics item for an association between two items.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.QtCore import QPointF, QRectF, QLineF
 from PyQt4.QtGui import QGraphicsItem
--- a/Graphics/ClassItem.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Graphics/ClassItem.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing an UML like class item.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.QtGui import QFont, QGraphicsSimpleTextItem, QStyle

 from .UMLItem import UMLModel, UMLItem
@@ -28,7 +30,7 @@
         @param attributes list of attribute names of the class
             (list of strings)
         """
-        super().__init__(name)
+        super(ClassModel, self).__init__(name)

         self.methods = methods
         self.attributes = attributes
--- a/Graphics/GraphicsUtilities.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Graphics/GraphicsUtilities.py	Mon Mar 25 03:11:06 2013 +0100
@@ -8,6 +8,8 @@
 """


+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 class RecursionError(OverflowError, ValueError):
     """
     Unable to calculate result because of recursive structure.
--- a/Graphics/ImportsDiagramBuilder.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Graphics/ImportsDiagramBuilder.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing a dialog showing an imports diagram of a package.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 import glob
 import os

@@ -37,7 +39,7 @@
         @keyparam showExternalImports flag indicating to show exports from outside
             the package (boolean)
         """
-        super().__init__(dialog, view, project)
+        super(ImportsDiagramBuilder, self).__init__(dialog, view, project)
         self.setObjectName("ImportsDiagram")

         self.showExternalImports = showExternalImports
--- a/Graphics/ModuleItem.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Graphics/ModuleItem.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing a module item.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.QtGui import QFont, QGraphicsSimpleTextItem, QStyle

 from .UMLItem import UMLModel, UMLItem
@@ -23,7 +25,7 @@
         @param name the module name (string)
         @param classlist list of class names (list of strings)
         """
-        super().__init__(name)
+        super(ModuleModel, self).__init__(name)

         self.classlist = classlist
--- a/Graphics/PackageDiagramBuilder.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Graphics/PackageDiagramBuilder.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing a dialog showing a UML like class diagram of a package.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 import glob
 import os.path
 import itertools
@@ -33,7 +35,7 @@
         @param package name of a python package to be shown (string)
         @keyparam noAttrs flag indicating, that no attributes should be shown (boolean)
         """
-        super().__init__(dialog, view, project)
+        super(PackageDiagramBuilder, self).__init__(dialog, view, project)
         self.setObjectName("PackageDiagram")

         self.package = Utilities.normabspath(package)
--- a/Graphics/PackageItem.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Graphics/PackageItem.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing a package item.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.QtGui import QFont, QGraphicsSimpleTextItem, QStyle

 from .UMLItem import UMLModel, UMLItem
@@ -25,7 +27,7 @@
         @param name package name (string)
         @param moduleslist list of module names (list of strings)
         """
-        super().__init__(name)
+        super(PackageModel, self).__init__(name)

         self.moduleslist = moduleslist
--- a/Graphics/PixmapDiagram.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Graphics/PixmapDiagram.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing a dialog showing a pixmap.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.QtCore import Qt, QSize, QEvent
 from PyQt4.QtGui import QLabel, QPalette, QSizePolicy, QScrollArea, QAction, QMenu, \
     QToolBar, QImage, QPixmap, QPrinter, QPrintDialog, QPainter, QFont, QColor
@@ -41,7 +43,7 @@
         @param parent parent widget of the view (QWidget)
         @param name name of the view widget (string)
         """
-        super().__init__(parent)
+        super(PixmapDiagram, self).__init__(parent)
         if name:
             self.setObjectName(name)
         else:
@@ -186,7 +188,7 @@
             evt.accept()
             return

-        super().wheelEvent(evt)
+        super(PixmapDiagram, self).wheelEvent(evt)

     def event(self, evt):
         """
@@ -199,7 +201,7 @@
             self.gestureEvent(evt)
             return True

-        return super().event(evt)
+        return super(PixmapDiagram, self).event(evt)

     def gestureEvent(self, evt):
         """
--- a/Graphics/SvgDiagram.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Graphics/SvgDiagram.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing a dialog showing a SVG graphic.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.QtCore import Qt, QSize, QEvent
 from PyQt4.QtGui import QPalette, QSizePolicy, QScrollArea, QAction, QMenu, QToolBar, \
     QPrinter, QPrintDialog, QPainter, QFont, QColor
@@ -41,7 +43,7 @@
         @param parent parent widget of the view (QWidget)
         @param name name of the view widget (string)
         """
-        super().__init__(parent)
+        super(SvgDiagram, self).__init__(parent)
         if name:
             self.setObjectName(name)
         else:
@@ -160,7 +162,7 @@
             evt.accept()
             return

-        super().wheelEvent(evt)
+        super(SvgDiagram, self).wheelEvent(evt)

     def event(self, evt):
         """
@@ -173,7 +175,7 @@
             self.gestureEvent(evt)
             return True

-        return super().event(evt)
+        return super(SvgDiagram, self).event(evt)

     def gestureEvent(self, evt):
         """
--- a/Graphics/UMLClassDiagramBuilder.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Graphics/UMLClassDiagramBuilder.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing a dialog showing a UML like class diagram.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 import itertools

 from PyQt4.QtGui import QGraphicsTextItem
@@ -31,7 +33,7 @@
         @param file file name of a python module to be shown (string)
         @keyparam noAttrs flag indicating, that no attributes should be shown (boolean)
         """
-        super().__init__(dialog, view, project)
+        super(UMLClassDiagramBuilder, self).__init__(dialog, view, project)
         self.setObjectName("UMLClassDiagramBuilder")

         self.file = file
--- a/Graphics/UMLDiagramBuilder.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Graphics/UMLDiagramBuilder.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing the UML diagram builder base class.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.QtCore import QObject


@@ -22,7 +24,7 @@
         @param view reference to the view object (UMLGraphicsView)
         @param project reference to the project object (Project)
         """
-        super().__init__(dialog)
+        super(UMLDiagramBuilder, self).__init__(dialog)

         self.umlView = view
         self.scene = self.umlView.scene()
--- a/Graphics/UMLDialog.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Graphics/UMLDialog.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing a dialog showing UML like diagrams.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.QtCore import Qt, QFileInfo
 from PyQt4.QtGui import QAction, QToolBar, QGraphicsScene

@@ -42,7 +44,7 @@
         @keyparam initBuilder flag indicating to initialize the diagram builder (boolean)
         @param kwargs diagram specific data
         """
-        super().__init__(parent)
+        super(UMLDialog, self).__init__(parent)
         self.setObjectName("UMLDialog")

         self.__diagramType = diagramType
@@ -139,7 +141,7 @@
         """
         if not fromFile and self.builder:
             self.builder.buildDiagram()
-        super().show()
+        super(UMLDialog, self).show()

     def __relayout(self):
         """
--- a/Graphics/UMLGraphicsView.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Graphics/UMLGraphicsView.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing a subclass of E5GraphicsView for our diagrams.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.QtCore import pyqtSignal, Qt, QSignalMapper, QFileInfo, QEvent, QRectF
 from PyQt4.QtGui import QGraphicsView, QAction, QToolBar, QDialog, QPrinter, QPrintDialog

@@ -312,7 +314,7 @@
         @param limit flag indicating to limit the scene to the
             initial size (boolean)
         """
-        super().autoAdjustSceneSize(limit=limit)
+        super(UMLGraphicsView, self).autoAdjustSceneSize(limit=limit)
         self.__checkSizeActions()

     def saveImage(self):
@@ -342,7 +344,7 @@
                 if not res:
                     return

-            success = super().saveImage(fname, QFileInfo(fname).suffix().upper())
+            success = super(UMLGraphicsView, self).saveImage(fname, QFileInfo(fname).suffix().upper())
             if not success:
                 E5MessageBox.critical(self,
                     self.trUtf8("Save Diagram"),
@@ -409,7 +411,7 @@

         printDialog = QPrintDialog(printer, self)
         if printDialog.exec_():
-            super().printDiagram(printer, self.diagramName)
+            super(UMLGraphicsView, self).printDiagram(printer, self.diagramName)

     def printPreviewDiagram(self):
         """
@@ -444,7 +446,7 @@
         """
         Private slot to generate a print preview.
         """
-        super().printDiagram(printer, self.diagramName)
+        super(UMLGraphicsView, self).printDiagram(printer, self.diagramName)

     def setDiagramName(self, name):
         """
@@ -572,7 +574,7 @@
                 evt.accept()
                 return

-        super().keyPressEvent(evt)
+        super(UMLGraphicsView, self).keyPressEvent(evt)

     def wheelEvent(self, evt):
         """
@@ -588,7 +590,7 @@
             evt.accept()
             return

-        super().wheelEvent(evt)
+        super(UMLGraphicsView, self).wheelEvent(evt)

     def event(self, evt):
         """
@@ -601,7 +603,7 @@
             self.gestureEvent(evt)
             return True

-        return super().event(evt)
+        return super(UMLGraphicsView, self).event(evt)

     def gestureEvent(self, evt):
         """
--- a/Graphics/UMLItem.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Graphics/UMLItem.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing the UMLItem base class.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.QtCore import Qt, QSizeF
 from PyQt4.QtGui import QGraphicsItem, QGraphicsRectItem, QStyle

@@ -50,7 +52,7 @@
         @param rounded flag indicating a rounded corner (boolean)
         @keyparam parent reference to the parent object (QGraphicsItem)
         """
-        super().__init__(parent)
+        super(UMLItem, self).__init__(parent)
         self.model = model

         self.font = Preferences.getGraphics("Font")
@@ -139,7 +141,7 @@
         @param dx relative movement in x-direction (float)
         @param dy relative movement in y-direction (float)
         """
-        super().moveBy(dx, dy)
+        super(UMLItem, self).moveBy(dx, dy)
         self.adjustAssociations()

     def setPos(self, x, y):
@@ -149,7 +151,7 @@
         @param x absolute x-position (float)
         @param y absolute y-position (float)
         """
-        super().setPos(x, y)
+        super(UMLItem, self).setPos(x, y)
         self.adjustAssociations()

     def itemChange(self, change, value):
--- a/Graphics/UMLSceneSizeDialog.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Graphics/UMLSceneSizeDialog.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing a dialog to set the scene sizes.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.QtGui import QDialog

 from .Ui_UMLSceneSizeDialog import Ui_UMLSceneSizeDialog
@@ -27,7 +29,7 @@
         @param parent parent widget of this dialog (QWidget)
         @param name name of this widget (string)
         """
-        super().__init__(parent)
+        super(UMLSceneSizeDialog, self).__init__(parent)
         if name:
             self.setObjectName(name)
         self.setupUi(self)
--- a/Helpviewer/AdBlock/AdBlockAccessHandler.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Helpviewer/AdBlock/AdBlockAccessHandler.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing a scheme access handler for AdBlock URLs.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.QtCore import QUrl
 from PyQt4.QtNetwork import QNetworkAccessManager
--- a/Helpviewer/AdBlock/AdBlockBlockedNetworkReply.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Helpviewer/AdBlock/AdBlockBlockedNetworkReply.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing a QNetworkReply subclass reporting a blocked request.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.QtCore import QTimer
 from PyQt4.QtNetwork import QNetworkReply, QNetworkAccessManager

@@ -24,7 +26,7 @@
         @param rule matching rule (AdBlockRule)
         @param parent reference to the parent object (QObject)
         """
-        super().__init__(parent)
+        super(AdBlockBlockedNetworkReply, self).__init__(parent)
         self.setOperation(QNetworkAccessManager.GetOperation)
         self.setRequest(request)
         self.setUrl(request.url())
--- a/Helpviewer/AdBlock/AdBlockDialog.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Helpviewer/AdBlock/AdBlockDialog.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing the AdBlock configuration dialog.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.QtCore import pyqtSlot, QTimer, QCoreApplication
 from PyQt4.QtGui import QDialog, QMenu, QToolButton

@@ -26,7 +28,7 @@
         """
         Constructor
         """
-        super().__init__(parent)
+        super(AdBlockDialog, self).__init__(parent)
         self.setupUi(self)

         self.iconLabel.setPixmap(UI.PixmapCache.getPixmap("adBlockPlus48.png"))
--- a/Helpviewer/AdBlock/AdBlockExceptionsDialog.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Helpviewer/AdBlock/AdBlockExceptionsDialog.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing a dialog to configure the AdBlock exceptions.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.QtCore import pyqtSlot
 from PyQt4.QtGui import QDialog

@@ -25,7 +27,7 @@

         @param parent reference to the parent widget (QWidget)
         """
-        super().__init__(parent)
+        super(AdBlockExceptionsDialog, self).__init__(parent)
         self.setupUi(self)

         self.iconLabel.setPixmap(UI.PixmapCache.getPixmap("adBlockPlusGreen48.png"))
@@ -88,4 +90,4 @@
         import Helpviewer.HelpWindow
         Helpviewer.HelpWindow.HelpWindow.adBlockManager().setExceptions(hosts)

-        super().accept()
+        super(AdBlockExceptionsDialog, self).accept()
--- a/Helpviewer/AdBlock/AdBlockIcon.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Helpviewer/AdBlock/AdBlockIcon.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing the AdBlock icon for the main window status bar.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.QtCore import Qt
 from PyQt4.QtGui import QAction, QMenu

@@ -25,7 +27,7 @@

         @param parent reference to the parent widget (HelpWindow)
         """
-        super().__init__(parent)
+        super(AdBlockIcon, self).__init__(parent)

         self.__mw = parent
         self.__menuAction = None
--- a/Helpviewer/AdBlock/AdBlockManager.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Helpviewer/AdBlock/AdBlockManager.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing the AdBlock manager.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 import os

 from PyQt4.QtCore import pyqtSignal, QObject, QUrl, QFile
@@ -33,7 +35,7 @@

         @param parent reference to the parent object (QObject)
         """
-        super().__init__(parent)
+        super(AdBlockManager, self).__init__(parent)

         self.__loaded = False
         self.__subscriptionsLoaded = False
--- a/Helpviewer/AdBlock/AdBlockNetwork.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Helpviewer/AdBlock/AdBlockNetwork.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing the network block class.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.QtCore import QObject, QUrl
 from PyQt4.QtNetwork import QNetworkRequest
--- a/Helpviewer/AdBlock/AdBlockPage.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Helpviewer/AdBlock/AdBlockPage.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing a class to apply AdBlock rules to a web page.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.QtCore import QObject, QUrl
--- a/Helpviewer/AdBlock/AdBlockRule.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Helpviewer/AdBlock/AdBlockRule.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing the AdBlock rule class.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 import re

 from PyQt4.QtCore import Qt, QRegExp, QUrl, qVersion
--- a/Helpviewer/AdBlock/AdBlockSubscription.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Helpviewer/AdBlock/AdBlockSubscription.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing the AdBlock subscription class.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 import os
 import re
 import hashlib
@@ -43,7 +45,7 @@
         @param parent reference to the parent object (QObject)
         @param default flag indicating a default subscription (boolean)
         """
-        super().__init__(parent)
+        super(AdBlockSubscription, self).__init__(parent)

         self.__custom = custom
         self.__url = url.toEncoded()
--- a/Helpviewer/AdBlock/AdBlockTreeWidget.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Helpviewer/AdBlock/AdBlockTreeWidget.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing a tree widget for the AdBlock configuration dialog.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.QtCore import Qt
 from PyQt4.QtGui import QAbstractItemView, QFont, QTreeWidgetItem, QInputDialog, \
     QLineEdit, QMenu, QApplication, QColor
@@ -25,7 +27,7 @@
         @param subscription reference to the subscription (AdBlockSubscription)
         @param parenbt reference to the parent widget (QWidget)
         """
-        super().__init__(parent)
+        super(AdBlockTreeWidget, self).__init__(parent)

         self.__subscription = subscription
         self.__topItem = None
@@ -266,4 +268,4 @@
         elif evt.key() == Qt.Key_Delete:
             self.removeRule()
         else:
-            super().keyPressEvent(evt)
+            super(AdBlockTreeWidget, self).keyPressEvent(evt)
--- a/Helpviewer/Bookmarks/AddBookmarkDialog.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Helpviewer/Bookmarks/AddBookmarkDialog.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing a dialog to add a bookmark or a bookmark folder.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.QtCore import QModelIndex
 from PyQt4.QtGui import QSortFilterProxyModel, QDialog, QTreeView

@@ -23,7 +25,7 @@

         @param parent reference to the parent object (QObject)
         """
-        super().__init__(parent)
+        super(AddBookmarkProxyModel, self).__init__(parent)

     def columnCount(self, parent):
         """
@@ -78,7 +80,7 @@
         @param bookmarksManager reference to the bookmarks manager
             object (BookmarksManager)
         """
-        super().__init__(parent)
+        super(AddBookmarkDialog, self).__init__(parent)
         self.setupUi(self)

         self.__bookmarksManager = bookmarksManager
@@ -219,7 +221,7 @@
         """
         if (not self.__addFolder and not self.addressEdit.text()) or \
            not self.nameEdit.text():
-            super().accept()
+            super(AddBookmarkDialog, self).accept()
             return

         from .BookmarkNode import BookmarkNode
@@ -242,4 +244,4 @@
         self.__bookmarksManager.addBookmark(parent, bookmark)
         self.__addedNode = bookmark

-        super().accept()
+        super(AddBookmarkDialog, self).accept()
--- a/Helpviewer/Bookmarks/BookmarkNode.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Helpviewer/Bookmarks/BookmarkNode.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing the bookmark node.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.QtCore import QDateTime
--- a/Helpviewer/Bookmarks/BookmarkPropertiesDialog.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Helpviewer/Bookmarks/BookmarkPropertiesDialog.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing a dialog to show and edit bookmark properties.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.QtGui import QDialog

 from .Ui_BookmarkPropertiesDialog import Ui_BookmarkPropertiesDialog
@@ -22,7 +24,7 @@

         @param parent reference to the parent widget (QWidget)
         """
-        super().__init__(parent)
+        super(BookmarkPropertiesDialog, self).__init__(parent)
         self.setupUi(self)

         from .BookmarkNode import BookmarkNode
@@ -44,7 +46,7 @@
         if (self.__node.type() == BookmarkNode.Bookmark and \
             not self.addressEdit.text()) or \
            not self.nameEdit.text():
-            super().accept()
+            super(BookmarkPropertiesDialog, self).accept()
             return

         import Helpviewer.HelpWindow
@@ -61,4 +63,4 @@
             self.__node.desc = description
             bookmarksManager.setNodeChanged(self.__node)

-        super().accept()
+        super(BookmarkPropertiesDialog, self).accept()
--- a/Helpviewer/Bookmarks/BookmarksDialog.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Helpviewer/Bookmarks/BookmarksDialog.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing a dialog to manage bookmarks.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.QtCore import pyqtSignal, Qt, QUrl, QModelIndex
 from PyQt4.QtGui import QDialog, QFontMetrics, QMenu, QCursor, QApplication

@@ -32,7 +34,7 @@
         @param parent reference to the parent widget (QWidget
         @param manager reference to the bookmarks manager object (BookmarksManager)
         """
-        super().__init__(parent)
+        super(BookmarksDialog, self).__init__(parent)
         self.setupUi(self)

         self.__bookmarksManager = manager
@@ -77,7 +79,7 @@
         Protected method called when the dialog is rejected.
         """
         self.__shutdown()
-        super().reject()
+        super(BookmarksDialog, self).reject()

     def __shutdown(self):
         """
--- a/Helpviewer/Bookmarks/BookmarksImportDialog.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Helpviewer/Bookmarks/BookmarksImportDialog.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing a dialog for importing bookmarks from other sources.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 import os

 from PyQt4.QtCore import pyqtSlot, Qt, QSize
@@ -34,7 +36,7 @@

         @param parent reference to the parent widget (QWidget)
         """
-        super().__init__(parent)
+        super(BookmarksImportDialog, self).__init__(parent)
         self.setupUi(self)

         self.sourcesList.setIconSize(QSize(48, 48))
--- a/Helpviewer/Bookmarks/BookmarksImporters/BookmarksImporter.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Helpviewer/Bookmarks/BookmarksImporters/BookmarksImporter.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing a base class for the bookmarks importers.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.QtCore import QObject


@@ -21,7 +23,7 @@
         @param id source ID (string)
         @param parent reference to the parent object (QObject)
         """
-        super().__init__(parent)
+        super(BookmarksImporter, self).__init__(parent)

         self._path = ""
         self._file = ""
--- a/Helpviewer/Bookmarks/BookmarksImporters/ChromeImporter.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Helpviewer/Bookmarks/BookmarksImporters/ChromeImporter.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing an importer for Chrome bookmarks.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 import os
 import json

@@ -78,7 +80,7 @@
         @param id source ID (string)
         @param parent reference to the parent object (QObject)
         """
-        super().__init__(id, parent)
+        super(ChromeImporter, self).__init__(id, parent)

         self.__fileName = ""
--- a/Helpviewer/Bookmarks/BookmarksImporters/FirefoxImporter.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Helpviewer/Bookmarks/BookmarksImporters/FirefoxImporter.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing an importer for Firefox bookmarks.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 import os
 import sqlite3

@@ -61,7 +63,7 @@
         @param id source ID (string)
         @param parent reference to the parent object (QObject)
         """
-        super().__init__(id, parent)
+        super(FirefoxImporter, self).__init__(id, parent)

         self.__fileName = ""
         self.__db = None
--- a/Helpviewer/Bookmarks/BookmarksImporters/HtmlImporter.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Helpviewer/Bookmarks/BookmarksImporters/HtmlImporter.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing an importer for HTML bookmark files.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 import os

 from PyQt4.QtCore import QCoreApplication, QDate, Qt
@@ -52,7 +54,7 @@
         @param id source ID (string)
         @param parent reference to the parent object (QObject)
         """
-        super().__init__(id, parent)
+        super(HtmlImporter, self).__init__(id, parent)

         self.__fileName = ""
         self.__inFile = None
--- a/Helpviewer/Bookmarks/BookmarksImporters/IExplorerImporter.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Helpviewer/Bookmarks/BookmarksImporters/IExplorerImporter.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing an importer for Internet Explorer bookmarks.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 import os

 from PyQt4.QtCore import QCoreApplication, QDate, Qt
@@ -57,7 +59,7 @@
         @param id source ID (string)
         @param parent reference to the parent object (QObject)
         """
-        super().__init__(id, parent)
+        super(IExplorerImporter, self).__init__(id, parent)

         self.__fileName = ""
--- a/Helpviewer/Bookmarks/BookmarksImporters/OperaImporter.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Helpviewer/Bookmarks/BookmarksImporters/OperaImporter.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing an importer for Opera bookmarks.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 import os

 from PyQt4.QtCore import QCoreApplication, QDate, Qt
@@ -59,7 +61,7 @@
         @param id source ID (string)
         @param parent reference to the parent object (QObject)
         """
-        super().__init__(id, parent)
+        super(OperaImporter, self).__init__(id, parent)

         self.__fileName = ""
--- a/Helpviewer/Bookmarks/BookmarksImporters/SafariImporter.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Helpviewer/Bookmarks/BookmarksImporters/SafariImporter.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing an importer for Apple Safari bookmarks.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 import os

 from PyQt4.QtCore import QCoreApplication, QDate, Qt
@@ -61,7 +63,7 @@
         @param id source ID (string)
         @param parent reference to the parent object (QObject)
         """
-        super().__init__(id, parent)
+        super(SafariImporter, self).__init__(id, parent)

         self.__fileName = ""
--- a/Helpviewer/Bookmarks/BookmarksImporters/XbelImporter.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Helpviewer/Bookmarks/BookmarksImporters/XbelImporter.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing an importer for XBEL files.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 import os

 from PyQt4.QtCore import QCoreApplication, QXmlStreamReader, QDate, Qt
@@ -85,7 +87,7 @@
         @param id source ID (string)
         @param parent reference to the parent object (QObject)
         """
-        super().__init__(id, parent)
+        super(XbelImporter, self).__init__(id, parent)

         self.__fileName = ""
--- a/Helpviewer/Bookmarks/BookmarksImporters/__init__.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Helpviewer/Bookmarks/BookmarksImporters/__init__.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Package implementing bookmarks importers for various sources.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.QtCore import QCoreApplication

 import UI.PixmapCache
--- a/Helpviewer/Bookmarks/BookmarksManager.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Helpviewer/Bookmarks/BookmarksManager.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing the bookmarks manager.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 import os

 from PyQt4.QtCore import pyqtSignal, Qt, QT_TRANSLATE_NOOP, QObject, QFile, QByteArray, \
@@ -52,7 +54,7 @@

         @param parent reference to the parent object (QObject)
         """
-        super().__init__(parent)
+        super(BookmarksManager, self).__init__(parent)

         self.__saveTimer = AutoSaver(self, self.save)
         self.entryAdded.connect(self.__saveTimer.changeOccurred)
@@ -506,7 +508,7 @@
         @param parent reference to the parent node (BookmarkNode)
         @param row row number of bookmark (integer)
         """
-        super().__init__(
+        super(RemoveBookmarksCommand, self).__init__(
             QApplication.translate("BookmarksManager", "Remove Bookmark"))

         self._row = row
@@ -576,7 +578,7 @@
         @param title flag indicating a change of the title (True) or
             the URL (False) (boolean)
         """
-        super().__init__()
+        super(ChangeBookmarkCommand, self).__init__()

         self._bookmarksManager = bookmarksManager
         self._title = title
--- a/Helpviewer/Bookmarks/BookmarksMenu.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Helpviewer/Bookmarks/BookmarksMenu.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing the bookmarks menu.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.QtCore import pyqtSignal, Qt, QUrl
 from PyQt4.QtGui import QMenu, QCursor
--- a/Helpviewer/Bookmarks/BookmarksModel.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Helpviewer/Bookmarks/BookmarksModel.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing the bookmark model class.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.QtCore import Qt, QAbstractItemModel, QModelIndex, QUrl, QByteArray, \
     QDataStream, QIODevice, QBuffer, QMimeData

@@ -31,7 +33,7 @@
         @param manager reference to the bookmark manager object (BookmarksManager)
         @param parent reference to the parent object (QObject)
         """
-        super().__init__(parent)
+        super(BookmarksModel, self).__init__(parent)

         self.__endMacro = False
         self.__bookmarksManager = manager
--- a/Helpviewer/Bookmarks/BookmarksToolBar.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Helpviewer/Bookmarks/BookmarksToolBar.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing a tool bar showing bookmarks.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.QtCore import pyqtSignal, Qt, QUrl
 from PyQt4.QtGui import QMenu, QApplication, QCursor
 from PyQt4.QtWebKit import QWebPage
--- a/Helpviewer/Bookmarks/DefaultBookmarks.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Helpviewer/Bookmarks/DefaultBookmarks.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module defining the default bookmarks.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 DefaultBookmarks = """<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE xbel>
 <xbel version="1.0">
--- a/Helpviewer/Bookmarks/NsHtmlReader.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Helpviewer/Bookmarks/NsHtmlReader.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,12 @@
 Module implementing a class to read Netscape HTML bookmark files.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+try:
+    str = unicode
+except (NameError):
+    pass
+
 from PyQt4.QtCore import QObject, QIODevice, QFile, QRegExp, Qt, QDateTime

 from .BookmarkNode import BookmarkNode
@@ -24,7 +30,7 @@
         """
         Constructor
         """
-        super().__init__()
+        super(NsHtmlReader, self).__init__()

         self.__folderRx = QRegExp("<DT><H3(.*)>(.*)</H3>", Qt.CaseInsensitive)
         self.__folderRx.setMinimal(True)
--- a/Helpviewer/Bookmarks/NsHtmlWriter.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Helpviewer/Bookmarks/NsHtmlWriter.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing a class to write Netscape HTML bookmark files.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.QtCore import QObject, QIODevice, QFile

 from .BookmarkNode import BookmarkNode
@@ -24,7 +26,7 @@
         """
         Constructor
         """
-        super().__init__()
+        super(NsHtmlWriter, self).__init__()

     def write(self, fileNameOrDevice, root):
         """
--- a/Helpviewer/Bookmarks/XbelReader.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Helpviewer/Bookmarks/XbelReader.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing a class to read XBEL bookmark files.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.QtCore import QXmlStreamReader, QXmlStreamEntityResolver, QIODevice, \
     QFile, QCoreApplication, QXmlStreamNamespaceDeclaration, QDateTime, Qt

@@ -37,7 +39,7 @@
         """
         Constructor
         """
-        super().__init__()
+        super(XbelReader, self).__init__()

         self.__resolver = XmlEntityResolver()
         self.setEntityResolver(self.__resolver)
--- a/Helpviewer/Bookmarks/XbelWriter.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Helpviewer/Bookmarks/XbelWriter.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing a class to write XBEL bookmark files.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.QtCore import QXmlStreamWriter, QIODevice, QFile, Qt

 from .BookmarkNode import BookmarkNode
@@ -20,7 +22,7 @@
         """
         Constructor
         """
-        super().__init__()
+        super(XbelWriter, self).__init__()

         self.setAutoFormatting(True)
--- a/Helpviewer/ClosedTabsManager.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Helpviewer/ClosedTabsManager.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing a class to manage closed tabs.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.QtCore import pyqtSignal, QUrl, QObject
 from PyQt4.QtWebKit import QWebSettings

@@ -53,7 +55,7 @@

         @param parent reference to the parent object (QObject)
         """
-        super().__init__()
+        super(ClosedTabsManager, self).__init__()

         self.__closedTabs = []
--- a/Helpviewer/CookieJar/CookieDetailsDialog.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Helpviewer/CookieJar/CookieDetailsDialog.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing a dialog showing the cookie data.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.QtGui import QDialog

 from .Ui_CookieDetailsDialog import Ui_CookieDetailsDialog
@@ -22,7 +24,7 @@

         @param parent reference to the parent object (QWidget)
         """
-        super().__init__(parent)
+        super(CookieDetailsDialog, self).__init__(parent)
         self.setupUi(self)

     def setData(self, domain, name, path, secure, expires, value):
--- a/Helpviewer/CookieJar/CookieExceptionsModel.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Helpviewer/CookieJar/CookieExceptionsModel.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing the cookie exceptions model.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.QtCore import Qt, QAbstractTableModel, QSize, QModelIndex
 from PyQt4.QtGui import QFont, QFontMetrics

@@ -22,7 +24,7 @@
         @param cookieJar reference to the cookie jar (CookieJar)
         @param parent reference to the parent object (QObject)
         """
-        super().__init__(parent)
+        super(CookieExceptionsModel, self).__init__(parent)

         self.__cookieJar = cookieJar
         self.__allowedCookies = self.__cookieJar.allowedCookies()
--- a/Helpviewer/CookieJar/CookieJar.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Helpviewer/CookieJar/CookieJar.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing a QNetworkCookieJar subclass with various accept policies.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 import os

 from PyQt4.QtCore import pyqtSignal, QByteArray, QDataStream, QIODevice, QSettings, \
@@ -47,7 +49,7 @@

         @param parent reference to the parent object (QObject)
         """
-        super().__init__(parent)
+        super(CookieJar, self).__init__(parent)

         self.__loaded = False
         self.__acceptCookies = self.AcceptOnlyFromSitesNavigatedTo
--- a/Helpviewer/CookieJar/CookieModel.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Helpviewer/CookieJar/CookieModel.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing the cookie model.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.QtCore import Qt, QAbstractTableModel, QSize, QModelIndex
 from PyQt4.QtGui import QFont, QFontMetrics

@@ -22,7 +24,7 @@
         @param cookieJar reference to the cookie jar (CookieJar)
         @param parent reference to the parent object (QObject)
         """
-        super().__init__(parent)
+        super(CookieModel, self).__init__(parent)

         self.__headers = [
             self.trUtf8("Website"),
--- a/Helpviewer/CookieJar/CookiesConfigurationDialog.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Helpviewer/CookieJar/CookiesConfigurationDialog.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing the cookies configuration dialog.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.QtCore import pyqtSlot
 from PyQt4.QtGui import QDialog

@@ -23,7 +25,7 @@
         """
         Constructor
         """
-        super().__init__(parent)
+        super(CookiesConfigurationDialog, self).__init__(parent)
         self.setupUi(self)

         self.__mw = parent
@@ -72,7 +74,7 @@
         jar.setKeepPolicy(keepPolicy)
         jar.setFilterTrackingCookies(self.filterTrackingCookiesCheckbox.isChecked())

-        super().accept()
+        super(CookiesConfigurationDialog, self).accept()

     @pyqtSlot()
     def on_exceptionsButton_clicked(self):
--- a/Helpviewer/CookieJar/CookiesDialog.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Helpviewer/CookieJar/CookiesDialog.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing a dialog to show all cookies.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.QtCore import pyqtSlot, Qt, QDateTime, QByteArray
 from PyQt4.QtGui import QDialog, QFont, QFontMetrics, QSortFilterProxyModel

@@ -26,7 +28,7 @@
         @param cookieJar reference to the cookie jar (CookieJar)
         @param parent reference to the parent widget (QWidget)
         """
-        super().__init__(parent)
+        super(CookiesDialog, self).__init__(parent)
         self.setupUi(self)

         self.addButton.setEnabled(False)
--- a/Helpviewer/CookieJar/CookiesExceptionsDialog.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Helpviewer/CookieJar/CookiesExceptionsDialog.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing a dialog for the configuration of cookie exceptions.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.QtCore import pyqtSlot
 from PyQt4.QtGui import QDialog, QSortFilterProxyModel, QCompleter, QFont, QFontMetrics

@@ -27,7 +29,7 @@
         @param cookieJar reference to the cookie jar (CookieJar)
         @param parent reference to the parent widget (QWidget)
         """
-        super().__init__(parent)
+        super(CookiesExceptionsDialog, self).__init__(parent)
         self.setupUi(self)

         self.__cookieJar = cookieJar
--- a/Helpviewer/Download/DownloadAskActionDialog.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Helpviewer/Download/DownloadAskActionDialog.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing a dialog to ask for a download action.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.QtGui import QDialog

 from .Ui_DownloadAskActionDialog import Ui_DownloadAskActionDialog
@@ -24,7 +26,7 @@

         @param parent reference to the parent widget (QWidget)
         """
-        super().__init__(parent)
+        super(DownloadAskActionDialog, self).__init__(parent)
         self.setupUi(self)

         self.infoLabel.setText("<b>{0}</b>".format(fileName))
--- a/Helpviewer/Download/DownloadItem.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Helpviewer/Download/DownloadItem.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,12 @@
 Module implementing a widget controlling a download.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+try:
+    str = unicode
+except (NameError):
+    pass
+
 from PyQt4.QtCore import pyqtSlot, pyqtSignal, Qt, QTime, QFile, QFileInfo, QUrl, \
     QIODevice, QCryptographicHash
 from PyQt4.QtGui import QWidget, QPalette, QStyle, QDesktopServices, QDialog
@@ -51,7 +57,7 @@
         @keyparam parent reference to the parent widget (QWidget)
         @keyparam mainWindow reference to the main window (HelpWindow)
         """
-        super().__init__(parent)
+        super(DownloadItem, self).__init__(parent)
         self.setupUi(self)

         p = self.infoLabel.palette()
--- a/Helpviewer/Download/DownloadManager.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Helpviewer/Download/DownloadManager.py	Mon Mar 25 03:11:06 2013 +0100
@@ -4,6 +4,8 @@
 Module implementing the download manager class.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.QtCore import pyqtSlot, Qt, QModelIndex, QFileInfo
 from PyQt4.QtGui import QDialog, QStyle, QFileIconProvider, QMenu, QCursor, QApplication
 from PyQt4.QtNetwork import QNetworkRequest
@@ -36,7 +38,7 @@

         @param parent reference to the parent widget (QWidget)
         """
-        super().__init__(parent)
+        super(DownloadManager, self).__init__(parent)
         self.setupUi(self)

         self.__saveTimer = AutoSaver(self, self.save)
--- a/Helpviewer/Download/DownloadModel.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Helpviewer/Download/DownloadModel.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing the download model.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.QtCore import Qt, QAbstractListModel, QModelIndex, QMimeData, QUrl


@@ -21,7 +23,7 @@
         @param manager reference to the download manager (DownloadManager)
         @param parent reference to the parent object (QObject)
         """
-        super().__init__(parent)
+        super(DownloadModel, self).__init__(parent)

         self.__manager = manager
--- a/Helpviewer/Download/DownloadUtilities.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Helpviewer/Download/DownloadUtilities.py	Mon Mar 25 03:11:06 2013 +0100
@@ -3,6 +3,8 @@
 # Copyright (c) 2010 - 2013 Detlev Offenbach <detlev@die-offenbachs.de>
 #

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.QtCore import QCoreApplication
--- a/Helpviewer/Feeds/FeedEditDialog.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Helpviewer/Feeds/FeedEditDialog.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing a dialog to edit feed data.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.QtCore import pyqtSlot, QUrl
 from PyQt4.QtGui import QDialog, QDialogButtonBox

@@ -23,7 +25,7 @@

         @param parent reference to the parent widget (QWidget)
         """
-        super().__init__(parent)
+        super(FeedEditDialog, self).__init__(parent)
         self.setupUi(self)

         self.buttonBox.button(QDialogButtonBox.Ok).setEnabled(False)
--- a/Helpviewer/Feeds/FeedsDialog.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Helpviewer/Feeds/FeedsDialog.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing a dialog to add RSS feeds.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.QtCore import QUrl
 from PyQt4.QtGui import QDialog, QPushButton, QLabel

@@ -29,7 +31,7 @@
         @param browser reference to the browser widget (HelpBrowser)
         @param parent reference to the parent widget (QWidget)
         """
-        super().__init__(parent)
+        super(FeedsDialog, self).__init__(parent)
         self.setupUi(self)

         self.iconLabel.setPixmap(UI.PixmapCache.getPixmap("rss48.png"))
--- a/Helpviewer/Feeds/FeedsManager.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Helpviewer/Feeds/FeedsManager.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,12 @@
 Module implementing a RSS feeds manager dialog.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+try:
+    str = unicode
+except (NameError):
+    pass
+
 from PyQt4.QtCore import pyqtSlot, pyqtSignal, Qt, QUrl, QXmlStreamReader
 from PyQt4.QtGui import QDialog, QIcon, QTreeWidgetItem, QMenu, QCursor, QApplication
 from PyQt4.QtNetwork import QNetworkRequest, QNetworkReply
@@ -39,7 +45,7 @@

         @param parent reference to the parent widget (QWidget)
         """
-        super().__init__(parent)
+        super(FeedsManager, self).__init__(parent)
         self.setupUi(self)

         self.__wasShown = False
@@ -57,7 +63,7 @@
         """
         Public slot to show the feeds manager dialog.
         """
-        super().show()
+        super(FeedsManager, self).show()

         if not self.__wasShown:
             self.__enableButtons()
--- a/Helpviewer/GreaseMonkey/GreaseMonkeyAddScriptDialog.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Helpviewer/GreaseMonkey/GreaseMonkeyAddScriptDialog.py	Mon Mar 25 03:11:06 2013 +0100
@@ -8,6 +8,8 @@
 Module implementing a dialog for adding GreaseMonkey scripts..
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 import os

 from PyQt4.QtCore import pyqtSlot, QDir, QFile
@@ -32,7 +34,7 @@
         @param script GreaseMonkey script to be added (GreaseMonkeyScript)
         @param parent reference to the parent widget (QWidget)
         """
-        super().__init__(parent)
+        super(GreaseMonkeyAddScriptDialog, self).__init__(parent)
         self.setupUi(self)

         self.iconLabel.setPixmap(UI.PixmapCache.getPixmap("greaseMonkey48.png"))
--- a/Helpviewer/GreaseMonkey/GreaseMonkeyConfiguration/GreaseMonkeyConfigurationDialog.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Helpviewer/GreaseMonkey/GreaseMonkeyConfiguration/GreaseMonkeyConfigurationDialog.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing the GreaseMonkey scripts configuration dialog.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.QtCore import pyqtSlot, Qt, QUrl
 from PyQt4.QtGui import QDialog, QListWidgetItem, QDesktopServices

@@ -31,7 +33,7 @@

         @param parent reference to the parent widget (QWidget)
         """
-        super().__init__(parent)
+        super(GreaseMonkeyConfigurationDialog, self).__init__(parent)
         self.setupUi(self)

         self.iconLabel.setPixmap(UI.PixmapCache.getPixmap("greaseMonkey48.png"))
--- a/Helpviewer/GreaseMonkey/GreaseMonkeyConfiguration/GreaseMonkeyConfigurationListDelegate.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Helpviewer/GreaseMonkey/GreaseMonkeyConfiguration/GreaseMonkeyConfigurationListDelegate.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing a delegate for the special list widget for GreaseMonkey scripts.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.QtCore import Qt, QSize, QRect
 from PyQt4.QtGui import QStyle, QStyledItemDelegate, QApplication, QFontMetrics, \
     QPalette, QFont, QStyleOptionViewItemV4
@@ -31,7 +33,7 @@

         @param parent reference to the parent object (QObject)
         """
-        super().__init__(parent)
+        super(GreaseMonkeyConfigurationListDelegate, self).__init__(parent)

         self.__removePixmap = UI.PixmapCache.getIcon("greaseMonkeyTrash.png").pixmap(
             GreaseMonkeyConfigurationListDelegate.RemoveIconSize)
--- a/Helpviewer/GreaseMonkey/GreaseMonkeyConfiguration/GreaseMonkeyConfigurationListWidget.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Helpviewer/GreaseMonkey/GreaseMonkeyConfiguration/GreaseMonkeyConfigurationListWidget.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing a special list widget for GreaseMonkey scripts.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.QtCore import pyqtSignal, QRect
 from PyQt4.QtGui import QListWidget, QListWidgetItem

@@ -25,7 +27,7 @@

         @param parent reference to the parent widget (QWidget)
         """
-        super().__init__(parent)
+        super(GreaseMonkeyConfigurationListWidget, self).__init__(parent)

         self.__delegate = GreaseMonkeyConfigurationListDelegate(self)
         self.setItemDelegate(self.__delegate)
@@ -60,7 +62,7 @@
             self.removeItemRequested.emit(self.itemAt(evt.pos()))
             return

-        super().mousePressEvent(evt)
+        super(GreaseMonkeyConfigurationListWidget, self).mousePressEvent(evt)

     def mouseDoubleClickEvent(self, evt):
         """
@@ -72,4 +74,4 @@
             self.removeItemRequested.emit(self.itemAt(evt.pos()))
             return

-        super().mouseDoubleClickEvent(evt)
+        super(GreaseMonkeyConfigurationListWidget, self).mouseDoubleClickEvent(evt)
--- a/Helpviewer/GreaseMonkey/GreaseMonkeyConfiguration/GreaseMonkeyConfigurationScriptInfoDialog.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Helpviewer/GreaseMonkey/GreaseMonkeyConfiguration/GreaseMonkeyConfigurationScriptInfoDialog.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing a dialog to show GreaseMonkey script information.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.QtCore import pyqtSlot
 from PyQt4.QtGui import QDialog

@@ -30,7 +32,7 @@
         @param script reference to the script (GreaseMonkeyScript)
         @param parent reference to the parent widget (QWidget)
         """
-        super().__init__(parent)
+        super(GreaseMonkeyConfigurationScriptInfoDialog, self).__init__(parent)
         self.setupUi(self)

         self.iconLabel.setPixmap(UI.PixmapCache.getPixmap("greaseMonkey48.png"))
--- a/Helpviewer/GreaseMonkey/GreaseMonkeyDownloader.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Helpviewer/GreaseMonkey/GreaseMonkeyDownloader.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing the downloader for GreaseMonkey scripts.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 import os

 from PyQt4.QtCore import pyqtSignal, QObject, QSettings, QRegExp, QUrl
@@ -32,7 +34,7 @@
         @param request reference to the request object (QNetworkRequest)
         @param manager reference to the GreaseMonkey manager (GreaseMonkeyManager)
         """
-        super().__init__()
+        super(GreaseMonkeyDownloader, self).__init__()

         self.__manager = manager
--- a/Helpviewer/GreaseMonkey/GreaseMonkeyJavaScript.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Helpviewer/GreaseMonkey/GreaseMonkeyJavaScript.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module containing some JavaScript resources.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 bootstrap_js = """
 if(typeof GM_xmlhttpRequest === "undefined") {
     GM_xmlhttpRequest = function(/* object */ details) {
--- a/Helpviewer/GreaseMonkey/GreaseMonkeyManager.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Helpviewer/GreaseMonkey/GreaseMonkeyManager.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing the manager for GreaseMonkey scripts.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 import os

 from PyQt4.QtCore import pyqtSignal, QObject, QTimer, QFile, QDir, QSettings, QUrl, \
@@ -29,7 +31,7 @@

         @param parent reference to the parent object (QObject)
         """
-        super().__init__(parent)
+        super(GreaseMonkeyManager, self).__init__(parent)

         self.__disabledScripts = []
         self.__endScripts = []
--- a/Helpviewer/GreaseMonkey/GreaseMonkeyScript.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Helpviewer/GreaseMonkey/GreaseMonkeyScript.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing the GreaseMonkey script.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.QtCore import QUrl, QRegExp

 from .GreaseMonkeyUrlMatcher import GreaseMonkeyUrlMatcher
--- a/Helpviewer/GreaseMonkey/GreaseMonkeyUrlMatcher.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Helpviewer/GreaseMonkey/GreaseMonkeyUrlMatcher.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing the GreaseMonkey URL matcher.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 import re

 from PyQt4.QtCore import Qt, QRegExp
--- 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):
         """
--- a/Helpviewer/HelpClearPrivateDataDialog.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Helpviewer/HelpClearPrivateDataDialog.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing a dialog to select which private data to clear.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.QtGui import QDialog

 from .Ui_HelpClearPrivateDataDialog import Ui_HelpClearPrivateDataDialog
@@ -22,7 +24,7 @@

         @param parent reference to the parent widget (QWidget)
         """
-        super().__init__(parent)
+        super(HelpClearPrivateDataDialog, self).__init__(parent)
         self.setupUi(self)

     def getData(self):
--- a/Helpviewer/HelpDocsInstaller.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Helpviewer/HelpDocsInstaller.py	Mon Mar 25 03:11:06 2013 +0100
@@ -8,6 +8,8 @@
 documentation database.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.QtCore import pyqtSignal, QThread, Qt, QMutex, QDateTime, QDir, \
     QLibraryInfo, QFileInfo
 from PyQt4.QtHelp import QHelpEngineCore
@@ -33,7 +35,7 @@

         @param collection full pathname of the collection file (string)
         """
-        super().__init__()
+        super(HelpDocsInstaller, self).__init__()

         self.__abort = False
         self.__collection = collection
--- a/Helpviewer/HelpIndexWidget.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Helpviewer/HelpIndexWidget.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing a window for showing the QtHelp index.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.QtCore import pyqtSignal, Qt, QUrl, QEvent
 from PyQt4.QtGui import QWidget, QVBoxLayout, QLabel, QLineEdit, QMenu, QDialog

@@ -32,7 +34,7 @@
         @param mainWindow reference to the main window object (QMainWindow)
         @param parent reference to the parent widget (QWidget)
         """
-        super().__init__(parent)
+        super(HelpIndexWidget, self).__init__(parent)

         self.__engine = engine
         self.__mw = mainWindow
--- a/Helpviewer/HelpLanguagesDialog.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Helpviewer/HelpLanguagesDialog.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing a dialog to configure the preferred languages.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.QtCore import pyqtSlot, QByteArray, QLocale
 from PyQt4.QtGui import QDialog, QStringListModel

@@ -25,7 +27,7 @@

         @param parent reference to the parent widget (QWidget)
         """
-        super().__init__(parent)
+        super(HelpLanguagesDialog, self).__init__(parent)
         self.setupUi(self)

         self.__model = QStringListModel()
@@ -111,7 +113,7 @@
             Preferences.Prefs.settings.remove("Help/AcceptLanguages")
         else:
             Preferences.Prefs.settings.setValue("Help/AcceptLanguages", result)
-        super().accept()
+        super(HelpLanguagesDialog, self).accept()

     @classmethod
     def httpString(cls, languages):
--- a/Helpviewer/HelpSearchWidget.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Helpviewer/HelpSearchWidget.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing a window for showing the QtHelp index.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.QtCore import pyqtSignal, Qt, QEvent, QUrl
 from PyQt4.QtGui import QWidget, QVBoxLayout, QTextBrowser, QApplication, QMenu

@@ -29,7 +31,7 @@
         @param mainWindow reference to the main window object (QMainWindow)
         @param parent reference to the parent widget (QWidget)
         """
-        super().__init__(parent)
+        super(HelpSearchWidget, self).__init__(parent)

         self.__engine = engine
         self.__mw = mainWindow
--- a/Helpviewer/HelpSnap.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Helpviewer/HelpSnap.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing functions to generate page previews.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.QtCore import QSize, Qt
 from PyQt4.QtGui import QPixmap, QPainter
 from PyQt4.QtWebKit import QWebFrame
--- a/Helpviewer/HelpTabBar.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Helpviewer/HelpTabBar.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing a specialized tab bar for the web browser.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.QtCore import Qt, QPoint, QTimer, QEvent
 from PyQt4.QtGui import QFrame, QLabel
--- a/Helpviewer/HelpTabWidget.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Helpviewer/HelpTabWidget.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing the central widget showing the web pages.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 import os

 from PyQt4.QtCore import pyqtSignal, Qt, QUrl
--- a/Helpviewer/HelpTocWidget.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Helpviewer/HelpTocWidget.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing a window for showing the QtHelp TOC.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.QtCore import pyqtSignal, Qt, QEvent, QUrl
 from PyQt4.QtGui import QWidget, QVBoxLayout, QMenu

@@ -29,7 +31,7 @@
         @param mainWindow reference to the main window object (QMainWindow)
         @param parent reference to the parent widget (QWidget)
         """
-        super().__init__(parent)
+        super(HelpTocWidget, self).__init__(parent)

         self.__engine = engine
         self.__mw = mainWindow
--- a/Helpviewer/HelpTopicDialog.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Helpviewer/HelpTopicDialog.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing a dialog to select a help topic to display.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.QtGui import QDialog
 from PyQt4.QtCore import QUrl

@@ -26,7 +28,7 @@
         @param links dictionary with help topic as key (string) and
             URL as value (QUrl)
         """
-        super().__init__(parent)
+        super(HelpTopicDialog, self).__init__(parent)
         self.setupUi(self)

         self.label.setText(self.trUtf8("Choose a &topic for <b>{0}</b>:")\
--- a/Helpviewer/HelpUtilities.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Helpviewer/HelpUtilities.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing some global helper functions.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 import os

 from PyQt4.QtCore import QUrl
--- a/Helpviewer/HelpWebSearchWidget.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Helpviewer/HelpWebSearchWidget.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing a web search widget for the web browser.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.QtCore import pyqtSignal, QUrl, QModelIndex, QTimer, Qt
 from PyQt4.QtGui import QMenu, QStandardItem, QStandardItemModel, \
     QCompleter, QFont, QIcon, QPixmap
@@ -33,7 +35,7 @@

         @param parent reference to the parent widget (QWidget)
         """
-        super().__init__(parent)
+        super(HelpWebSearchWidget, self).__init__(parent)

         from E5Gui.E5LineEdit import E5LineEdit
         from E5Gui.E5LineEditButton import E5LineEditButton
@@ -303,7 +305,7 @@
         """
         self.__recentSearches = []
         self.__setupCompleterMenu()
-        super().clear()
+        super(HelpWebSearchWidget, self).clear()
         self.clearFocus()

     def preferencesChanged(self):
@@ -380,4 +382,4 @@
         elif evt.button() == Qt.XButton2:
             self.__mw.currentBrowser().pageAction(QWebPage.Forward).trigger()
         else:
-            super().mousePressEvent(evt)
+            super(HelpWebSearchWidget, self).mousePressEvent(evt)
--- a/Helpviewer/HelpWindow.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Helpviewer/HelpWindow.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,12 @@
 Module implementing the helpviewer main window.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+try:
+    str = unicode
+except (NameError):
+    pass
+
 import os

 from PyQt4.QtCore import pyqtSlot, pyqtSignal, Qt, QByteArray, QSize, QTimer, QUrl, \
@@ -94,7 +100,7 @@
             shortcuts (boolean)
         @keyparam searchWord word to search for (string)
         """
-        super().__init__(parent)
+        super(HelpWindow, self).__init__(parent)
         self.setObjectName(name)
         self.setWindowTitle(self.trUtf8("eric5 Web Browser"))

@@ -3145,7 +3151,7 @@
         elif evt.button() == Qt.XButton2:
             self.currentBrowser().pageAction(QWebPage.Forward).trigger()
         else:
-            super().mousePressEvent(evt)
+            super(HelpWindow, self).mousePressEvent(evt)

     @classmethod
     def feedsManager(cls):
@@ -3285,7 +3291,7 @@
                     self.__linkActivated(url)
                     return

-        super().keyPressEvent(evt)
+        super(HelpWindow, self).keyPressEvent(evt)

     ###########################################################################
     ## Interface to VirusTotal below                                         ##
--- a/Helpviewer/History/HistoryCompleter.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Helpviewer/History/HistoryCompleter.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing a special completer for the history.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.QtCore import Qt, QRegExp, QTimer
 from PyQt4.QtGui import QTableView, QAbstractItemView, QSortFilterProxyModel, \
     QCompleter
@@ -25,7 +27,7 @@

         @param parent reference to the parent widget (QWidget)
         """
-        super().__init__(parent)
+        super(HistoryCompletionView, self).__init__(parent)

         self.horizontalHeader().hide()
         self.verticalHeader().hide()
@@ -48,7 +50,7 @@
         self.horizontalHeader().resizeSection(0, 0.65 * self.width())
         self.horizontalHeader().setStretchLastSection(True)

-        super().resizeEvent(evt)
+        super(HistoryCompletionView, self).resizeEvent(evt)

     def sizeHintForRow(self, row):
         """
@@ -72,7 +74,7 @@

         @param parent reference to the parent object (QObject)
         """
-        super().__init__(parent)
+        super(HistoryCompletionModel, self).__init__(parent)

         self.__searchString = ""
         self.__searchMatcher = QRegExp("", Qt.CaseInsensitive, QRegExp.FixedString)
@@ -218,7 +220,7 @@
         @param model reference to the model (QAbstractItemModel)
         @param parent reference to the parent object (QObject)
         """
-        super().__init__(model, parent)
+        super(HistoryCompleter, self).__init__(model, parent)

         self.setPopup(HistoryCompletionView())
--- a/Helpviewer/History/HistoryDialog.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Helpviewer/History/HistoryDialog.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing a dialog to manage history.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.QtCore import pyqtSignal, Qt, QUrl
 from PyQt4.QtGui import QDialog, QFontMetrics, QMenu, QCursor, QApplication

@@ -34,7 +36,7 @@
         @param parent reference to the parent widget (QWidget
         @param manager reference to the history manager object (HistoryManager)
         """
-        super().__init__(parent)
+        super(HistoryDialog, self).__init__(parent)
         self.setupUi(self)

         self.__historyManager = manager
--- a/Helpviewer/History/HistoryFilterModel.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Helpviewer/History/HistoryFilterModel.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing the history filter model.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.QtCore import Qt, QDateTime, QModelIndex
 from PyQt4.QtGui import QAbstractProxyModel

@@ -66,7 +68,7 @@
         @param sourceModel reference to the source model (QAbstractItemModel)
         @param parent reference to the parent object (QObject)
         """
-        super().__init__(parent)
+        super(HistoryFilterModel, self).__init__(parent)

         self.__loaded = False
         self.__filteredRows = []
@@ -123,7 +125,7 @@
             self.sourceModel().rowsInserted.disconnect(self.__sourceRowsInserted)
             self.sourceModel().rowsRemoved.disconnect(self.__sourceRowsRemoved)

-        super().setSourceModel(sourceModel)
+        super(HistoryFilterModel, self).setSourceModel(sourceModel)

         if self.sourceModel() is not None:
             self.__loaded = False
--- a/Helpviewer/History/HistoryManager.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Helpviewer/History/HistoryManager.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing the history manager.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 import os

 from PyQt4.QtCore import pyqtSignal, QFileInfo, QDateTime, QDate, QTime, QUrl, QTimer, \
@@ -98,7 +100,7 @@

         @param parent reference to the parent object (QObject)
         """
-        super().__init__(parent)
+        super(HistoryManager, self).__init__(parent)

         self.__saveTimer = AutoSaver(self, self.save)
         self.__daysToExpire = Preferences.getHelp("HistoryLimit")
@@ -126,7 +128,7 @@
         self.__historyFilterModel = HistoryFilterModel(self.__historyModel, self)
         self.__historyTreeModel = HistoryTreeModel(self.__historyFilterModel, self)

-        super().setDefaultInterface(self)
+        super(HistoryManager, self).setDefaultInterface(self)
         self.__startFrequencyTimer()

     def close(self):
--- a/Helpviewer/History/HistoryMenu.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Helpviewer/History/HistoryMenu.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing the history menu.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 import sys

 from PyQt4.QtCore import pyqtSignal, Qt, QMimeData, QUrl, QModelIndex
@@ -35,7 +37,7 @@
         @param sourceModel reference to the source model (QAbstractItemModel)
         @param parent reference to the parent object (QObject)
         """
-        super().__init__(parent)
+        super(HistoryMenuModel, self).__init__(parent)

         self.__treeModel = sourceModel

@@ -209,7 +211,7 @@
         @param sourceModel reference to the source model (QAbstractItemModel)
         @param parent reference to the parent object (QObject)
         """
-        super().__init__(parent)
+        super(HistoryMostVisitedMenuModel, self).__init__(parent)

         self.setDynamicSortFilter(True)
         self.setSourceModel(sourceModel)
--- a/Helpviewer/History/HistoryModel.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Helpviewer/History/HistoryModel.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing the history model.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.QtCore import Qt, QAbstractTableModel, QModelIndex, QUrl

 import Helpviewer.HelpWindow
@@ -30,7 +32,7 @@
         @param historyManager reference to the history manager object (HistoryManager)
         @param parent reference to the parent object (QObject)
         """
-        super().__init__(parent)
+        super(HistoryModel, self).__init__(parent)

         self.__historyManager = historyManager
--- a/Helpviewer/History/HistoryTreeModel.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Helpviewer/History/HistoryTreeModel.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing the history tree model.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 import bisect

 from PyQt4.QtCore import Qt, QModelIndex, QDate
@@ -28,7 +30,7 @@
         @param sourceModel reference to the source model (QAbstractItemModel)
         @param parent reference to the parent object (QObject)
         """
-        super().__init__(parent)
+        super(HistoryTreeModel, self).__init__(parent)

         self.__sourceRowCache = []
         self.__removingDown = False
@@ -225,7 +227,7 @@
             self.sourceModel().rowsInserted.disconnect(self.__sourceRowsInserted)
             self.sourceModel().rowsRemoved.disconnect(self.__sourceRowsRemoved)

-        super().setSourceModel(sourceModel)
+        super(HistoryTreeModel, self).setSourceModel(sourceModel)

         if self.sourceModel() is not None:
             self.__loaded = False
--- a/Helpviewer/JavaScriptResources.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Helpviewer/JavaScriptResources.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module containing some HTML resources.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 parseForms_js = """
 (function (){
     var forms = new Array;
--- a/Helpviewer/Network/AboutAccessHandler.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Helpviewer/Network/AboutAccessHandler.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing a scheme access handler for about schemes.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from .SchemeAccessHandler import SchemeAccessHandler
--- a/Helpviewer/Network/EmptyNetworkReply.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Helpviewer/Network/EmptyNetworkReply.py	Mon Mar 25 03:11:06 2013 +0100
@@ -8,6 +8,8 @@
 (i.e. request was handle other way).
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.QtCore import QTimer
 from PyQt4.QtNetwork import QNetworkReply, QNetworkAccessManager

@@ -22,7 +24,7 @@

         @param parent reference to the parent object (QObject)
         """
-        super().__init__(parent)
+        super(EmptyNetworkReply, self).__init__(parent)

         self.setOperation(QNetworkAccessManager.GetOperation)
         self.setError(QNetworkReply.OperationCanceledError, "eric5:No Error")
--- a/Helpviewer/Network/EricAccessHandler.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Helpviewer/Network/EricAccessHandler.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing a scheme access handler for Python resources.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.QtCore import QFile, QByteArray

 from .SchemeAccessHandler import SchemeAccessHandler
--- a/Helpviewer/Network/FileAccessHandler.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Helpviewer/Network/FileAccessHandler.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing a scheme access handler for file.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.QtCore import QFileInfo
 from PyQt4.QtNetwork import QNetworkAccessManager

@@ -23,7 +25,7 @@

         @param parent reference to the parent object (QObject)
         """
-        super().__init__(parent)
+        super(FileAccessHandler, self).__init__(parent)

     def createRequest(self, op, request, outgoingData=None):
         """
--- a/Helpviewer/Network/FileReply.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Helpviewer/Network/FileReply.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,12 @@
 Module implementing a network reply class for directory resources.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+try:
+    str = unicode
+except (NameError):
+    pass
+
 from PyQt4.QtCore import Qt, QByteArray, QTimer, QDir, QIODevice, QUrl, QBuffer
 from PyQt4.QtGui import QPixmap
 from PyQt4.QtNetwork import QNetworkReply, QNetworkRequest
@@ -104,7 +110,7 @@
         @param url requested FTP URL (QUrl)
         @param parent reference to the parent object (QObject)
         """
-        super().__init__(parent)
+        super(FileReply, self).__init__(parent)

         self.__content = QByteArray()
         self.__units = ["Bytes", "KB", "MB", "GB", "TB", "PB", "EB", "ZB", "YB"]
--- a/Helpviewer/Network/FollowRedirectReply.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Helpviewer/Network/FollowRedirectReply.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing a network reply delegate allowing to check redirects.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.QtCore import pyqtSignal, QObject
 from PyQt4.QtNetwork import QNetworkRequest

@@ -25,7 +27,7 @@
         @param manager reference to the network access manager (QNetworkAccessManager)
         @keyparam maxRedirects maximum allowed redirects (integer)
         """
-        super().__init__()
+        super(FollowRedirectReply, self).__init__()

         self.__manager = manager
         self.__maxRedirects = maxRedirects
--- a/Helpviewer/Network/FtpAccessHandler.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Helpviewer/Network/FtpAccessHandler.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing a scheme access handler for FTP.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.QtNetwork import QNetworkAccessManager

 from .SchemeAccessHandler import SchemeAccessHandler
@@ -22,7 +24,7 @@

         @param parent reference to the parent object (QObject)
         """
-        super().__init__(parent)
+        super(FtpAccessHandler, self).__init__(parent)

         self.__authenticatorCache = {}
         self.__proxyAuthenticator = None
--- a/Helpviewer/Network/FtpReply.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Helpviewer/Network/FtpReply.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,12 @@
 Module implementing a network reply class for FTP resources.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+try:
+    str = unicode
+except (NameError):
+    pass
+
 import ftplib
 import socket
 import errno
@@ -115,7 +121,7 @@
         @param accessHandler reference to the access handler (FtpAccessHandler)
         @param parent reference to the parent object (QObject)
         """
-        super().__init__(parent)
+        super(FtpReply, self).__init__(parent)

         self.__manager = parent
         self.__handler = accessHandler
--- a/Helpviewer/Network/NetworkAccessManager.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Helpviewer/Network/NetworkAccessManager.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing a QNetworkAccessManager subclass.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 import os

 from PyQt4.QtCore import pyqtSignal, QByteArray
@@ -43,7 +45,7 @@
         @param engine reference to the help engine (QHelpEngine)
         @param parent reference to the parent object (QObject)
         """
-        super().__init__(parent)
+        super(NetworkAccessManager, self).__init__(parent)

         self.__adblockNetwork = None
--- a/Helpviewer/Network/NetworkAccessManagerProxy.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Helpviewer/Network/NetworkAccessManagerProxy.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing a network access manager proxy for web pages.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.QtNetwork import QNetworkAccessManager, QNetworkRequest
 try:
     from PyQt4.QtNetwork import QSslError   # __IGNORE_EXCEPTION__ __IGNORE_WARNING__
@@ -27,7 +29,7 @@

         @param parent reference to the parent object (QObject)
         """
-        super().__init__(parent)
+        super(NetworkAccessManagerProxy, self).__init__(parent)
         self.__webPage = None

     def setWebPage(self, page):
--- a/Helpviewer/Network/NetworkDiskCache.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Helpviewer/Network/NetworkDiskCache.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing a disk cache respecting privacy.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.QtWebKit import QWebSettings
 from PyQt4.QtNetwork import QNetworkDiskCache
--- a/Helpviewer/Network/NetworkProtocolUnknownErrorReply.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Helpviewer/Network/NetworkProtocolUnknownErrorReply.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing a QNetworkReply subclass reporting an unknown protocol error.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.QtCore import QTimer
 from PyQt4.QtNetwork import QNetworkReply

@@ -22,7 +24,7 @@
         @param protocol protocol name (string)
         @param parent reference to the parent object (QObject)
         """
-        super().__init__(parent)
+        super(NetworkProtocolUnknownErrorReply, self).__init__(parent)
         self.setError(QNetworkReply.ProtocolUnknownError,
                       self.trUtf8("Protocol '{0}' not supported.").format(protocol))
         QTimer.singleShot(0, self.__fireSignals)
--- a/Helpviewer/Network/NetworkReply.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Helpviewer/Network/NetworkReply.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing a network reply object for special data.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.QtCore import QTimer, QIODevice, QByteArray
 from PyQt4.QtNetwork import QNetworkReply, QNetworkRequest

@@ -24,7 +26,7 @@
         @param mimeType for the reply (string)
         @param parent reference to the parent object (QObject)
         """
-        super().__init__(parent)
+        super(NetworkReply, self).__init__(parent)

         self.__data = fileData
--- a/Helpviewer/Network/QtHelpAccessHandler.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Helpviewer/Network/QtHelpAccessHandler.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing a scheme access handler for QtHelp.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 import mimetypes
 import os
--- a/Helpviewer/Network/SchemeAccessHandler.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Helpviewer/Network/SchemeAccessHandler.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing the base class for specific scheme access handlers.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.QtCore import QObject


@@ -20,7 +22,7 @@

         @param parent reference to the parent object (QObject)
         """
-        super().__init__(parent)
+        super(SchemeAccessHandler, self).__init__(parent)

     def createRequest(self, op, request, outgoingData=None):
         """
--- a/Helpviewer/Network/SendRefererWhitelistDialog.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Helpviewer/Network/SendRefererWhitelistDialog.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing a dialog to manage the Send Referer whitelist.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.QtCore import pyqtSlot, Qt
 from PyQt4.QtGui import QDialog, QStringListModel, QSortFilterProxyModel, \
     QInputDialog, QLineEdit
@@ -26,7 +28,7 @@

         @param parent reference to the parent widget (QWidget)
         """
-        super().__init__(parent)
+        super(SendRefererWhitelistDialog, self).__init__(parent)
         self.setupUi(self)

         self.__model = QStringListModel(Preferences.getHelp("SendRefererWhitelist"), self)
@@ -63,4 +65,4 @@
         """
         Preferences.setHelp("SendRefererWhitelist", self.__model.stringList())

-        super().accept()
+        super(SendRefererWhitelistDialog, self).accept()
--- a/Helpviewer/OfflineStorage/OfflineStorageConfigDialog.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Helpviewer/OfflineStorage/OfflineStorageConfigDialog.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing a dialog to configure the offline storage.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.QtCore import pyqtSlot
 from PyQt4.QtGui import QDialog
 from PyQt4.QtWebKit import QWebSettings
@@ -26,7 +28,7 @@

         @param parent reference to the parent widget (QWidget)
         """
-        super().__init__(parent)
+        super(OfflineStorageConfigDialog, self).__init__(parent)
         self.setupUi(self)

         self.databaseEnabledCheckBox.setChecked(
--- a/Helpviewer/OfflineStorage/WebDatabasesDialog.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Helpviewer/OfflineStorage/WebDatabasesDialog.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing a dialog to show all web databases.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.QtCore import Qt
 from PyQt4.QtGui import QDialog, QFontMetrics

@@ -27,7 +29,7 @@

         @param parent reference to the parent widget (QWidget)
         """
-        super().__init__(parent)
+        super(WebDatabasesDialog, self).__init__(parent)
         self.setupUi(self)

         self.removeButton.clicked.connect(self.databasesTree.removeSelected)
--- a/Helpviewer/OfflineStorage/WebDatabasesModel.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Helpviewer/OfflineStorage/WebDatabasesModel.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing the web databases model.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 import sys

 from PyQt4.QtCore import QAbstractItemModel, QModelIndex, Qt
@@ -23,7 +25,7 @@

         @param parent reference to the parent object (QObject)
         """
-        super().__init__(parent)
+        super(WebDatabasesModel, self).__init__(parent)
         self.__headers = [
             self.trUtf8("Name"),
             self.trUtf8("Size")
--- a/Helpviewer/OpenSearch/OpenSearchDefaultEngines.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Helpviewer/OpenSearch/OpenSearchDefaultEngines.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module defining the default search engines.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 OpenSearchDefaultEngines = {
     "Amazon_com": """<?xml version="1.0" encoding="UTF-8"?>
         <OpenSearchDescription xmlns="http://a9.com/-/spec/opensearch/1.1/">
--- a/Helpviewer/OpenSearch/OpenSearchDialog.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Helpviewer/OpenSearch/OpenSearchDialog.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing a dialog for the configuration of search engines.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.QtGui import QDialog
 from PyQt4.QtCore import pyqtSlot

@@ -25,7 +27,7 @@
         """
         Constructor
         """
-        super().__init__(parent)
+        super(OpenSearchDialog, self).__init__(parent)
         self.setupUi(self)

         self.setModal(True)
--- a/Helpviewer/OpenSearch/OpenSearchEditDialog.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Helpviewer/OpenSearch/OpenSearchEditDialog.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing a dialog to edit the data of a search engine.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.QtGui import QDialog

 from .Ui_OpenSearchEditDialog import Ui_OpenSearchEditDialog
@@ -20,7 +22,7 @@
         """
         Constructor
         """
-        super().__init__(parent)
+        super(OpenSearchEditDialog, self).__init__(parent)
         self.setupUi(self)

         self.__engine = engine
@@ -41,4 +43,4 @@
         self.__engine.setSearchUrlTemplate(self.searchEdit.text())
         self.__engine.setSuggestionsUrlTemplate(self.suggestionsEdit.text())

-        super().accept()
+        super(OpenSearchEditDialog, self).accept()
--- a/Helpviewer/OpenSearch/OpenSearchEngine.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Helpviewer/OpenSearch/OpenSearchEngine.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing the open search engine.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 import re
 import json

@@ -38,7 +40,7 @@

         @param parent reference to the parent object (QObject)
         """
-        super().__init__(parent)
+        super(OpenSearchEngine, self).__init__(parent)

         self.__suggestionsReply = None
         self.__networkAccessManager = None
--- a/Helpviewer/OpenSearch/OpenSearchEngineAction.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Helpviewer/OpenSearch/OpenSearchEngineAction.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing a QAction subclass for open search.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.QtCore import QUrl
 from PyQt4.QtGui import QPixmap, QIcon, QAction

@@ -22,7 +24,7 @@
         @param engine reference to the open search engine object (OpenSearchEngine)
         @param parent reference to the parent object (QObject)
         """
-        super().__init__(parent)
+        super(OpenSearchEngineAction, self).__init__(parent)

         self.__engine = engine
         if self.__engine.networkAccessManager() is None:
--- a/Helpviewer/OpenSearch/OpenSearchEngineModel.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Helpviewer/OpenSearch/OpenSearchEngineModel.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing a model for search engines.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 import re

 from PyQt4.QtCore import Qt, QUrl, QAbstractTableModel, QModelIndex
@@ -24,7 +26,7 @@
         @param manager reference to the search engine manager (OpenSearchManager)
         @param parent reference to the parent object (QObject)
         """
-        super().__init__(parent)
+        super(OpenSearchEngineModel, self).__init__(parent)

         self.__manager = manager
         manager.changed.connect(self.__enginesChanged)
@@ -191,4 +193,4 @@
         """
         Private slot handling a change of the registered engines.
         """
-        super().reset()
+        super(OpenSearchEngineModel, self).reset()
--- a/Helpviewer/OpenSearch/OpenSearchManager.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Helpviewer/OpenSearch/OpenSearchManager.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing a manager for open search engines.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 import os

 from PyQt4.QtCore import pyqtSignal, QObject, QUrl, QFile, QDir, QIODevice, QByteArray, \
@@ -40,7 +42,7 @@
         """
         if parent is None:
             parent = e5App()
-        super().__init__(parent)
+        super(OpenSearchManager, self).__init__(parent)

         self.__replies = []
         self.__engines = {}
--- a/Helpviewer/OpenSearch/OpenSearchReader.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Helpviewer/OpenSearch/OpenSearchReader.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing a reader for open search engine descriptions.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.QtCore import QXmlStreamReader, QIODevice, QCoreApplication
--- a/Helpviewer/OpenSearch/OpenSearchWriter.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Helpviewer/OpenSearch/OpenSearchWriter.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing a writer for open search engine descriptions.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.QtCore import QXmlStreamWriter, QIODevice


@@ -18,7 +20,7 @@
         """
         Constructor
         """
-        super().__init__()
+        super(OpenSearchWriter, self).__init__()

         self.setAutoFormatting(True)
--- a/Helpviewer/PageScreenDialog.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Helpviewer/PageScreenDialog.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing a dialog to save a screenshot of a web page.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.QtCore import pyqtSlot, QFile, QFileInfo
 from PyQt4.QtGui import QDialog, QDialogButtonBox, QAbstractButton, QImage, QPainter,  \
     QPixmap
@@ -28,7 +30,7 @@
             (HelpBrowser)
         @param parent reference to the parent widget (QWidget)
         """
-        super().__init__(parent)
+        super(PageScreenDialog, self).__init__(parent)
         self.setupUi(self)

         self.__view = view
--- a/Helpviewer/Passwords/LoginForm.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Helpviewer/Passwords/LoginForm.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing a data structure for login forms.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.QtCore import QUrl
--- a/Helpviewer/Passwords/PasswordManager.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Helpviewer/Passwords/PasswordManager.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing the password manager.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 import os

 from PyQt4.QtCore import pyqtSignal, QObject, QByteArray, QUrl, QCoreApplication, \
@@ -43,7 +45,7 @@

         @param parent reference to the parent object (QObject)
         """
-        super().__init__(parent)
+        super(PasswordManager, self).__init__(parent)

         self.__logins = {}
         self.__loginForms = {}
--- a/Helpviewer/Passwords/PasswordModel.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Helpviewer/Passwords/PasswordModel.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing a model for password management.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.QtCore import Qt, QModelIndex, QAbstractTableModel


@@ -21,7 +23,7 @@
         @param manager reference to the password manager (PasswordManager)
         @param parent reference to the parent object (QObject)
         """
-        super().__init__(parent)
+        super(PasswordModel, self).__init__(parent)

         self.__manager = manager
         manager.changed.connect(self.__passwordsChanged)
--- a/Helpviewer/Passwords/PasswordReader.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Helpviewer/Passwords/PasswordReader.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing a class to read login data files.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.QtCore import QXmlStreamReader, QIODevice, QFile, QCoreApplication, QUrl


@@ -18,7 +20,7 @@
         """
         Constructor
         """
-        super().__init__()
+        super(PasswordReader, self).__init__()

     def read(self, fileNameOrDevice):
         """
--- a/Helpviewer/Passwords/PasswordWriter.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Helpviewer/Passwords/PasswordWriter.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing a class to write login data files.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.QtCore import QXmlStreamWriter, QIODevice, QFile


@@ -18,7 +20,7 @@
         """
         Constructor
         """
-        super().__init__()
+        super(PasswordWriter, self).__init__()

         self.setAutoFormatting(True)
--- a/Helpviewer/Passwords/PasswordsDialog.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Helpviewer/Passwords/PasswordsDialog.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing a dialog to show all saved logins.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.QtCore import pyqtSlot
 from PyQt4.QtGui import QDialog, QFont, QFontMetrics, QSortFilterProxyModel

@@ -25,7 +27,7 @@

         @param parent reference to the parent widget (QWidget)
         """
-        super().__init__(parent)
+        super(PasswordsDialog, self).__init__(parent)
         self.setupUi(self)

         self.__showPasswordsText = self.trUtf8("Show Passwords")
--- a/Helpviewer/PersonalInformationManager/PersonalDataDialog.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Helpviewer/PersonalInformationManager/PersonalDataDialog.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing a dialog to enter personal data.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.QtGui import QDialog

 from .Ui_PersonalDataDialog import Ui_PersonalDataDialog
@@ -25,7 +27,7 @@

         @param parent reference to the parent widget (QWidget)
         """
-        super().__init__(parent)
+        super(PersonalDataDialog, self).__init__(parent)
         self.setupUi(self)

         self.iconLabel.setPixmap(UI.PixmapCache.getPixmap("pim48.png"))
--- a/Helpviewer/PersonalInformationManager/PersonalInformationManager.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Helpviewer/PersonalInformationManager/PersonalInformationManager.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing a personal information manager used to complete form fields.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.QtCore import Qt, QObject
 from PyQt4.QtGui import QDialog, QMenu

@@ -43,7 +45,7 @@

         @param parent reference to the parent object (QObject)
         """
-        super().__init__(parent)
+        super(PersonalInformationManager, self).__init__(parent)

         self.__loaded = False
         self.__allInfo = {}
--- a/Helpviewer/QtHelpDocumentationDialog.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Helpviewer/QtHelpDocumentationDialog.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing a dialog to manage the QtHelp documentation database.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.QtCore import pyqtSlot, Qt
 from PyQt4.QtGui import QDialog, QItemSelectionModel
 from PyQt4.QtHelp import QHelpEngineCore
@@ -27,7 +29,7 @@
         @param engine reference to the help engine (QHelpEngine)
         @param parent reference to the parent widget (QWidget)
         """
-        super().__init__(parent)
+        super(QtHelpDocumentationDialog, self).__init__(parent)
         self.setupUi(self)

         self.removeButton.setEnabled(False)
--- a/Helpviewer/QtHelpFiltersDialog.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Helpviewer/QtHelpFiltersDialog.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing a dialog to manage the QtHelp filters.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 import sqlite3

 from PyQt4.QtCore import pyqtSlot, Qt
@@ -27,7 +29,7 @@
         @param engine reference to the help engine (QHelpEngine)
         @param parent reference to the parent widget (QWidget)
         """
-        super().__init__(parent)
+        super(QtHelpFiltersDialog, self).__init__(parent)
         self.setupUi(self)

         self.__engine = engine
--- a/Helpviewer/SearchWidget.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Helpviewer/SearchWidget.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing the search bar for the web browser.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.QtCore import pyqtSlot, Qt
 from PyQt4.QtGui import QWidget, QPalette, QBrush, QColor
 from PyQt4.QtWebKit import QWebPage
@@ -27,7 +29,7 @@
         @param mainWindow reference to the main window (QMainWindow)
         @param parent parent widget of this dialog (QWidget)
         """
-        super().__init__(parent)
+        super(SearchWidget, self).__init__(parent)
         self.setupUi(self)

         self.__mainWindow = mainWindow
--- a/Helpviewer/SiteInfo/SiteInfoDialog.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Helpviewer/SiteInfo/SiteInfoDialog.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing a dialog to show some information about a site.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 import os

 from PyQt4.QtCore import pyqtSlot, QUrl, Qt, QFile, qVersion
@@ -42,7 +44,7 @@
         @param browser reference to the browser window (HelpBrowser)
         @param parent reference to the parent widget (QWidget)
         """
-        super().__init__(parent)
+        super(SiteInfoDialog, self).__init__(parent)
         self.setupUi(self)

         # put icons
--- a/Helpviewer/SpeedDial/Page.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Helpviewer/SpeedDial/Page.py	Mon Mar 25 03:11:06 2013 +0100
@@ -8,6 +8,8 @@
 """


+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 class Page(object):
     """
     Class to hold the data for a speed dial page.
--- a/Helpviewer/SpeedDial/PageThumbnailer.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Helpviewer/SpeedDial/PageThumbnailer.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing an object to create a thumbnail image of a web site.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.QtCore import pyqtSignal, QObject, QSize, Qt, QUrl
 from PyQt4.QtGui import QPixmap, QImage, QPainter
 from PyQt4.QtWebKit import QWebPage
@@ -28,7 +30,7 @@

         @param parent reference to the parent object (QObject)
         """
-        super().__init__(parent)
+        super(PageThumbnailer, self).__init__(parent)

         self.__page = QWebPage(self)
         self.__size = QSize(231, 130)
--- a/Helpviewer/SpeedDial/SpeedDial.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Helpviewer/SpeedDial/SpeedDial.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,12 @@
 Module implementing the speed dial.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+try:
+    str = unicode
+except (NameError):
+    pass
+
 import os

 from PyQt4.QtCore import pyqtSignal, pyqtSlot, QObject, QCryptographicHash, QByteArray, \
@@ -35,7 +41,7 @@

         @param parent reference to the parent object (QObject)
         """
-        super().__init__(parent)
+        super(SpeedDial, self).__init__(parent)

         self.__regenerateScript = True
--- a/Helpviewer/SpeedDial/SpeedDialReader.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Helpviewer/SpeedDial/SpeedDialReader.py	Mon Mar 25 03:11:06 2013 +0100
@@ -8,6 +8,8 @@
 Module implementing a class to read speed dial data files.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.QtCore import QXmlStreamReader, QIODevice, QFile, QCoreApplication


@@ -19,7 +21,7 @@
         """
         Constructor
         """
-        super().__init__()
+        super(SpeedDialReader, self).__init__()

     def read(self, fileNameOrDevice):
         """
--- a/Helpviewer/SpeedDial/SpeedDialWriter.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Helpviewer/SpeedDial/SpeedDialWriter.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing a class to write speed dial data files.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.QtCore import QXmlStreamWriter, QIODevice, QFile


@@ -18,7 +20,7 @@
         """
         Constructor
         """
-        super().__init__()
+        super(SpeedDialWriter, self).__init__()

         self.setAutoFormatting(True)
--- a/Helpviewer/Sync/DirectorySyncHandler.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Helpviewer/Sync/DirectorySyncHandler.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing a synchronization handler using a shared directory.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 import os

 from PyQt4.QtCore import pyqtSignal, QByteArray, QFileInfo, QCoreApplication
@@ -42,7 +44,7 @@

         @param parent reference to the parent object (QObject)
         """
-        super().__init__(parent)
+        super(DirectorySyncHandler, self).__init__(parent)
         self.__forceUpload = False

         self.__remoteFilesFound = []
--- a/Helpviewer/Sync/FtpSyncHandler.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Helpviewer/Sync/FtpSyncHandler.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing a synchronization handler using FTP.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 import ftplib
 import io

@@ -47,7 +49,7 @@

         @param parent reference to the parent object (QObject)
         """
-        super().__init__(parent)
+        super(FtpSyncHandler, self).__init__(parent)

         self.__state = "idle"
         self.__forceUpload = False
--- a/Helpviewer/Sync/SyncAssistantDialog.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Helpviewer/Sync/SyncAssistantDialog.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing a wizard dialog to enter the synchronization data.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.QtGui import QWizard

 import UI.PixmapCache
@@ -23,7 +25,7 @@

         @param parent reference to the parent widget (QWidget)
         """
-        super().__init__(parent)
+        super(SyncAssistantDialog, self).__init__(parent)

         from . import SyncGlobals
--- a/Helpviewer/Sync/SyncCheckPage.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Helpviewer/Sync/SyncCheckPage.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing the synchronization status wizard page.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 import os

 from PyQt4.QtCore import QByteArray, QTimer
@@ -32,7 +34,7 @@

         @param parent reference to the parent widget (QWidget)
         """
-        super().__init__(parent)
+        super(SyncCheckPage, self).__init__(parent)
         self.setupUi(self)

     def initializePage(self):
--- a/Helpviewer/Sync/SyncDataPage.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Helpviewer/Sync/SyncDataPage.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing the synchronization data wizard page.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.QtGui import QWizardPage

 from .Ui_SyncDataPage import Ui_SyncDataPage
@@ -24,7 +26,7 @@

         @param parent reference to the parent widget (QWidget)
         """
-        super().__init__(parent)
+        super(SyncDataPage, self).__init__(parent)
         self.setupUi(self)

         self.bookmarksCheckBox.setChecked(Preferences.getHelp("SyncBookmarks"))
--- a/Helpviewer/Sync/SyncDirectorySettingsPage.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Helpviewer/Sync/SyncDirectorySettingsPage.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing the synchronization shared directory settings wizard page.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.QtCore import pyqtSlot
 from PyQt4.QtGui import QWizardPage

@@ -28,7 +30,7 @@

         @param parent reference to the parent widget (QWidget)
         """
-        super().__init__(parent)
+        super(SyncDirectorySettingsPage, self).__init__(parent)
         self.setupUi(self)

         self.directoryEdit.setText(Preferences.getHelp("SyncDirectoryPath"))
--- a/Helpviewer/Sync/SyncEncryptionPage.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Helpviewer/Sync/SyncEncryptionPage.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing encryption settings wizard page.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.QtCore import pyqtSlot
 from PyQt4.QtGui import QWizardPage

@@ -25,7 +27,7 @@

         @param parent reference to the parent widget (QWidget)
         """
-        super().__init__(parent)
+        super(SyncEncryptionPage, self).__init__(parent)
         self.setupUi(self)

         self.keySizeComboBox.addItem(self.trUtf8("128 Bits"), 16)
--- a/Helpviewer/Sync/SyncFtpSettingsPage.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Helpviewer/Sync/SyncFtpSettingsPage.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing the synchronization FTP host settings wizard page.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.QtGui import QWizardPage

 from .Ui_SyncFtpSettingsPage import Ui_SyncFtpSettingsPage
@@ -24,7 +26,7 @@

         @param parent reference to the parent widget (QWidget)
         """
-        super().__init__(parent)
+        super(SyncFtpSettingsPage, self).__init__(parent)
         self.setupUi(self)

         self.serverEdit.setText(Preferences.getHelp("SyncFtpServer"))
--- a/Helpviewer/Sync/SyncHandler.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Helpviewer/Sync/SyncHandler.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module containing a base class for synchronization handlers.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 import os

 from PyQt4.QtCore import QObject, pyqtSignal, QByteArray
@@ -40,7 +42,7 @@

         @param parent reference to the parent object (QObject)
         """
-        super().__init__(parent)
+        super(SyncHandler, self).__init__(parent)

         self._firstTimeSynced = False
--- a/Helpviewer/Sync/SyncHostTypePage.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Helpviewer/Sync/SyncHostTypePage.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing the synchronization host type wizard page.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.QtGui import QWizardPage

 from . import SyncGlobals
@@ -26,7 +28,7 @@

         @param parent reference to the parent widget (QWidget)
         """
-        super().__init__(parent)
+        super(SyncHostTypePage, self).__init__(parent)
         self.setupUi(self)

         if Preferences.getHelp("SyncType") == SyncGlobals.SyncTypeFtp:
--- a/Helpviewer/Sync/SyncManager.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Helpviewer/Sync/SyncManager.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing the synchronization manager class.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.QtCore import QObject, pyqtSignal

 import Preferences
@@ -40,7 +42,7 @@

         @param parent reference to the parent object (QObject)
         """
-        super().__init__(parent)
+        super(SyncManager, self).__init__(parent)

         self.__handler = None
--- a/Helpviewer/UrlBar/BookmarkActionSelectionDialog.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Helpviewer/UrlBar/BookmarkActionSelectionDialog.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing a dialog to select the action to be performed on the bookmark.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.QtCore import pyqtSlot
 from PyQt4.QtGui import QDialog

@@ -32,7 +34,7 @@
         @param url URL to be worked on (QUrl)
         @param parent reference to the parent widget (QWidget)
         """
-        super().__init__(parent)
+        super(BookmarkActionSelectionDialog, self).__init__(parent)
         self.setupUi(self)

         self.__action = self.Undefined
--- a/Helpviewer/UrlBar/BookmarkInfoDialog.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Helpviewer/UrlBar/BookmarkInfoDialog.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing a dialog to show some bookmark info.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.QtCore import pyqtSlot
 from PyQt4.QtGui import QDialog, QFont

@@ -26,7 +28,7 @@
         @param bookmark reference to the bookmark to be shown (Bookmark)
         @param parent reference to the parent widget (QWidget)
         """
-        super().__init__(parent)
+        super(BookmarkInfoDialog, self).__init__(parent)
         self.setupUi(self)

         self.__bookmark = bookmark
--- a/Helpviewer/UrlBar/FavIconLabel.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Helpviewer/UrlBar/FavIconLabel.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,12 @@
 Module implementing the label to show the web site icon.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+try:
+    str = unicode
+except (NameError):
+    pass
+
 from PyQt4.QtCore import Qt, QPoint, QUrl, QMimeData
 from PyQt4.QtGui import QLabel, QApplication, QDrag, QPixmap

@@ -21,7 +27,7 @@

         @param parent reference to the parent widget (QWidget)
         """
-        super().__init__(parent)
+        super(FavIconLabel, self).__init__(parent)

         self.__browser = None
         self.__dragStartPos = QPoint()
@@ -71,7 +77,7 @@
         """
         if evt.button() == Qt.LeftButton:
             self.__dragStartPos = evt.pos()
-        super().mousePressEvent(evt)
+        super(FavIconLabel, self).mousePressEvent(evt)

     def mouseMoveEvent(self, evt):
         """
--- a/Helpviewer/UrlBar/SslLabel.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Helpviewer/UrlBar/SslLabel.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing the label to show some SSL info.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.QtCore import Qt, pyqtSignal, QPoint
 from PyQt4.QtGui import QLabel

@@ -26,7 +28,7 @@

         @param parent reference to the parent widget (QWidget)
         """
-        super().__init__(parent)
+        super(SslLabel, self).__init__(parent)

         self.setFocusPolicy(Qt.NoFocus)
         self.setCursor(Qt.ArrowCursor)
@@ -40,7 +42,7 @@
         if evt.button() == Qt.LeftButton:
             self.clicked.emit(evt.globalPos())
         else:
-            super().mouseReleaseEvent(evt)
+            super(SslLabel, self).mouseReleaseEvent(evt)

     def mouseDoubleClickEvent(self, evt):
         """
@@ -51,7 +53,7 @@
         if evt.button() == Qt.LeftButton:
             self.clicked.emit(evt.globalPos())
         else:
-            super().mouseDoubleClickEvent(evt)
+            super(SslLabel, self).mouseDoubleClickEvent(evt)

     def setValidity(self, valid):
         """
--- a/Helpviewer/UrlBar/StackedUrlBar.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Helpviewer/UrlBar/StackedUrlBar.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing a widget to stack url bars.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.QtGui import QStackedWidget, QSizePolicy


@@ -20,7 +22,7 @@

         @param parent reference to the parent widget (QWidget)
         """
-        super().__init__(parent)
+        super(StackedUrlBar, self).__init__(parent)

         sizePolicy = QSizePolicy(QSizePolicy.Expanding, QSizePolicy.Preferred)
         sizePolicy.setHorizontalStretch(6)
--- a/Helpviewer/UrlBar/UrlBar.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Helpviewer/UrlBar/UrlBar.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,12 @@
 Module implementing the URL bar widget.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+try:
+    str = unicode
+except (NameError):
+    pass
+
 from PyQt4.QtCore import pyqtSlot, Qt, QPointF, QUrl, QDateTime, qVersion
 from PyQt4.QtGui import QColor, QPalette, QLinearGradient, QIcon, QDialog, QApplication
 try:
@@ -340,7 +346,7 @@
         elif evt.button() == Qt.XButton2:
             self.__mw.currentBrowser().pageAction(QWebPage.Forward).trigger()
         else:
-            super().mousePressEvent(evt)
+            super(UrlBar, self).mousePressEvent(evt)

     def mouseDoubleClickEvent(self, evt):
         """
--- a/Helpviewer/UserAgent/UserAgentDefaults.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Helpviewer/UserAgent/UserAgentDefaults.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module defining the default user agent strings.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 UserAgentDefaults = """
 <useragentswitcher>
     <useragentmenu title="Firefox">
--- a/Helpviewer/UserAgent/UserAgentManager.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Helpviewer/UserAgent/UserAgentManager.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing a user agent manager.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 import os

 from PyQt4.QtCore import pyqtSignal, QObject, QXmlStreamReader
@@ -33,7 +35,7 @@

         @param parent reference to the parent object (QObject)
         """
-        super().__init__(parent)
+        super(UserAgentManager, self).__init__(parent)

         self.__agents = {}      # dictionary with agent strings indexed by host name
         self.__loaded = False
--- a/Helpviewer/UserAgent/UserAgentMenu.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Helpviewer/UserAgent/UserAgentMenu.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing a menu to select the user agent string.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.QtCore import QByteArray, QXmlStreamReader
 from PyQt4.QtGui import QMenu, QAction, QActionGroup, QInputDialog, QLineEdit

@@ -25,7 +27,7 @@
         @param url URL to set user agent for (QUrl)
         @param parent reference to the parent widget (QWidget)
         """
-        super().__init__(title, parent)
+        super(UserAgentMenu, self).__init__(title, parent)

         self.__manager = None
         self.__url = url
--- a/Helpviewer/UserAgent/UserAgentModel.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Helpviewer/UserAgent/UserAgentModel.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing a model for user agent management.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.QtCore import Qt, QModelIndex, QAbstractTableModel


@@ -21,7 +23,7 @@
         @param manager reference to the user agent manager (UserAgentManager)
         @param parent reference to the parent object (QObject)
         """
-        super().__init__(parent)
+        super(UserAgentModel, self).__init__(parent)

         self.__manager = manager
         self.__manager.changed.connect(self.__userAgentsChanged)
--- a/Helpviewer/UserAgent/UserAgentReader.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Helpviewer/UserAgent/UserAgentReader.py	Mon Mar 25 03:11:06 2013 +0100
@@ -8,6 +8,8 @@
 Module implementing a class to read user agent data files.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.QtCore import QXmlStreamReader, QIODevice, QFile, QCoreApplication


@@ -19,7 +21,7 @@
         """
         Constructor
         """
-        super().__init__()
+        super(UserAgentReader, self).__init__()

     def read(self, fileNameOrDevice):
         """
--- a/Helpviewer/UserAgent/UserAgentWriter.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Helpviewer/UserAgent/UserAgentWriter.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing a class to write user agent data files.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.QtCore import QXmlStreamWriter, QIODevice, QFile


@@ -18,7 +20,7 @@
         """
         Constructor
         """
-        super().__init__()
+        super(UserAgentWriter, self).__init__()

         self.setAutoFormatting(True)
--- a/Helpviewer/UserAgent/UserAgentsDialog.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Helpviewer/UserAgent/UserAgentsDialog.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing a dialog to show all saved user agent settings.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.QtGui import QDialog, QFont, QFontMetrics, QSortFilterProxyModel

 import Helpviewer.HelpWindow
@@ -26,7 +28,7 @@

         @param parent reference to the parent widget (QWidget)
         """
-        super().__init__(parent)
+        super(UserAgentsDialog, self).__init__(parent)
         self.setupUi(self)

         self.removeButton.clicked[()].connect(self.userAgentsTable.removeSelected)
--- a/Helpviewer/VirusTotalApi.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Helpviewer/VirusTotalApi.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing the <a href="http://www.virustotal.com">VirusTotal</a> API class.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 import json

 from PyQt4.QtCore import QObject, QUrl, QByteArray, pyqtSignal
@@ -55,7 +57,7 @@

         @param parent reference to the parent object (QObject)
         """
-        super().__init__(parent)
+        super(VirusTotalAPI, self).__init__(parent)

         self.__replies = []
--- a/Helpviewer/WebPlugins/ClickToFlash/ClickToFlash.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Helpviewer/WebPlugins/ClickToFlash/ClickToFlash.py	Mon Mar 25 03:11:06 2013 +0100
@@ -8,6 +8,8 @@
 """


+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.QtCore import pyqtSlot, QUrl, Qt, QByteArray,  QTimer
 from PyQt4.QtGui import QWidget, QMenu, QCursor, QDialog, QLabel, QFormLayout
 from PyQt4.QtNetwork import QNetworkRequest
@@ -37,7 +39,7 @@
         @param argumentValues list of argument values (list of strings)
         @param parent reference to the parent widget (QWidget)
         """
-        super().__init__(parent)
+        super(ClickToFlash, self).__init__(parent)

         # Check AdBlock first
         import Helpviewer.HelpWindow
--- a/Helpviewer/WebPlugins/ClickToFlash/ClickToFlashPlugin.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Helpviewer/WebPlugins/ClickToFlash/ClickToFlashPlugin.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing the Flash blocker plug-in.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.QtGui import QDialog
 from PyQt4.QtWebKit import QWebPluginFactory
--- a/Helpviewer/WebPlugins/ClickToFlash/ClickToFlashWhitelistDialog.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Helpviewer/WebPlugins/ClickToFlash/ClickToFlashWhitelistDialog.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing a dialog to manage the ClickToFlash whitelist.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.QtCore import pyqtSlot, Qt
 from PyQt4.QtGui import QDialog, QStringListModel, QSortFilterProxyModel, \
     QInputDialog, QLineEdit
@@ -27,7 +29,7 @@
         @param whitelist list of whitelisted hosts (list of string)
         @param parent reference to the parent widget (QWidget)
         """
-        super().__init__(parent)
+        super(ClickToFlashWhitelistDialog, self).__init__(parent)
         self.setupUi(self)

         self.iconLabel.setPixmap(UI.PixmapCache.getPixmap("flashBlock48.png"))
--- a/Helpviewer/WebPlugins/WebPluginFactory.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Helpviewer/WebPlugins/WebPluginFactory.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing the web plug-in factory.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.QtWebKit import QWebPluginFactory


@@ -20,7 +22,7 @@

         @param parent reference to the parent object (QObject)
         """
-        super().__init__(parent)
+        super(WebPluginFactory, self).__init__(parent)

         self.__loaded = False

@@ -65,7 +67,7 @@
         Public method to refresh the list of supported plug-ins.
         """
         self.__initialize()
-        super().refreshPlugins()
+        super(WebPluginFactory, self).refreshPlugins()

     def __initialize(self):
         """
--- a/Helpviewer/WebPlugins/WebPluginInterface.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Helpviewer/WebPlugins/WebPluginInterface.py	Mon Mar 25 03:11:06 2013 +0100
@@ -8,6 +8,8 @@
 """


+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 class WebPluginInterface(object):
     """
     Class implementing the web plug-in interface.
--- a/Helpviewer/data/html_rc.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Helpviewer/data/html_rc.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 #
 # WARNING! All changes made in this file will be lost!

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4 import QtCore

 qt_resource_data = b"\
--- a/Helpviewer/data/icons_rc.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Helpviewer/data/icons_rc.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 #
 # WARNING! All changes made in this file will be lost!

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4 import QtCore

 qt_resource_data = b"\
--- a/Helpviewer/data/javascript_rc.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Helpviewer/data/javascript_rc.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 #
 # WARNING! All changes made in this file will be lost!

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4 import QtCore

 qt_resource_data = b"\
--- a/IconEditor/IconEditorGrid.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/IconEditor/IconEditorGrid.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing the icon editor grid.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.QtCore import pyqtSignal, Qt, QPoint, QRect, QSize
 from PyQt4.QtGui import QUndoCommand, QImage, QWidget, QColor, QPixmap, QSizePolicy, \
     QUndoStack, qRgba, QPainter, QApplication, QCursor, QBrush, QDialog, qGray, qAlpha
@@ -29,7 +31,7 @@
         @param oldImage copy of the icon before the changes were applied (QImage)
         @param parent reference to the parent command (QUndoCommand)
         """
-        super().__init__(text, parent)
+        super(IconEditCommand, self).__init__(text, parent)

         self.__grid = grid
         self.__imageBefore = QImage(oldImage)
@@ -114,7 +116,7 @@

         @param parent reference to the parent widget (QWidget)
         """
-        super().__init__(parent)
+        super(IconEditorGrid, self).__init__(parent)

         self.setAttribute(Qt.WA_StaticContents)
         self.setSizePolicy(QSizePolicy.Minimum, QSizePolicy.Minimum)
--- a/IconEditor/IconEditorPalette.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/IconEditor/IconEditorPalette.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing a palette widget for the icon editor.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.QtCore import pyqtSignal, Qt
 from PyQt4.QtGui import QWidget, QColor, QPainter, QBoxLayout, QLabel, QFrame, \
     QPushButton, QSpinBox, QGroupBox, QVBoxLayout, QRadioButton, QSpacerItem, \
@@ -30,7 +32,7 @@

         @param parent reference to the parent widget (QWidget)
         """
-        super().__init__(parent)
+        super(IconEditorPalette, self).__init__(parent)

         if self.layoutDirection == Qt.Horizontal:
             direction = QBoxLayout.LeftToRight
--- a/IconEditor/IconEditorWindow.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/IconEditor/IconEditorWindow.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing the icon editor main window.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.QtCore import pyqtSignal, Qt, QSize, QSignalMapper, QFileInfo, QFile, \
     QEvent
 from PyQt4.QtGui import QScrollArea, QPalette, QImage, QImageReader, QImageWriter, \
@@ -47,7 +49,7 @@
         @keyparam initShortcutsOnly flag indicating to just initialize the keyboard
             shortcuts (boolean)
         """
-        super().__init__(parent)
+        super(IconEditorWindow, self).__init__(parent)
         self.setObjectName("eric5_icon_editor")
         self.setAttribute(Qt.WA_DeleteOnClose)

@@ -1223,7 +1225,7 @@
             evt.accept()
             return

-        super().wheelEvent(evt)
+        super(IconEditorWindow, self).wheelEvent(evt)

     def event(self, evt):
         """
@@ -1236,7 +1238,7 @@
             self.gestureEvent(evt)
             return True

-        return super().event(evt)
+        return super(IconEditorWindow, self).event(evt)

     def gestureEvent(self, evt):
         """
--- a/IconEditor/IconSizeDialog.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/IconEditor/IconSizeDialog.py	Mon Mar 25 03:11:06 2013 +0100
@@ -4,6 +4,8 @@
 Module implementing a dialog to enter the icon size.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.QtGui import QDialog

 from .Ui_IconSizeDialog import Ui_IconSizeDialog
@@ -21,7 +23,7 @@
         @param height height to be set (integer)
         @param parent reference to the parent widget (QWidget)
         """
-        super().__init__(parent)
+        super(IconSizeDialog, self).__init__(parent)
         self.setupUi(self)

         self.widthSpin.setValue(width)
--- a/IconEditor/cursors/cursors_rc.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/IconEditor/cursors/cursors_rc.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 #
 # WARNING! All changes made in this file will be lost!

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4 import QtCore

 qt_resource_data = b"\
--- a/MultiProject/AddProjectDialog.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/MultiProject/AddProjectDialog.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing the add project dialog.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.QtCore import pyqtSlot
 from PyQt4.QtGui import QDialog, QDialogButtonBox

@@ -30,7 +32,7 @@
         @param startdir start directory for the selection dialog (string)
         @param project dictionary containing project data
         """
-        super().__init__(parent)
+        super(AddProjectDialog, self).__init__(parent)
         self.setupUi(self)

         self.fileCompleter = E5FileCompleter(self.filenameEdit)
--- a/MultiProject/MultiProject.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/MultiProject/MultiProject.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing the multi project management functionality.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 import os

 from PyQt4.QtCore import pyqtSignal, Qt, QFileInfo, QFile, QIODevice, QObject
@@ -62,7 +64,7 @@
         @param parent parent widget (usually the ui object) (QWidget)
         @param filename optional filename of a multi project file to open (string)
         """
-        super().__init__(parent)
+        super(MultiProject, self).__init__(parent)

         self.ui = parent
         self.projectObject = project
--- a/MultiProject/MultiProjectBrowser.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/MultiProject/MultiProjectBrowser.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing the multi project browser.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.QtCore import Qt
 from PyQt4.QtGui import QListWidget, QListWidgetItem, QDialog, QMenu

@@ -26,7 +28,7 @@
         @param project reference to the multi project object
         @param parent parent widget (QWidget)
         """
-        super().__init__(parent)
+        super(MultiProjectBrowser, self).__init__(parent)
         self.multiProject = multiProject

         self.setWindowIcon(UI.PixmapCache.getIcon("eric.png"))
--- a/MultiProject/PropertiesDialog.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/MultiProject/PropertiesDialog.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing the multi project properties dialog.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.QtGui import QDialog

 from .Ui_PropertiesDialog import Ui_PropertiesDialog
@@ -24,7 +26,7 @@
         @param new flag indicating the generation of a new multi project
         @param parent parent widget of this dialog (QWidget)
         """
-        super().__init__(parent)
+        super(PropertiesDialog, self).__init__(parent)
         self.setupUi(self)

         self.multiProject = multiProject
--- a/Network/IRC/IrcChannelEditDialog.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Network/IRC/IrcChannelEditDialog.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing a dialog to edit channel data.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.QtCore import pyqtSlot
 from PyQt4.QtGui import QDialog, QDialogButtonBox

@@ -29,7 +31,7 @@
             channel (boolean)
         @param parent reference to the parent widget (QWidget)
         """
-        super().__init__(parent)
+        super(IrcChannelEditDialog, self).__init__(parent)
         self.setupUi(self)

         self.nameEdit.setText(name)
--- a/Network/IRC/IrcChannelWidget.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Network/IRC/IrcChannelWidget.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing the IRC channel widget.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 import re

 from PyQt4.QtCore import pyqtSlot, pyqtSignal, QDateTime, QPoint, QFileInfo, QTimer, QUrl
@@ -54,7 +56,7 @@
         @param name string with user name and privilege prefix (string)
         @param parent reference to the parent widget (QListWidget or QListWidgetItem)
         """
-        super().__init__(name, parent)
+        super(IrcUserItem, self).__init__(name, parent)

         self.__privilege = IrcUserItem.Normal
         self.__name = name
@@ -200,7 +202,7 @@

         @param parent reference to the parent widget (QWidget)
         """
-        super().__init__(parent)
+        super(IrcChannelWidget, self).__init__(parent)
         self.setupUi(self)

         self.__ui = e5App().getObject("UserInterface")
--- a/Network/IRC/IrcIdentitiesEditDialog.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Network/IRC/IrcIdentitiesEditDialog.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing the identities management dialog.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 import copy

 from PyQt4.QtCore import pyqtSlot, Qt, QEvent
@@ -34,7 +36,7 @@
         @param identityName name of the identity to be selected (string)
         @param parent reference to the parent widget (QWidget)
         """
-        super().__init__(parent)
+        super(IrcIdentitiesEditDialog, self).__init__(parent)
         self.setupUi(self)

         self.addButton.setIcon(UI.PixmapCache.getIcon("plus.png"))
@@ -80,7 +82,7 @@
                 self.on_nicknameAddButton_clicked()
                 return True

-        return super().eventFilter(obj, evt)
+        return super(IrcIdentitiesEditDialog, self).eventFilter(obj, evt)

     def __updateIdentitiesButtons(self):
         """
@@ -431,4 +433,4 @@
         self.__refreshCurrentIdentity()
         self.__manager.setIdentities(self.__identities)

-        super().accept()
+        super(IrcIdentitiesEditDialog, self).accept()
--- a/Network/IRC/IrcMessageEdit.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Network/IRC/IrcMessageEdit.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing a specialized line edit for entering IRC messages.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.QtCore import Qt

 from E5Gui.E5LineEdit import E5LineEdit, E5ClearableLineEdit
@@ -27,7 +29,7 @@
         @keyparam side side the clear button should be shown at (E5LineEdit.RightSide,
             E5LineEdit.LeftSide)
         """
-        super().__init__(parent, inactiveText, side)
+        super(IrcMessageEdit, self).__init__(parent, inactiveText, side)

         self.__historyList = [""]   # initialize with one empty line
         self.__historyLine = 0
@@ -40,7 +42,7 @@

         @param text text to be set (string)
         """
-        super().setText(text)
+        super(IrcMessageEdit, self).setText(text)
         self.setCursorPosition(len(text))

     def keyPressEvent(self, evt):
@@ -63,7 +65,7 @@
             # ^U: clear the text
             self.setText("")

-        super().keyPressEvent(evt)
+        super(IrcMessageEdit, self).keyPressEvent(evt)

     def wheelEvent(self, evt):
         """
@@ -76,7 +78,7 @@
         elif evt.delta() < 0:
             self.__getHistory(False)

-        super().wheelEvent(evt)
+        super(IrcMessageEdit, self).wheelEvent(evt)

     def __addHistory(self, txt):
         """
--- a/Network/IRC/IrcNetworkEditDialog.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Network/IRC/IrcNetworkEditDialog.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing a dialog for editing IRC network definitions.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 import copy

 from PyQt4.QtCore import pyqtSlot
@@ -31,7 +33,7 @@
         @param networkName name of the network to work on (string)
         @param parent reference to the parent widget (QWidget)
         """
-        super().__init__(parent)
+        super(IrcNetworkEditDialog, self).__init__(parent)
         self.setupUi(self)

         self.__manager = manager
--- a/Network/IRC/IrcNetworkListDialog.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Network/IRC/IrcNetworkListDialog.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing a dialog to list the configured IRC networks.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.QtCore import pyqtSlot
 from PyQt4.QtGui import QDialog, QTreeWidgetItem

@@ -26,7 +28,7 @@
         @param manager reference to the IRC network manager (IrcNetworkManager)
         @param parent reference to the parent widget (QWidget)
         """
-        super().__init__(parent)
+        super(IrcNetworkListDialog, self).__init__(parent)
         self.setupUi(self)

         self.__manager = manager
--- a/Network/IRC/IrcNetworkManager.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Network/IRC/IrcNetworkManager.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing the IRC data structures and their manager.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 import copy

 from PyQt4.QtCore import pyqtSignal, QObject, QCoreApplication
@@ -34,7 +36,7 @@

         @param name name of the identity (string)
         """
-        super().__init__()
+        super(IrcIdentity, self).__init__()

         self.__name = name
         self.__realName = ""
@@ -283,7 +285,7 @@

         @param name name of the server (string)
         """
-        super().__init__()
+        super(IrcServer, self).__init__()

         self.__server = name
         self.__port = IrcServer.DefaultPort
@@ -387,7 +389,7 @@

         @param name name of the network (string)
         """
-        super().__init__()
+        super(IrcChannel, self).__init__()

         self.__name = name
         self.__key = ""
@@ -465,7 +467,7 @@

         @param name name of the network (string)
         """
-        super().__init__()
+        super(IrcNetwork, self).__init__()

         self.__name = name
         self.__identity = ""
@@ -713,7 +715,7 @@

         @param parent reference to the parent object (QObject)
         """
-        super().__init__(parent)
+        super(IrcNetworkManager, self).__init__(parent)

         self.__loaded = False
         self.__saveTimer = AutoSaver(self, self.save)
--- a/Network/IRC/IrcNetworkWidget.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Network/IRC/IrcNetworkWidget.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing the network part of the IRC widget.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.QtCore import pyqtSlot, pyqtSignal, QPoint, QFileInfo, QUrl
 from PyQt4.QtGui import QWidget, QApplication, QMenu, QDesktopServices

@@ -47,7 +49,7 @@

         @param parent reference to the parent widget (QWidget)
         """
-        super().__init__(parent)
+        super(IrcNetworkWidget, self).__init__(parent)
         self.setupUi(self)

         self.connectButton.setIcon(UI.PixmapCache.getIcon("ircConnect.png"))
--- a/Network/IRC/IrcServerEditDialog.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Network/IRC/IrcServerEditDialog.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing a dialog for editing the IRC server configuration.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.QtCore import pyqtSlot
 from PyQt4.QtGui import QDialog, QDialogButtonBox

@@ -24,7 +26,7 @@
         @param server reference to the IRC server object (IrcServer)
         @param parent reference to the parent widget (QWidget)
         """
-        super().__init__(parent)
+        super(IrcServerEditDialog, self).__init__(parent)
         self.setupUi(self)

         self.__okButton = self.buttonBox.button(QDialogButtonBox.Ok)
--- a/Network/IRC/IrcUtilities.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Network/IRC/IrcUtilities.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing functions used by several IRC objects.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 import re

 from PyQt4.QtCore import QTime, QCoreApplication
--- a/Network/IRC/IrcWidget.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Network/IRC/IrcWidget.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,12 @@
 Module implementing the IRC window.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+try:
+    str = unicode
+except (NameError):
+    pass
+
 import re
 import logging

@@ -50,7 +56,7 @@

         @param parent reference to the parent widget (QWidget)
         """
-        super().__init__(parent)
+        super(IrcWidget, self).__init__(parent)
         self.setupUi(self)

         from .IrcNetworkManager import IrcNetworkManager
--- a/PluginManager/PluginDetailsDialog.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/PluginManager/PluginDetailsDialog.py	Mon Mar 25 03:11:06 2013 +0100
@@ -8,6 +8,8 @@
 Module implementing the Plugin Details Dialog.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.QtGui import QDialog
 from PyQt4.QtCore import pyqtSlot

@@ -25,7 +27,7 @@
         @param details dictionary containing the info to be displayed
         @param parent parent of this dialog (QWidget)
         """
-        super().__init__(parent)
+        super(PluginDetailsDialog, self).__init__(parent)
         self.setupUi(self)

         self.__autoactivate = details["autoactivate"]
--- a/PluginManager/PluginExceptions.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/PluginManager/PluginExceptions.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing the exceptions raised by the plugin system.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.QtGui import QApplication
--- a/PluginManager/PluginInfoDialog.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/PluginManager/PluginInfoDialog.py	Mon Mar 25 03:11:06 2013 +0100
@@ -8,6 +8,8 @@
 Module implementing the Plugin Info Dialog.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.QtCore import pyqtSlot, Qt
 from PyQt4.QtGui import QDialog, QTreeWidgetItem, QHeaderView, QMenu, QBrush

@@ -25,7 +27,7 @@
         @param pluginManager reference to the plugin manager object
         @param parent parent of this dialog (QWidget)
         """
-        super().__init__(parent)
+        super(PluginInfoDialog, self).__init__(parent)
         self.setupUi(self)

         self.pm = pluginManager
--- a/PluginManager/PluginInstallDialog.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/PluginManager/PluginInstallDialog.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing the Plugin installation dialog.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 import os
 import sys
 import shutil
@@ -42,7 +44,7 @@
             installation (list of strings)
         @param parent parent of this dialog (QWidget)
         """
-        super().__init__(parent)
+        super(PluginInstallWidget, self).__init__(parent)
         self.setupUi(self)

         if pluginManager is None:
@@ -521,7 +523,7 @@
             installation (list of strings)
         @param parent reference to the parent widget (QWidget)
         """
-        super().__init__(parent)
+        super(PluginInstallDialog, self).__init__(parent)
         self.setSizeGripEnabled(True)

         self.__layout = QVBoxLayout(self)
@@ -557,7 +559,7 @@
             installation (list of strings)
         @param parent reference to the parent widget (QWidget)
         """
-        super().__init__(parent)
+        super(PluginInstallWindow, self).__init__(parent)
         self.cw = PluginInstallWidget(None, pluginFileNames, self)
         size = self.cw.size()
         self.setCentralWidget(self.cw)
--- a/PluginManager/PluginManager.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/PluginManager/PluginManager.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing the Plugin Manager.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 import os
 import sys
 import imp
@@ -67,7 +69,7 @@
         @keyparam develPlugin filename of a plugin to be loaded for
             development (string)
         """
-        super().__init__(parent)
+        super(PluginManager, self).__init__(parent)

         self.__ui = parent
         self.__develPluginFile = develPlugin
--- a/PluginManager/PluginRepositoryDialog.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/PluginManager/PluginRepositoryDialog.py	Mon Mar 25 03:11:06 2013 +0100
@@ -8,6 +8,8 @@
 Module implementing a dialog showing the available plugins.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 import sys
 import os
 import zipfile
@@ -57,7 +59,7 @@

         @param parent parent of this dialog (QWidget)
         """
-        super().__init__(parent)
+        super(PluginRepositoryWidget, self).__init__(parent)
         self.setupUi(self)

         self.__updateButton = \
@@ -536,7 +538,7 @@

         @param parent reference to the parent widget (QWidget)
         """
-        super().__init__(parent)
+        super(PluginRepositoryDialog, self).__init__(parent)
         self.setSizeGripEnabled(True)

         self.__layout = QVBoxLayout(self)
@@ -577,7 +579,7 @@

         @param parent reference to the parent widget (QWidget)
         """
-        super().__init__(parent)
+        super(PluginRepositoryWindow, self).__init__(parent)
         self.cw = PluginRepositoryWidget(self, external=True)
         size = self.cw.size()
         self.setCentralWidget(self.cw)
--- a/PluginManager/PluginUninstallDialog.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/PluginManager/PluginUninstallDialog.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing a dialog for plugin deinstallation.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 import sys
 import os
 import imp
@@ -38,7 +40,7 @@
         @param pluginManager reference to the plugin manager object
         @param parent parent of this dialog (QWidget)
         """
-        super().__init__(parent)
+        super(PluginUninstallWidget, self).__init__(parent)
         self.setupUi(self)

         if pluginManager is None:
@@ -181,7 +183,7 @@
         @param pluginManager reference to the plugin manager object
         @param parent reference to the parent widget (QWidget)
         """
-        super().__init__(parent)
+        super(PluginUninstallDialog, self).__init__(parent)
         self.setSizeGripEnabled(True)

         self.__layout = QVBoxLayout(self)
@@ -207,7 +209,7 @@

         @param parent reference to the parent widget (QWidget)
         """
-        super().__init__(parent)
+        super(PluginUninstallWindow, self).__init__(parent)
         self.cw = PluginUninstallWidget(None, self)
         size = self.cw.size()
         self.setCentralWidget(self.cw)
--- a/Plugins/AboutPlugin/AboutDialog.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Plugins/AboutPlugin/AboutDialog.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing an 'About Eric' dialog.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.QtGui import QApplication, QDialog

 from .Ui_AboutDialog import Ui_AboutDialog
@@ -735,7 +737,7 @@

         @param parent reference to the parent widget (QWidget)
         """
-        super().__init__(parent)
+        super(AboutDialog, self).__init__(parent)
         self.setupUi(self)

         self.ericLabel.setText(titleText)
--- a/Plugins/CheckerPlugins/Pep8/Pep8Checker.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Plugins/CheckerPlugins/Pep8/Pep8Checker.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,11 @@
 Module implementing the PEP 8 checker.
 """

+try:
+    str = unicode
+except (NameError):
+    pass
+
 import os
 import optparse
--- a/Plugins/CheckerPlugins/Pep8/Pep8CodeSelectionDialog.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Plugins/CheckerPlugins/Pep8/Pep8CodeSelectionDialog.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing a dialog to select PEP 8 message codes.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.QtCore import QCoreApplication
 from PyQt4.QtGui import QDialog, QTreeWidgetItem

@@ -28,7 +30,7 @@
             issues (boolean)
         @param parent reference to the parent widget (QWidget)
         """
-        super().__init__(parent)
+        super(Pep8CodeSelectionDialog, self).__init__(parent)
         self.setupUi(self)

         codeList = [code.strip() for code in codes.split(",") if code.strip()]
--- a/Plugins/CheckerPlugins/Pep8/Pep8Dialog.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Plugins/CheckerPlugins/Pep8/Pep8Dialog.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing a dialog to show the results of the PEP 8 check.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 import os
 import fnmatch

@@ -42,7 +44,7 @@

         @param parent reference to the parent widget (QWidget)
         """
-        super().__init__(parent)
+        super(Pep8Dialog, self).__init__(parent)
         self.setupUi(self)

         self.statisticsButton = self.buttonBox.addButton(
--- a/Plugins/CheckerPlugins/Pep8/Pep8Fixer.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Plugins/CheckerPlugins/Pep8/Pep8Fixer.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing a class to fix certain PEP 8 issues.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 import os
 import re

@@ -38,7 +40,7 @@
             string (string)
         @param inPlace flag indicating to modify the file in place (boolean)
         """
-        super().__init__()
+        super(Pep8Fixer, self).__init__()

         self.__project = project
         self.__filename = filename
--- a/Plugins/CheckerPlugins/Pep8/Pep8StatisticsDialog.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Plugins/CheckerPlugins/Pep8/Pep8StatisticsDialog.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing a dialog showing statistical data for the last PEP 8 run.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.QtCore import Qt, QCoreApplication
 from PyQt4.QtGui import QDialog, QTreeWidgetItem

@@ -29,7 +31,7 @@
         @param dictionary with the statistical data
         @param parent reference to the parent widget (QWidget)
         """
-        super().__init__(parent)
+        super(Pep8StatisticsDialog, self).__init__(parent)
         self.setupUi(self)

         stats = statistics.copy()
--- a/Plugins/CheckerPlugins/SyntaxChecker/SyntaxCheckerDialog.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Plugins/CheckerPlugins/SyntaxChecker/SyntaxCheckerDialog.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing a simple Python syntax checker.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 import os
 import fnmatch

@@ -39,7 +41,7 @@

         @param parent The parent widget. (QWidget)
         """
-        super().__init__(parent)
+        super(SyntaxCheckerDialog, self).__init__(parent)
         self.setupUi(self)

         self.showButton = self.buttonBox.addButton(
--- a/Plugins/CheckerPlugins/Tabnanny/Tabnanny.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Plugins/CheckerPlugins/Tabnanny/Tabnanny.py	Mon Mar 25 03:11:06 2013 +0100
@@ -18,6 +18,8 @@
 @exception ValueError The tokenize module is too old.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 # Released to the public domain, by Tim Peters, 15 April 1998.

 # XXX Note: this is now a standard library module.
--- a/Plugins/CheckerPlugins/Tabnanny/TabnannyDialog.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Plugins/CheckerPlugins/Tabnanny/TabnannyDialog.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,12 @@
 Module implementing a dialog to show the output of the tabnanny command process.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+try:
+    str = unicode
+except (NameError):
+    pass
+
 import os
 import fnmatch

@@ -34,7 +40,7 @@

         @param parent The parent widget (QWidget).
         """
-        super().__init__(parent)
+        super(TabnannyDialog, self).__init__(parent)
         self.setupUi(self)

         self.buttonBox.button(QDialogButtonBox.Close).setEnabled(False)
--- a/Plugins/DocumentationPlugins/Ericapi/EricapiConfigDialog.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Plugins/DocumentationPlugins/Ericapi/EricapiConfigDialog.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing a dialog to enter the parameters for eric5_api.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 import sys
 import os
 import copy
@@ -36,7 +38,7 @@
         @param parms parameters to set in the dialog
         @param parent parent widget of this dialog
         """
-        super().__init__(parent)
+        super(EricapiConfigDialog, self).__init__(parent)
         self.setupUi(self)

         self.buttonBox.button(QDialogButtonBox.Ok).setEnabled(False)
@@ -262,4 +264,4 @@
             self.parameters['languages'].append(itm.text())

         # call the accept slot of the base class
-        super().accept()
+        super(EricapiConfigDialog, self).accept()
--- a/Plugins/DocumentationPlugins/Ericapi/EricapiExecDialog.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Plugins/DocumentationPlugins/Ericapi/EricapiExecDialog.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,12 @@
 Module implementing a dialog to show the output of the ericapi process.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+try:
+    str = unicode
+except (NameError):
+    pass
+
 import os.path

 from PyQt4.QtCore import QProcess, QTimer
@@ -33,7 +39,7 @@
         @param cmdname name of the ericapi generator (string)
         @param parent parent widget of this dialog (QWidget)
         """
-        super().__init__(parent)
+        super(EricapiExecDialog, self).__init__(parent)
         self.setModal(True)
         self.setupUi(self)
--- a/Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing a dialog to enter the parameters for eric5_doc.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 import sys
 import os
 import copy
@@ -36,7 +38,7 @@
         @param parms parameters to set in the dialog
         @param parent parent widget of this dialog
         """
-        super().__init__(parent)
+        super(EricdocConfigDialog, self).__init__(parent)
         self.setupUi(self)

         self.__okButton = self.buttonBox.button(QDialogButtonBox.Ok)
@@ -529,4 +531,4 @@
             self.qtHelpGenerateCollectionCheckBox.isChecked()

         # call the accept slot of the base class
-        super().accept()
+        super(EricdocConfigDialog, self).accept()
--- a/Plugins/DocumentationPlugins/Ericdoc/EricdocExecDialog.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Plugins/DocumentationPlugins/Ericdoc/EricdocExecDialog.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,12 @@
 Module implementing a dialog to show the output of the ericdoc process.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+try:
+    str = unicode
+except (NameError):
+    pass
+
 import os.path

 from PyQt4.QtCore import QProcess, QTimer
@@ -33,7 +39,7 @@
         @param cmdname name of the documentation generator (string)
         @param parent parent widget of this dialog (QWidget)
         """
-        super().__init__(parent)
+        super(EricdocExecDialog, self).__init__(parent)
         self.setModal(True)
         self.setupUi(self)
--- a/Plugins/PluginAbout.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Plugins/PluginAbout.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing the About plugin.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.QtCore import QObject
 from PyQt4.QtGui import QAction

@@ -42,7 +44,7 @@

         @param ui reference to the user interface object (UI.UserInterface)
         """
-        super().__init__(ui)
+        super(AboutPlugin, self).__init__(ui)
         self.__ui = ui

     def activate(self):
--- a/Plugins/PluginEricapi.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Plugins/PluginEricapi.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing the Ericapi plugin.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 import os

 from PyQt4.QtCore import QObject
@@ -73,7 +75,7 @@

         @param ui reference to the user interface object (UI.UserInterface)
         """
-        super().__init__(ui)
+        super(EricapiPlugin, self).__init__(ui)
         self.__ui = ui
         self.__initialize()
--- a/Plugins/PluginEricdoc.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Plugins/PluginEricdoc.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing the Ericdoc plugin.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 import os

 from PyQt4.QtCore import QObject
@@ -108,7 +110,7 @@

         @param ui reference to the user interface object (UI.UserInterface)
         """
-        super().__init__(ui)
+        super(EricdocPlugin, self).__init__(ui)
         self.__ui = ui
         self.__initialize()
--- a/Plugins/PluginPep8Checker.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Plugins/PluginPep8Checker.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing the PEP 8 Checker plugin.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 import os

 from PyQt4.QtCore import QObject
@@ -45,7 +47,7 @@

         @param ui reference to the user interface object (UI.UserInterface)
         """
-        super().__init__(ui)
+        super(Pep8CheckerPlugin, self).__init__(ui)
         self.__ui = ui
         self.__initialize()
--- a/Plugins/PluginSyntaxChecker.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Plugins/PluginSyntaxChecker.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing the Syntax Checker plugin.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 import os

 from PyQt4.QtCore import QObject
@@ -44,7 +46,7 @@

         @param ui reference to the user interface object (UI.UserInterface)
         """
-        super().__init__(ui)
+        super(SyntaxCheckerPlugin, self).__init__(ui)
         self.__ui = ui
         self.__initialize()
--- a/Plugins/PluginTabnanny.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Plugins/PluginTabnanny.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing the Tabnanny plugin.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 import os

 from PyQt4.QtCore import QObject
@@ -44,7 +46,7 @@

         @param ui reference to the user interface object (UI.UserInterface)
         """
-        super().__init__(ui)
+        super(TabnannyPlugin, self).__init__(ui)
         self.__ui = ui
         self.__initialize()
--- a/Plugins/PluginVcsMercurial.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Plugins/PluginVcsMercurial.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing the Mercurial version control plugin.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 import os

 from PyQt4.QtCore import QObject
@@ -147,7 +149,7 @@

         @param ui reference to the user interface object (UI.UserInterface)
         """
-        super().__init__(ui)
+        super(VcsMercurialPlugin, self).__init__(ui)
         self.__ui = ui

         self.__mercurialDefaults = {
--- a/Plugins/PluginVcsPySvn.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Plugins/PluginVcsPySvn.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing the PySvn version control plugin.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 import os

 from PyQt4.QtCore import QObject
@@ -141,7 +143,7 @@

         @param ui reference to the user interface object (UI.UserInterface)
         """
-        super().__init__(ui)
+        super(VcsPySvnPlugin, self).__init__(ui)
         self.__ui = ui

         self.__subversionDefaults = {
--- a/Plugins/PluginVcsSubversion.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Plugins/PluginVcsSubversion.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing the Subversion version control plugin.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 import os

 from PyQt4.QtCore import QObject
@@ -147,7 +149,7 @@

         @param ui reference to the user interface object (UI.UserInterface)
         """
-        super().__init__(ui)
+        super(VcsSubversionPlugin, self).__init__(ui)
         self.__ui = ui

         self.__subversionDefaults = {
--- a/Plugins/PluginVmListspace.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Plugins/PluginVmListspace.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing the Tabview view manager plugin.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 import os

 from PyQt4.QtCore import QT_TRANSLATE_NOOP, QObject
@@ -52,7 +54,7 @@

         @param ui reference to the user interface object (UI.UserInterface)
         """
-        super().__init__(ui)
+        super(VmListspacePlugin, self).__init__(ui)
         self.__ui = ui

     def activate(self):
--- a/Plugins/PluginVmTabview.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Plugins/PluginVmTabview.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing the Tabview view manager plugin.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 import os

 from PyQt4.QtCore import QT_TRANSLATE_NOOP, QObject
@@ -52,7 +54,7 @@

         @param ui reference to the user interface object (UI.UserInterface)
         """
-        super().__init__(ui)
+        super(VmTabviewPlugin, self).__init__(ui)
         self.__ui = ui

     def activate(self):
--- a/Plugins/PluginWizardE5MessageBox.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Plugins/PluginWizardE5MessageBox.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing the E5MessageBox wizard plugin.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.QtCore import QObject
 from PyQt4.QtGui import QDialog

@@ -40,7 +42,7 @@

         @param ui reference to the user interface object (UI.UserInterface)
         """
-        super().__init__(ui)
+        super(E5MessageBoxWizard, self).__init__(ui)
         self.__ui = ui

     def activate(self):
--- a/Plugins/PluginWizardPyRegExp.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Plugins/PluginWizardPyRegExp.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing the Python re wizard plugin.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.QtCore import QObject
 from PyQt4.QtGui import QDialog

@@ -40,7 +42,7 @@

         @param ui reference to the user interface object (UI.UserInterface)
         """
-        super().__init__(ui)
+        super(PyRegExpWizard, self).__init__(ui)
         self.__ui = ui

     def activate(self):
--- a/Plugins/PluginWizardQColorDialog.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Plugins/PluginWizardQColorDialog.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing the QColorDialog wizard plugin.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.QtCore import QObject
 from PyQt4.QtGui import QDialog

@@ -40,7 +42,7 @@

         @param ui reference to the user interface object (UI.UserInterface)
         """
-        super().__init__(ui)
+        super(ColorDialogWizard, self).__init__(ui)
         self.__ui = ui

     def activate(self):
--- a/Plugins/PluginWizardQFileDialog.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Plugins/PluginWizardQFileDialog.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing the QFileDialog wizard plugin.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.QtCore import QObject
 from PyQt4.QtGui import QDialog

@@ -40,7 +42,7 @@

         @param ui reference to the user interface object (UI.UserInterface)
         """
-        super().__init__(ui)
+        super(FileDialogWizard, self).__init__(ui)
         self.__ui = ui

     def activate(self):
--- a/Plugins/PluginWizardQFontDialog.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Plugins/PluginWizardQFontDialog.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing the QFontDialog wizard plugin.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.QtCore import QObject
 from PyQt4.QtGui import QDialog

@@ -40,7 +42,7 @@

         @param ui reference to the user interface object (UI.UserInterface)
         """
-        super().__init__(ui)
+        super(FontDialogWizard, self).__init__(ui)
         self.__ui = ui

     def activate(self):
--- a/Plugins/PluginWizardQInputDialog.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Plugins/PluginWizardQInputDialog.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing the QInputDialog wizard plugin.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.QtCore import QObject
 from PyQt4.QtGui import QDialog

@@ -40,7 +42,7 @@

         @param ui reference to the user interface object (UI.UserInterface)
         """
-        super().__init__(ui)
+        super(InputDialogWizard, self).__init__(ui)
         self.__ui = ui

     def activate(self):
--- a/Plugins/PluginWizardQMessageBox.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Plugins/PluginWizardQMessageBox.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing the QMessageBox wizard plugin.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.QtCore import QObject
 from PyQt4.QtGui import QDialog

@@ -40,7 +42,7 @@

         @param ui reference to the user interface object (UI.UserInterface)
         """
-        super().__init__(ui)
+        super(MessageBoxWizard, self).__init__(ui)
         self.__ui = ui

     def activate(self):
--- a/Plugins/PluginWizardQRegExp.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Plugins/PluginWizardQRegExp.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing the QRegExp wizard plugin.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.QtCore import QObject
 from PyQt4.QtGui import QDialog

@@ -40,7 +42,7 @@

         @param ui reference to the user interface object (UI.UserInterface)
         """
-        super().__init__(ui)
+        super(QRegExpWizard, self).__init__(ui)
         self.__ui = ui

     def activate(self):
--- a/Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkDialog.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkDialog.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing the bookmark dialog.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.QtCore import pyqtSlot
 from PyQt4.QtGui import QDialog, QDialogButtonBox

@@ -30,7 +32,7 @@
         @param bookmarksList list of bookmarks (list of strings)
         @param parent reference to the parent widget (QWidget)
         """
-        super().__init__(parent)
+        super(HgBookmarkDialog, self).__init__(parent)
         self.setupUi(self)

         self.buttonBox.button(QDialogButtonBox.Ok).setEnabled(False)
--- a/Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkRenameDialog.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkRenameDialog.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing a dialog to get the data to rename a bookmark.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.QtCore import pyqtSlot
 from PyQt4.QtGui import QDialog, QDialogButtonBox

@@ -24,7 +26,7 @@
         @param bookmarksList list of bookmarks (list of strings)
         @param parent reference to the parent widget (QWidget)
         """
-        super().__init__(parent)
+        super(HgBookmarkRenameDialog, self).__init__(parent)
         self.setupUi(self)

         self.buttonBox.button(QDialogButtonBox.Ok).setEnabled(False)
--- a/Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarksInOutDialog.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarksInOutDialog.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,12 @@
 Module implementing a dialog to show a list of incoming or outgoing bookmarks.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+try:
+    str = unicode
+except (NameError):
+    pass
+
 import os

 from PyQt4.QtCore import pyqtSlot, QProcess, Qt, QTimer, QCoreApplication
@@ -36,7 +42,7 @@
             HgBookmarksInOutDialog.OUTGOING)
         @param parent reference to the parent widget (QWidget)
         """
-        super().__init__(parent)
+        super(HgBookmarksInOutDialog, self).__init__(parent)
         self.setupUi(self)

         self.buttonBox.button(QDialogButtonBox.Close).setEnabled(False)
@@ -316,4 +322,4 @@
             self.intercept = False
             evt.accept()
             return
-        super().keyPressEvent(evt)
+        super(HgBookmarksInOutDialog, self).keyPressEvent(evt)
--- a/Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarksListDialog.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarksListDialog.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,12 @@
 Module implementing a dialog to show a list of bookmarks.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+try:
+    str = unicode
+except (NameError):
+    pass
+
 import os

 from PyQt4.QtCore import pyqtSlot, QProcess, Qt, QTimer, QCoreApplication
@@ -31,7 +37,7 @@
         @param vcs reference to the vcs object
         @param parent parent widget (QWidget)
         """
-        super().__init__(parent)
+        super(HgBookmarksListDialog, self).__init__(parent)
         self.setupUi(self)

         self.buttonBox.button(QDialogButtonBox.Close).setEnabled(False)
@@ -316,4 +322,4 @@
             self.intercept = False
             evt.accept()
             return
-        super().keyPressEvent(evt)
+        super(HgBookmarksListDialog, self).keyPressEvent(evt)
--- a/Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/ProjectHelper.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/ProjectHelper.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing the bookmarks extension project helper.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.QtGui import QMenu

 from E5Gui.E5Action import E5Action
@@ -24,7 +26,7 @@
         """
         Constructor
         """
-        super().__init__()
+        super(BookmarksProjectHelper, self).__init__()

     def initActions(self):
         """
--- a/Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,12 @@
 Module implementing the bookmarks extension interface.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+try:
+    str = unicode
+except (NameError):
+    pass
+
 import os

 from PyQt4.QtCore import QProcess
@@ -28,7 +34,7 @@

         @param vcs reference to the Mercurial vcs object
         """
-        super().__init__(vcs)
+        super(Bookmarks, self).__init__(vcs)

         self.bookmarksListDlg = None
         self.bookmarksInOutDlg = None
--- a/Plugins/VcsPlugins/vcsMercurial/Config.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Plugins/VcsPlugins/vcsMercurial/Config.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module defining configuration variables for the Mercurial package
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 # Available protocols fpr the repository URL
 ConfigHgProtocols = [
     'file://',
--- a/Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing the Mercurial configuration page.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 import os

 from PyQt4.QtCore import pyqtSlot
@@ -25,7 +27,7 @@

         @param plugin reference to the plugin object
         """
-        super().__init__()
+        super(MercurialPage, self).__init__()
         self.setupUi(self)
         self.setObjectName("MercurialPage")
--- a/Plugins/VcsPlugins/vcsMercurial/FetchExtension/HgFetchDialog.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Plugins/VcsPlugins/vcsMercurial/FetchExtension/HgFetchDialog.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing a dialog to enter data to be used for a fetch operation.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.QtCore import pyqtSlot
 from PyQt4.QtGui import QDialog

@@ -25,7 +27,7 @@

         @param parent reference to the parent widget (QWidget)
         """
-        super().__init__(parent)
+        super(HgFetchDialog, self).__init__(parent)
         self.setupUi(self)

         self.recentCommitMessages = Preferences.toList(
--- a/Plugins/VcsPlugins/vcsMercurial/FetchExtension/ProjectHelper.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Plugins/VcsPlugins/vcsMercurial/FetchExtension/ProjectHelper.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing the fetch extension project helper.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.QtGui import QMenu

 from E5Gui.E5Action import E5Action
@@ -25,7 +27,7 @@
         """
         Constructor
         """
-        super().__init__()
+        super(FetchProjectHelper, self).__init__()

     def initActions(self):
         """
--- a/Plugins/VcsPlugins/vcsMercurial/FetchExtension/fetch.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Plugins/VcsPlugins/vcsMercurial/FetchExtension/fetch.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing the fetch extension interface.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 import os

 from PyQt4.QtGui import QDialog
@@ -25,7 +27,7 @@

         @param vcs reference to the Mercurial vcs object
         """
-        super().__init__(vcs)
+        super(Fetch, self).__init__(vcs)

     def hgFetch(self, name):
         """
--- a/Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing a dialog to enter data for signing a revision.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.QtCore import pyqtSlot
 from PyQt4.QtGui import QDialog, QDialogButtonBox

@@ -26,7 +28,7 @@
         @param bookmarksList list of bookmarks (list of strings)
         @param parent reference to the parent widget (QWidget)
         """
-        super().__init__(parent)
+        super(HgGpgSignDialog, self).__init__(parent)
         self.setupUi(self)

         self.buttonBox.button(QDialogButtonBox.Ok).setEnabled(False)
--- a/Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,12 @@
 Module implementing a dialog showing signed changesets.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+try:
+    str = unicode
+except (NameError):
+    pass
+
 import os

 from PyQt4.QtCore import pyqtSlot, QProcess, QTimer, Qt, QRegExp, QCoreApplication
@@ -31,7 +37,7 @@
         @param vcs reference to the vcs object
         @param parent reference to the parent widget (QWidget)
         """
-        super().__init__(parent)
+        super(HgGpgSignaturesDialog, self).__init__(parent)
         self.setupUi(self)

         self.buttonBox.button(QDialogButtonBox.Close).setEnabled(False)
@@ -374,4 +380,4 @@
             self.intercept = False
             evt.accept()
             return
-        super().keyPressEvent(evt)
+        super(HgGpgSignaturesDialog, self).keyPressEvent(evt)
--- a/Plugins/VcsPlugins/vcsMercurial/GpgExtension/ProjectHelper.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Plugins/VcsPlugins/vcsMercurial/GpgExtension/ProjectHelper.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing the gpg extension project helper.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.QtGui import QMenu

 from E5Gui.E5Action import E5Action
@@ -24,7 +26,7 @@
         """
         Constructor
         """
-        super().__init__()
+        super(GpgProjectHelper, self).__init__()

     def initActions(self):
         """
--- a/Plugins/VcsPlugins/vcsMercurial/GpgExtension/gpg.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Plugins/VcsPlugins/vcsMercurial/GpgExtension/gpg.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing the gpg extension interface.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 import os

 from PyQt4.QtGui import QDialog
@@ -26,7 +28,7 @@

         @param vcs reference to the Mercurial vcs object
         """
-        super().__init__(vcs)
+        super(Gpg, self).__init__(vcs)

         self.gpgSignaturesDialog = None
--- a/Plugins/VcsPlugins/vcsMercurial/HgAddSubrepositoryDialog.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Plugins/VcsPlugins/vcsMercurial/HgAddSubrepositoryDialog.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing a dialog to add a sub-repository.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 import os

 from PyQt4.QtCore import pyqtSlot
@@ -29,7 +31,7 @@

         @param parent reference to the parent widget (QWidget)
         """
-        super().__init__(parent)
+        super(HgAddSubrepositoryDialog, self).__init__(parent)
         self.setupUi(self)

         self.__ok = self.buttonBox.button(QDialogButtonBox.Ok)
--- a/Plugins/VcsPlugins/vcsMercurial/HgAnnotateDialog.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Plugins/VcsPlugins/vcsMercurial/HgAnnotateDialog.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,12 @@
 Module implementing a dialog to show the output of the hg annotate command.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+try:
+    str = unicode
+except (NameError):
+    pass
+
 import os

 from PyQt4.QtCore import pyqtSlot, QProcess, QTimer, Qt, QCoreApplication
@@ -32,7 +38,7 @@
         @param vcs reference to the vcs object
         @param parent parent widget (QWidget)
         """
-        super().__init__(parent)
+        super(HgAnnotateDialog, self).__init__(parent)
         self.setupUi(self)

         self.buttonBox.button(QDialogButtonBox.Close).setEnabled(False)
@@ -307,4 +313,4 @@
             self.intercept = False
             evt.accept()
             return
-        super().keyPressEvent(evt)
+        super(HgAnnotateDialog, self).keyPressEvent(evt)
--- a/Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing a dialog to enter the data for a backout operation.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.QtCore import pyqtSlot, QDateTime
 from PyQt4.QtGui import QDialog, QDialogButtonBox

@@ -26,7 +28,7 @@
         @param bookmarksList list of bookmarks (list of strings)
         @param parent parent widget (QWidget)
         """
-        super().__init__(parent)
+        super(HgBackoutDialog, self).__init__(parent)
         self.setupUi(self)

         self.buttonBox.button(QDialogButtonBox.Ok).setEnabled(False)
--- a/Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing a dialog to enter the data for a bundle operation.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.QtCore import pyqtSlot
 from PyQt4.QtGui import QDialog, QDialogButtonBox

@@ -26,7 +28,7 @@
         @param bookmarksList list of bookmarks (list of strings)
         @param parent parent widget (QWidget)
         """
-        super().__init__(parent)
+        super(HgBundleDialog, self).__init__(parent)
         self.setupUi(self)

         self.buttonBox.button(QDialogButtonBox.Ok).setEnabled(False)
--- a/Plugins/VcsPlugins/vcsMercurial/HgClient.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Plugins/VcsPlugins/vcsMercurial/HgClient.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,11 @@
 Module implementing an interface to the Mercurial command server.
 """

+try:
+    str = unicode
+except (NameError):
+    pass
+
 import struct
 import io

@@ -36,7 +41,7 @@
         @param encoding encoding to be used by the command server (string)
         @param parent reference to the parent object (QObject)
         """
-        super().__init__(parent)
+        super(HgClient, self).__init__(parent)

         self.__server = None
         self.__started = False
--- a/Plugins/VcsPlugins/vcsMercurial/HgClientPromptDialog.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Plugins/VcsPlugins/vcsMercurial/HgClientPromptDialog.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing a prompt dialog for the Mercurial command server.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.QtCore import pyqtSlot
 from PyQt4.QtGui import QDialog, QDialogButtonBox, QTextCursor

@@ -25,7 +27,7 @@
         @param message message sent by the server (string)
         @param parent reference to the parent widget (QWidget)
         """
-        super().__init__(parent)
+        super(HgClientPromptDialog, self).__init__(parent)
         self.setupUi(self)

         self.buttonBox.button(QDialogButtonBox.Ok).setEnabled(False)
--- a/Plugins/VcsPlugins/vcsMercurial/HgCommandDialog.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Plugins/VcsPlugins/vcsMercurial/HgCommandDialog.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing the Mercurial command dialog.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.QtGui import QDialog, QDialogButtonBox

 from .Ui_HgCommandDialog import Ui_HgCommandDialog
@@ -30,7 +32,7 @@
         @param ppath pathname of the project directory (string)
         @param parent parent widget of this dialog (QWidget)
         """
-        super().__init__(parent)
+        super(HgCommandDialog, self).__init__(parent)
         self.setupUi(self)

         self.okButton = self.buttonBox.button(QDialogButtonBox.Ok)
--- a/Plugins/VcsPlugins/vcsMercurial/HgCommitDialog.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Plugins/VcsPlugins/vcsMercurial/HgCommitDialog.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing a dialog to enter the commit message.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.QtCore import pyqtSlot, pyqtSignal, Qt
 from PyQt4.QtGui import QWidget, QDialogButtonBox

@@ -32,7 +34,7 @@
         @param vcs reference to the vcs object
         @param parent parent widget (QWidget)
         """
-        super().__init__(parent, Qt.WindowFlags(Qt.Window))
+        super(HgCommitDialog, self).__init__(parent, Qt.WindowFlags(Qt.Window))
         self.setupUi(self)

         if vcs.version < (2, 2):
--- a/Plugins/VcsPlugins/vcsMercurial/HgCopyDialog.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Plugins/VcsPlugins/vcsMercurial/HgCopyDialog.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing a dialog to enter the data for a copy or rename operation.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 import os.path

 from PyQt4.QtCore import pyqtSlot
@@ -33,7 +35,7 @@
         @param move flag indicating a move operation (boolean)
         @param force flag indicating a forced operation (boolean)
         """
-        super().__init__(parent)
+        super(HgCopyDialog, self).__init__(parent)
         self.setupUi(self)

         self.source = source
--- a/Plugins/VcsPlugins/vcsMercurial/HgDialog.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Plugins/VcsPlugins/vcsMercurial/HgDialog.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,12 @@
 Module implementing a dialog starting a process and showing its output.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+try:
+    str = unicode
+except (NameError):
+    pass
+
 import os

 from PyQt4.QtCore import QProcess, QTimer, pyqtSlot, Qt, QCoreApplication
@@ -35,7 +41,7 @@
         @param hg reference to the Mercurial interface object (Hg)
         @param parent parent widget (QWidget)
         """
-        super().__init__(parent)
+        super(HgDialog, self).__init__(parent)
         self.setupUi(self)

         self.buttonBox.button(QDialogButtonBox.Close).setEnabled(False)
@@ -289,7 +295,7 @@
             self.intercept = False
             evt.accept()
             return
-        super().keyPressEvent(evt)
+        super(HgDialog, self).keyPressEvent(evt)

     def hasAddOrDelete(self):
         """
--- a/Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,12 @@
 Module implementing a dialog to show the output of the hg diff command process.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+try:
+    str = unicode
+except (NameError):
+    pass
+
 import os

 from PyQt4.QtCore import pyqtSlot, QProcess, QTimer, QFileInfo, Qt
@@ -33,7 +39,7 @@
         @param vcs reference to the vcs object
         @param parent parent widget (QWidget)
         """
-        super().__init__(parent)
+        super(HgDiffDialog, self).__init__(parent)
         self.setupUi(self)

         self.buttonBox.button(QDialogButtonBox.Save).setEnabled(False)
@@ -481,4 +487,4 @@
             self.intercept = False
             evt.accept()
             return
-        super().keyPressEvent(evt)
+        super(HgDiffDialog, self).keyPressEvent(evt)
--- a/Plugins/VcsPlugins/vcsMercurial/HgExportDialog.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Plugins/VcsPlugins/vcsMercurial/HgExportDialog.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing a dialog to enter data for the Mercurial export command.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 import os

 from PyQt4.QtCore import pyqtSlot, QDir
@@ -30,7 +32,7 @@

         @param parent reference to the parent widget (QWidget)
         """
-        super().__init__(parent)
+        super(HgExportDialog, self).__init__(parent)
         self.setupUi(self)

         self.buttonBox.button(QDialogButtonBox.Ok).setEnabled(False)
--- a/Plugins/VcsPlugins/vcsMercurial/HgExtension.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Plugins/VcsPlugins/vcsMercurial/HgExtension.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing the base class for Mercurial extension interfaces.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.QtCore import QObject


@@ -20,7 +22,7 @@

         @param vcs reference to the Mercurial vcs object
         """
-        super().__init__(vcs)
+        super(HgExtension, self).__init__(vcs)

         self.vcs = vcs
--- a/Plugins/VcsPlugins/vcsMercurial/HgExtensionProjectHelper.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Plugins/VcsPlugins/vcsMercurial/HgExtensionProjectHelper.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing the project helper base for Mercurial extension interfaces.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.QtCore import QObject


@@ -21,7 +23,7 @@
         """
         Constructor
         """
-        super().__init__()
+        super(HgExtensionProjectHelper, self).__init__()

         self.actions = []
--- a/Plugins/VcsPlugins/vcsMercurial/HgGraftDialog.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Plugins/VcsPlugins/vcsMercurial/HgGraftDialog.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing a dialog to enter the data for a graft session.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.QtCore import pyqtSlot, QDateTime
 from PyQt4.QtGui import QDialog, QDialogButtonBox

@@ -24,7 +26,7 @@
         @param vcs reference to the VCS object (Hg)
         @param parent reference to the parent widget (QWidget)
         """
-        super().__init__(parent)
+        super(HgGraftDialog, self).__init__(parent)
         self.setupUi(self)

         self.dateTimeEdit.setDateTime(QDateTime.currentDateTime())
--- a/Plugins/VcsPlugins/vcsMercurial/HgImportDialog.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Plugins/VcsPlugins/vcsMercurial/HgImportDialog.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing a dialog to enter data for the Mercurial import command.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.QtCore import pyqtSlot, QDateTime
 from PyQt4.QtGui import QDialog, QDialogButtonBox

@@ -28,7 +30,7 @@

         @param parent reference to the parent widget (QWidget)
         """
-        super().__init__(parent)
+        super(HgImportDialog, self).__init__(parent)
         self.setupUi(self)

         self.buttonBox.button(QDialogButtonBox.Ok).setEnabled(False)
--- a/Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,12 @@
 Module implementing a dialog to browse the log history.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+try:
+    str = unicode
+except (NameError):
+    pass
+
 import os

 from PyQt4.QtCore import pyqtSlot, Qt, QDate, QProcess, QTimer, QRegExp, \
@@ -50,7 +56,7 @@
         @param bundle name of a bundle file (string)
         @param parent parent widget (QWidget)
         """
-        super().__init__(parent)
+        super(HgLogBrowserDialog, self).__init__(parent)
         self.setupUi(self)

         if mode == "log":
@@ -1279,7 +1285,7 @@
             self.intercept = False
             evt.accept()
             return
-        super().keyPressEvent(evt)
+        super(HgLogBrowserDialog, self).keyPressEvent(evt)

     @pyqtSlot()
     def on_phaseButton_clicked(self):
--- a/Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,12 @@
 Module implementing a dialog to show the output of the hg log command process.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+try:
+    str = unicode
+except (NameError):
+    pass
+
 import os

 from PyQt4.QtCore import pyqtSlot, QProcess, QTimer, QUrl, QByteArray
@@ -38,7 +44,7 @@
         @param bundle name of a bundle file (string)
         @param parent parent widget (QWidget)
         """
-        super().__init__(parent)
+        super(HgLogDialog, self).__init__(parent)
         self.setupUi(self)

         self.buttonBox.button(QDialogButtonBox.Close).setDefault(True)
@@ -495,4 +501,4 @@
             self.intercept = False
             evt.accept()
             return
-        super().keyPressEvent(evt)
+        super(HgLogDialog, self).keyPressEvent(evt)
--- a/Plugins/VcsPlugins/vcsMercurial/HgMergeDialog.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Plugins/VcsPlugins/vcsMercurial/HgMergeDialog.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing a dialog to enter the data for a merge operation.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.QtCore import pyqtSlot
 from PyQt4.QtGui import QDialog, QDialogButtonBox

@@ -27,7 +29,7 @@
         @param bookmarksList list of bookmarks (list of strings)
         @param parent parent widget (QWidget)
         """
-        super().__init__(parent)
+        super(HgMergeDialog, self).__init__(parent)
         self.setupUi(self)

         self.buttonBox.button(QDialogButtonBox.Ok).setEnabled(False)
--- a/Plugins/VcsPlugins/vcsMercurial/HgMultiRevisionSelectionDialog.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Plugins/VcsPlugins/vcsMercurial/HgMultiRevisionSelectionDialog.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing a dialog to select revisions.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.QtCore import pyqtSlot
 from PyQt4.QtGui import QDialog, QDialogButtonBox

@@ -30,7 +32,7 @@
         @param limitDefault default value for the limit (integer)
         @param parent parent widget (QWidget)
         """
-        super().__init__(parent)
+        super(HgMultiRevisionSelectionDialog, self).__init__(parent)
         self.setupUi(self)

         self.buttonBox.button(QDialogButtonBox.Ok).setEnabled(False)
--- a/Plugins/VcsPlugins/vcsMercurial/HgNewProjectOptionsDialog.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Plugins/VcsPlugins/vcsMercurial/HgNewProjectOptionsDialog.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing the Mercurial Options Dialog for a new project from the repository.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 import os

 from PyQt4.QtCore import pyqtSlot, QDir
@@ -33,7 +35,7 @@
         @param vcs reference to the version control object
         @param parent parent widget (QWidget)
         """
-        super().__init__(parent)
+        super(HgNewProjectOptionsDialog, self).__init__(parent)
         self.setupUi(self)

         self.vcsDirectoryCompleter = E5DirCompleter(self.vcsUrlEdit)
--- a/Plugins/VcsPlugins/vcsMercurial/HgOptionsDialog.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Plugins/VcsPlugins/vcsMercurial/HgOptionsDialog.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing a dialog to enter options used to start a project in the VCS.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.QtGui import QDialog

 from .Ui_HgOptionsDialog import Ui_HgOptionsDialog
@@ -25,7 +27,7 @@
         @param project reference to the project object
         @param parent parent widget (QWidget)
         """
-        super().__init__(parent)
+        super(HgOptionsDialog, self).__init__(parent)
         self.setupUi(self)

     def getData(self):
--- a/Plugins/VcsPlugins/vcsMercurial/HgPhaseDialog.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Plugins/VcsPlugins/vcsMercurial/HgPhaseDialog.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing a dialog to enter data for the Mercurial Phase operation.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.QtCore import pyqtSlot
 from PyQt4.QtGui import QDialog, QDialogButtonBox

@@ -23,7 +25,7 @@

         @param parent reference to the parent widget (QWidget)
         """
-        super().__init__(parent)
+        super(HgPhaseDialog, self).__init__(parent)
         self.setupUi(self)

         self.phaseCombo.addItem("", "")
--- a/Plugins/VcsPlugins/vcsMercurial/HgRemoveSubrepositoriesDialog.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Plugins/VcsPlugins/vcsMercurial/HgRemoveSubrepositoriesDialog.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing a dialog to remove sub-repositories.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.QtCore import pyqtSlot
 from PyQt4.QtGui import QDialog

@@ -24,7 +26,7 @@
         @param subrepositories list of sub-repository entries (list of strings)
         @param parent reference to the parent widget (QWidget)
         """
-        super().__init__(parent)
+        super(HgRemoveSubrepositoriesDialog, self).__init__(parent)
         self.setupUi(self)

         self.subrepositories.addItems(subrepositories)
--- a/Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing a dialog to select a revision.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.QtCore import pyqtSlot
 from PyQt4.QtGui import QDialog, QDialogButtonBox

@@ -28,7 +30,7 @@
         @param showNone flag influencing the label of the 'None' selection (boolean)
         @param parent parent widget (QWidget)
         """
-        super().__init__(parent)
+        super(HgRevisionSelectionDialog, self).__init__(parent)
         self.setupUi(self)

         self.buttonBox.button(QDialogButtonBox.Ok).setEnabled(False)
--- a/Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing a dialog to enter the revisions for the hg diff command.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.QtCore import pyqtSlot
 from PyQt4.QtGui import QDialog, QDialogButtonBox

@@ -26,7 +28,7 @@
         @param bookmarksList list of bookmarks (list of strings)
         @param parent parent widget of the dialog (QWidget)
         """
-        super().__init__(parent)
+        super(HgRevisionsSelectionDialog, self).__init__(parent)
         self.setupUi(self)

         self.buttonBox.button(QDialogButtonBox.Ok).setEnabled(False)
--- a/Plugins/VcsPlugins/vcsMercurial/HgServeDialog.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Plugins/VcsPlugins/vcsMercurial/HgServeDialog.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,12 @@
 Module implementing a dialog for the Mercurial server.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+try:
+    str = unicode
+except (NameError):
+    pass
+
 import os

 from PyQt4.QtCore import QProcess, Qt, QSize
@@ -34,7 +40,7 @@
         @param path path of the repository to serve (string)
         @param parent reference to the parent widget (QWidget)
         """
-        super().__init__(parent)
+        super(HgServeDialog, self).__init__(parent)

         self.vcs = vcs
         self.__repoPath = path
--- a/Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,12 @@
 Module implementing a dialog to show the output of the hg status command process.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+try:
+    str = unicode
+except (NameError):
+    pass
+
 import os

 from PyQt4.QtCore import pyqtSlot, Qt, QProcess, QTimer
@@ -32,7 +38,7 @@
         @param vcs reference to the vcs object
         @param parent parent widget (QWidget)
         """
-        super().__init__(parent)
+        super(HgStatusDialog, self).__init__(parent)
         self.setupUi(self)

         self.__toBeCommittedColumn = 0
@@ -409,7 +415,7 @@
             self.intercept = False
             evt.accept()
             return
-        super().keyPressEvent(evt)
+        super(HgStatusDialog, self).keyPressEvent(evt)

     @pyqtSlot()
     def on_refreshButton_clicked(self):
--- a/Plugins/VcsPlugins/vcsMercurial/HgStatusMonitorThread.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Plugins/VcsPlugins/vcsMercurial/HgStatusMonitorThread.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,12 @@
 Module implementing the VCS status monitor thread class for Mercurial.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+try:
+    str = unicode
+except (NameError):
+    pass
+
 from PyQt4.QtCore import QProcess

 from VCS.StatusMonitorThread import VcsStatusMonitorThread
--- a/Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,12 @@
 Module implementing a dialog to show a list of tags or branches.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+try:
+    str = unicode
+except (NameError):
+    pass
+
 import os

 from PyQt4.QtCore import pyqtSlot, QProcess, Qt, QTimer, QCoreApplication
@@ -31,7 +37,7 @@
         @param vcs reference to the vcs object
         @param parent parent widget (QWidget)
         """
-        super().__init__(parent)
+        super(HgTagBranchListDialog, self).__init__(parent)
         self.setupUi(self)

         self.buttonBox.button(QDialogButtonBox.Close).setEnabled(False)
@@ -335,4 +341,4 @@
             self.intercept = False
             evt.accept()
             return
-        super().keyPressEvent(evt)
+        super(HgTagBranchListDialog, self).keyPressEvent(evt)
--- a/Plugins/VcsPlugins/vcsMercurial/HgTagDialog.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Plugins/VcsPlugins/vcsMercurial/HgTagDialog.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing a dialog to enter the data for a tagging operation.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.QtCore import pyqtSlot
 from PyQt4.QtGui import QDialog, QDialogButtonBox

@@ -29,7 +31,7 @@
         @param taglist list of previously entered tags (list of strings)
         @param parent parent widget (QWidget)
         """
-        super().__init__(parent)
+        super(HgTagDialog, self).__init__(parent)
         self.setupUi(self)

         self.okButton = self.buttonBox.button(QDialogButtonBox.Ok)
--- a/Plugins/VcsPlugins/vcsMercurial/HgUtilities.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Plugins/VcsPlugins/vcsMercurial/HgUtilities.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing some common utility functions for the Mercurial package.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 import os

 import Utilities
--- a/Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing the VCS project browser helper for Mercurial.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 import os

 from PyQt4.QtGui import QMenu, QDialog
--- a/Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing the VCS project helper for Mercurial.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 import os

 from PyQt4.QtGui import QMenu
--- a/Plugins/VcsPlugins/vcsMercurial/PurgeExtension/HgPurgeListDialog.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Plugins/VcsPlugins/vcsMercurial/PurgeExtension/HgPurgeListDialog.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing a dialog to list all files not tracked by Mercurial.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.QtGui import QDialog

 from .Ui_HgPurgeListDialog import Ui_HgPurgeListDialog
@@ -23,7 +25,7 @@
         @param entries list of entries to be shown (list of strings)
         @param parent reference to the parent widget (QWidget)
         """
-        super().__init__(parent)
+        super(HgPurgeListDialog, self).__init__(parent)
         self.setupUi(self)

         self.purgeList.addItems(sorted(entries))
--- a/Plugins/VcsPlugins/vcsMercurial/PurgeExtension/ProjectHelper.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Plugins/VcsPlugins/vcsMercurial/PurgeExtension/ProjectHelper.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing the purge extension project helper.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.QtGui import QMenu

 from E5Gui.E5Action import E5Action
@@ -24,7 +26,7 @@
         """
         Constructor
         """
-        super().__init__()
+        super(PurgeProjectHelper, self).__init__()

     def initActions(self):
         """
--- a/Plugins/VcsPlugins/vcsMercurial/PurgeExtension/purge.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Plugins/VcsPlugins/vcsMercurial/PurgeExtension/purge.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,12 @@
 Module implementing the purge extension interface.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+try:
+    str = unicode
+except (NameError):
+    pass
+
 import os

 from PyQt4.QtCore import QProcess
@@ -28,7 +34,7 @@

         @param vcs reference to the Mercurial vcs object
         """
-        super().__init__(vcs)
+        super(Purge, self).__init__(vcs)

         self.purgeListDialog = None
--- a/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,12 @@
 Module implementing a dialog to define guards for patches.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+try:
+    str = unicode
+except (NameError):
+    pass
+
 import os

 from PyQt4.QtCore import pyqtSlot, Qt, QProcess, QTimer, QCoreApplication
@@ -33,7 +39,7 @@
         @param patchesList list of patches (list of strings)
         @param parent reference to the parent widget (QWidget)
         """
-        super().__init__(parent)
+        super(HgQueuesDefineGuardsDialog, self).__init__(parent)
         self.setupUi(self)

         self.process = None
--- a/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesFoldDialog.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesFoldDialog.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing a dialog to enter data to fold patches.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.QtCore import pyqtSlot, Qt
 from PyQt4.QtGui import QDialog, QDialogButtonBox, QTreeWidgetItem

@@ -26,7 +28,7 @@
         @param patchesList list of patches to select from (list of strings)
         @param parent reference to the parent widget (QWidget)
         """
-        super().__init__(parent)
+        super(HgQueuesFoldDialog, self).__init__(parent)
         self.setupUi(self)

         self.addButton.setIcon(UI.PixmapCache.getIcon("1downarrow.png"))
--- a/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesGuardsSelectionDialog.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesGuardsSelectionDialog.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing a dialog to select a list of guards.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.QtGui import QDialog, QDialogButtonBox, QListWidgetItem, QAbstractItemView

 from .Ui_HgQueuesGuardsSelectionDialog import Ui_HgQueuesGuardsSelectionDialog
@@ -25,7 +27,7 @@
         @param listOnly flag indicating to only list the guards (boolean)
         @param parent reference to the parent widget (QWidget)
         """
-        super().__init__(parent)
+        super(HgQueuesGuardsSelectionDialog, self).__init__(parent)
         self.setupUi(self)

         for guard in guards:
--- a/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesHeaderDialog.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesHeaderDialog.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,12 @@
 Module implementing a dialog to show the commit message of the current patch.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+try:
+    str = unicode
+except (NameError):
+    pass
+
 import os

 from PyQt4.QtCore import QProcess, QTimer, Qt, QCoreApplication
@@ -30,7 +36,7 @@
         @param vcs reference to the vcs object
         @param parent reference to the parent widget (QWidget)
         """
-        super().__init__(parent)
+        super(HgQueuesHeaderDialog, self).__init__(parent)
         self.setupUi(self)

         self.buttonBox.button(QDialogButtonBox.Close).setEnabled(False)
--- a/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListAllGuardsDialog.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListAllGuardsDialog.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,12 @@
 Module implementing a dialog to show all guards for all patches.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+try:
+    str = unicode
+except (NameError):
+    pass
+
 import os

 from PyQt4.QtCore import QProcess, QCoreApplication
@@ -28,7 +34,7 @@

         @param parent reference to the parent widget (QWidget)
         """
-        super().__init__(parent)
+        super(HgQueuesListAllGuardsDialog, self).__init__(parent)
         self.setupUi(self)

         self.vcs = vcs
--- a/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,12 @@
 Module implementing a dialog to show a list of applied and unapplied patches.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+try:
+    str = unicode
+except (NameError):
+    pass
+
 import os

 from PyQt4.QtCore import pyqtSlot, QProcess, Qt, QTimer, QCoreApplication
@@ -31,7 +37,7 @@
         @param vcs reference to the vcs object
         @param parent parent widget (QWidget)
         """
-        super().__init__(parent)
+        super(HgQueuesListDialog, self).__init__(parent)
         self.setupUi(self)

         self.buttonBox.button(QDialogButtonBox.Close).setEnabled(False)
@@ -431,4 +437,4 @@
             self.intercept = False
             evt.accept()
             return
-        super().keyPressEvent(evt)
+        super(HgQueuesListDialog, self).keyPressEvent(evt)
--- a/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListGuardsDialog.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListGuardsDialog.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,12 @@
 Module implementing a dialog to show the guards of a selected patch.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+try:
+    str = unicode
+except (NameError):
+    pass
+
 import os

 from PyQt4.QtCore import pyqtSlot, QProcess, QTimer, QCoreApplication
@@ -30,7 +36,7 @@
         @param patchesList list of patches (list of strings)
         @param parent reference to the parent widget (QWidget)
         """
-        super().__init__(parent)
+        super(HgQueuesListGuardsDialog, self).__init__(parent)
         self.setupUi(self)

         self.process = QProcess()
--- a/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesNewPatchDialog.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesNewPatchDialog.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing a dialog to get the data for a new patch.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.QtCore import pyqtSlot, QDateTime
 from PyQt4.QtGui import QDialog, QDialogButtonBox

@@ -29,7 +31,7 @@
         @param message text to set as the commit message (string)
         @param parent reference to the parent widget (QWidget)
         """
-        super().__init__(parent)
+        super(HgQueuesNewPatchDialog, self).__init__(parent)
         self.setupUi(self)

         self.__mode = mode
--- a/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesQueueManagementDialog.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesQueueManagementDialog.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,12 @@
 Module implementing a dialog used by the queue management functions.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+try:
+    str = unicode
+except (NameError):
+    pass
+
 from PyQt4.QtCore import pyqtSlot, QProcess, QCoreApplication
 from PyQt4.QtGui import QDialog, QDialogButtonBox, QAbstractItemView, QListWidgetItem, \
     QAbstractButton
@@ -38,7 +44,7 @@
         @param vcs reference to the vcs object
         @param parent reference to the parent widget (QWidget)
         """
-        super().__init__(parent)
+        super(HgQueuesQueueManagementDialog, self).__init__(parent)
         self.setupUi(self)

         if mode not in (HgQueuesQueueManagementDialog.NO_INPUT,
--- a/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesRenamePatchDialog.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesRenamePatchDialog.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing a dialog to enter the data to rename a patch.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.QtCore import pyqtSlot
 from PyQt4.QtGui import QDialog, QDialogButtonBox

@@ -25,7 +27,7 @@
         @param patchesList list of patches to select from (list of strings)
         @param parent reference to the parent widget (QWidget)
         """
-        super().__init__(parent)
+        super(HgQueuesRenamePatchDialog, self).__init__(parent)
         self.setupUi(self)

         self.currentButton.setText(
--- a/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing the queues extension project helper.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.QtGui import QMenu

 from E5Gui.E5Action import E5Action
@@ -25,7 +27,7 @@
         """
         Constructor
         """
-        super().__init__()
+        super(QueuesProjectHelper, self).__init__()

     def initActions(self):
         """
--- a/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,12 @@
 Module implementing the queues extension interface.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+try:
+    str = unicode
+except (NameError):
+    pass
+
 import os

 from PyQt4.QtCore import QProcess
@@ -42,7 +48,7 @@

         @param vcs reference to the Mercurial vcs object
         """
-        super().__init__(vcs)
+        super(Queues, self).__init__(vcs)

         self.qdiffDialog = None
         self.qheaderDialog = None
--- a/Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing a dialog to enter the data for a rebase session.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.QtCore import pyqtSlot
 from PyQt4.QtGui import QDialog, QDialogButtonBox

@@ -26,7 +28,7 @@
         @param bookmarksList list of bookmarks (list of strings)
         @param parent reference to the parent widget (QWidget)
         """
-        super().__init__(parent)
+        super(HgRebaseDialog, self).__init__(parent)
         self.setupUi(self)

         self.tag1Combo.addItems(sorted(tagsList))
--- a/Plugins/VcsPlugins/vcsMercurial/RebaseExtension/ProjectHelper.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Plugins/VcsPlugins/vcsMercurial/RebaseExtension/ProjectHelper.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing the rebase extension project helper.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.QtGui import QMenu

 from E5Gui.E5Action import E5Action
@@ -25,7 +27,7 @@
         """
         Constructor
         """
-        super().__init__()
+        super(RebaseProjectHelper, self).__init__()

     def initActions(self):
         """
--- a/Plugins/VcsPlugins/vcsMercurial/RebaseExtension/rebase.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Plugins/VcsPlugins/vcsMercurial/RebaseExtension/rebase.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing the rebase extension interface.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 import os

 from PyQt4.QtGui import QDialog
@@ -25,7 +27,7 @@

         @param vcs reference to the Mercurial vcs object
         """
-        super().__init__(vcs)
+        super(Rebase, self).__init__(vcs)

     def hgRebase(self, path):
         """
--- a/Plugins/VcsPlugins/vcsMercurial/TransplantExtension/ProjectHelper.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Plugins/VcsPlugins/vcsMercurial/TransplantExtension/ProjectHelper.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing the transplant extension project helper.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.QtGui import QMenu

 from E5Gui.E5Action import E5Action
@@ -25,7 +27,7 @@
         """
         Constructor
         """
-        super().__init__()
+        super(TransplantProjectHelper, self).__init__()

     def setObjects(self, vcsObject, projectObject):
         """
@@ -34,7 +36,7 @@
         @param vcsObject reference to the vcs object
         @param projectObject reference to the project object
         """
-        super().setObjects(vcsObject, projectObject)
+        super(TransplantProjectHelper, self).setObjects(vcsObject, projectObject)

         if self.vcs.version >= (2, 3):
             # transplant is deprecated as of Mercurial 2.3
--- a/Plugins/VcsPlugins/vcsMercurial/TransplantExtension/TransplantDialog.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Plugins/VcsPlugins/vcsMercurial/TransplantExtension/TransplantDialog.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing a dialog to enter the data for a transplant session.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.QtCore import pyqtSlot
 from PyQt4.QtGui import QDialog, QDialogButtonBox, QValidator

@@ -24,7 +26,7 @@
         @param multiRevsAllowed flag indicating, if multi revs are allowed (boolean)
         @param parent reference to the parent object (QObject)
         """
-        super().__init__(parent)
+        super(RevisionsValidator, self).__init__(parent)

         self.__multiRevsAllowed = multiRevsAllowed

@@ -78,7 +80,7 @@
         @param branchesList list of available branch names (list of strings)
         @param parent reference to the parent widget (QWidget)
         """
-        super().__init__(parent)
+        super(TransplantDialog, self).__init__(parent)
         self.setupUi(self)

         self.branchesCombo.addItems(["", "default"] + sorted(branchesList))
--- a/Plugins/VcsPlugins/vcsMercurial/TransplantExtension/transplant.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Plugins/VcsPlugins/vcsMercurial/TransplantExtension/transplant.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing the transplant extension interface.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 import os

 from PyQt4.QtGui import QDialog
@@ -25,7 +27,7 @@

         @param vcs reference to the Mercurial vcs object
         """
-        super().__init__(vcs)
+        super(Transplant, self).__init__(vcs)

     def hgTransplant(self, path):
         """
--- a/Plugins/VcsPlugins/vcsMercurial/hg.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Plugins/VcsPlugins/vcsMercurial/hg.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,12 @@
 Module implementing the version control systems interface to Mercurial.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+try:
+    str = unicode
+except (NameError):
+    pass
+
 import os
 import shutil
 import re
--- a/Plugins/VcsPlugins/vcsPySvn/Config.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Plugins/VcsPlugins/vcsPySvn/Config.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module defining configuration variables for the subversion package
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 # Available protocols for the repository URL
 ConfigSvnProtocols = [
     'file://',
--- a/Plugins/VcsPlugins/vcsPySvn/ConfigurationPage/SubversionPage.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Plugins/VcsPlugins/vcsPySvn/ConfigurationPage/SubversionPage.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing the Subversion configuration page.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.QtCore import pyqtSlot

 from Preferences.ConfigurationPages.ConfigurationPageBase import ConfigurationPageBase
@@ -23,7 +25,7 @@

         @param plugin reference to the plugin object
         """
-        super().__init__()
+        super(SubversionPage, self).__init__()
         self.setupUi(self)
         self.setObjectName("SubversionPage")
--- a/Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py	Mon Mar 25 03:11:06 2013 +0100
@@ -6,6 +6,8 @@
 """
 Module implementing the VCS project browser helper for subversion.
 """
+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 import os

 import pysvn
--- a/Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing the VCS project helper for Subversion.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 import os

 from E5Gui.E5Application import e5App
--- a/Plugins/VcsPlugins/vcsPySvn/SvnBlameDialog.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Plugins/VcsPlugins/vcsPySvn/SvnBlameDialog.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing a dialog to show the output of the svn blame command.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 import os

 import pysvn
@@ -31,7 +33,7 @@
         @param vcs reference to the vcs object
         @param parent parent widget (QWidget)
         """
-        super().__init__(parent)
+        super(SvnBlameDialog, self).__init__(parent)
         self.setupUi(self)
         SvnDialogMixin.__init__(self)
--- a/Plugins/VcsPlugins/vcsPySvn/SvnChangeListsDialog.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Plugins/VcsPlugins/vcsPySvn/SvnChangeListsDialog.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing a dialog to browse the change lists.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 import os

 import pysvn
@@ -31,7 +33,7 @@
         @param vcs reference to the vcs object
         @param parent parent widget (QWidget)
         """
-        super().__init__(parent)
+        super(SvnChangeListsDialog, self).__init__(parent)
         self.setupUi(self)
         SvnDialogMixin.__init__(self)
--- a/Plugins/VcsPlugins/vcsPySvn/SvnCommandDialog.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Plugins/VcsPlugins/vcsPySvn/SvnCommandDialog.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing the Subversion command dialog.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.QtCore import pyqtSlot
 from PyQt4.QtGui import QDialog, QDialogButtonBox

@@ -35,7 +37,7 @@
         @param ppath pathname of the project directory (string)
         @param parent parent widget of this dialog (QWidget)
         """
-        super().__init__(parent)
+        super(SvnCommandDialog, self).__init__(parent)
         self.setupUi(self)

         self.workdirCompleter = E5DirCompleter(self.workdirCombo)
--- a/Plugins/VcsPlugins/vcsPySvn/SvnCommitDialog.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Plugins/VcsPlugins/vcsPySvn/SvnCommitDialog.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing a dialog to enter the commit message.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 import pysvn

 from PyQt4.QtCore import pyqtSignal, Qt, pyqtSlot
@@ -34,7 +36,7 @@
         @param changelists list of available change lists (list of strings)
         @param parent parent widget (QWidget)
         """
-        super().__init__(parent, Qt.WindowFlags(Qt.Window))
+        super(SvnCommitDialog, self).__init__(parent, Qt.WindowFlags(Qt.Window))
         self.setupUi(self)

         if pysvn.svn_version < (1, 5, 0) or pysvn.version < (1, 6, 0):
--- a/Plugins/VcsPlugins/vcsPySvn/SvnConst.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Plugins/VcsPlugins/vcsPySvn/SvnConst.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing some constants for the pysvn package.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.QtCore import QT_TRANSLATE_NOOP

 import pysvn
--- a/Plugins/VcsPlugins/vcsPySvn/SvnCopyDialog.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Plugins/VcsPlugins/vcsPySvn/SvnCopyDialog.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing a dialog to enter the data for a copy operation.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 import os.path

 from PyQt4.QtCore import pyqtSlot
@@ -33,7 +35,7 @@
         @param move flag indicating a move operation (boolean)
         @param force flag indicating a forced operation (boolean)
         """
-        super().__init__(parent)
+        super(SvnCopyDialog, self).__init__(parent)
         self.setupUi(self)

         self.source = source
--- a/Plugins/VcsPlugins/vcsPySvn/SvnDialog.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Plugins/VcsPlugins/vcsPySvn/SvnDialog.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing a dialog to show the output of a pysvn action.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 import pysvn

 from PyQt4.QtGui import QDialog, QApplication, QDialogButtonBox
@@ -34,7 +36,7 @@
         @keyparam parent parent widget (QWidget)
         @keyparam log optional log message (string)
         """
-        super().__init__(parent)
+        super(SvnDialog, self).__init__(parent)
         self.setupUi(self)
         SvnDialogMixin.__init__(self, log)
--- a/Plugins/VcsPlugins/vcsPySvn/SvnDialogMixin.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Plugins/VcsPlugins/vcsPySvn/SvnDialogMixin.py	Mon Mar 25 03:11:06 2013 +0100
@@ -8,6 +8,8 @@
 the pysvn client.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.QtGui import QApplication, QDialog, QWidget, QCursor
--- a/Plugins/VcsPlugins/vcsPySvn/SvnDiffDialog.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Plugins/VcsPlugins/vcsPySvn/SvnDiffDialog.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing a dialog to show the output of the svn diff command process.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 import os

 import pysvn
@@ -35,7 +37,7 @@
         @param vcs reference to the vcs object
         @param parent parent widget (QWidget)
         """
-        super().__init__(parent)
+        super(SvnDiffDialog, self).__init__(parent)
         self.setupUi(self)
         SvnDialogMixin.__init__(self)
--- a/Plugins/VcsPlugins/vcsPySvn/SvnInfoDialog.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Plugins/VcsPlugins/vcsPySvn/SvnInfoDialog.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing a dialog to show repository related information for a file/directory.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 import os

 import pysvn
@@ -31,7 +33,7 @@
         @param vcs reference to the vcs object
         @param parent parent widget (QWidget)
         """
-        super().__init__(parent)
+        super(SvnInfoDialog, self).__init__(parent)
         self.setupUi(self)
         SvnDialogMixin.__init__(self)
--- a/Plugins/VcsPlugins/vcsPySvn/SvnLogBrowserDialog.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Plugins/VcsPlugins/vcsPySvn/SvnLogBrowserDialog.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing a dialog to browse the log history.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 import os

 import pysvn
@@ -34,7 +36,7 @@
         @param vcs reference to the vcs object
         @param parent parent widget (QWidget)
         """
-        super().__init__(parent)
+        super(SvnLogBrowserDialog, self).__init__(parent)
         self.setupUi(self)
         SvnDialogMixin.__init__(self)
--- a/Plugins/VcsPlugins/vcsPySvn/SvnLogDialog.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Plugins/VcsPlugins/vcsPySvn/SvnLogDialog.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing a dialog to show the output of the svn log command process.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 import os

 import pysvn
@@ -36,7 +38,7 @@
         @param vcs reference to the vcs object
         @param parent parent widget (QWidget)
         """
-        super().__init__(parent)
+        super(SvnLogDialog, self).__init__(parent)
         self.setupUi(self)
         SvnDialogMixin.__init__(self)
--- a/Plugins/VcsPlugins/vcsPySvn/SvnLoginDialog.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Plugins/VcsPlugins/vcsPySvn/SvnLoginDialog.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing the login dialog for pysvn.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.QtGui import QDialog

 from .Ui_SvnLoginDialog import Ui_SvnLoginDialog
@@ -25,7 +27,7 @@
         @param may_save flag indicating, that subversion is willing to save
             the answers returned (boolean)
         """
-        super().__init__(parent)
+        super(SvnLoginDialog, self).__init__(parent)
         self.setupUi(self)

         self.realmLabel.setText(self.trUtf8("<b>Enter login data for realm {0}.</b>")\
--- a/Plugins/VcsPlugins/vcsPySvn/SvnMergeDialog.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Plugins/VcsPlugins/vcsPySvn/SvnMergeDialog.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing a dialog to enter the data for a merge operation.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.QtCore import QRegExp
 from PyQt4.QtGui import QDialog, QDialogButtonBox

@@ -27,7 +29,7 @@
         @param force flag indicating a forced merge (boolean)
         @param parent parent widget (QWidget)
         """
-        super().__init__(parent)
+        super(SvnMergeDialog, self).__init__(parent)
         self.setupUi(self)

         self.forceCheckBox.setChecked(force)
--- a/Plugins/VcsPlugins/vcsPySvn/SvnNewProjectOptionsDialog.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Plugins/VcsPlugins/vcsPySvn/SvnNewProjectOptionsDialog.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing the Subversion Options Dialog for a new project from the repository.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 import os

 from PyQt4.QtCore import QDir, pyqtSlot
@@ -33,7 +35,7 @@
         @param vcs reference to the version control object
         @param parent parent widget (QWidget)
         """
-        super().__init__(parent)
+        super(SvnNewProjectOptionsDialog, self).__init__(parent)
         self.setupUi(self)

         self.vcsDirectoryCompleter = E5DirCompleter(self.vcsUrlEdit)
--- a/Plugins/VcsPlugins/vcsPySvn/SvnOptionsDialog.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Plugins/VcsPlugins/vcsPySvn/SvnOptionsDialog.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing a dialog to enter options used to start a project in the VCS.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 import os

 from PyQt4.QtCore import QDir, pyqtSlot
@@ -34,7 +36,7 @@
         @param project reference to the project object
         @param parent parent widget (QWidget)
         """
-        super().__init__(parent)
+        super(SvnOptionsDialog, self).__init__(parent)
         self.setupUi(self)

         self.vcsDirectoryCompleter = E5DirCompleter(self.vcsUrlEdit)
--- a/Plugins/VcsPlugins/vcsPySvn/SvnPropDelDialog.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Plugins/VcsPlugins/vcsPySvn/SvnPropDelDialog.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing a dialog to enter the data for a new property.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.QtGui import QDialog, QDialogButtonBox

 from .Ui_SvnPropDelDialog import Ui_SvnPropDelDialog
@@ -23,7 +25,7 @@
         @param recursive flag indicating a recursive set is requested
         @param parent parent widget (QWidget)
         """
-        super().__init__(parent)
+        super(SvnPropDelDialog, self).__init__(parent)
         self.setupUi(self)

         self.okButton = self.buttonBox.button(QDialogButtonBox.Ok)
--- a/Plugins/VcsPlugins/vcsPySvn/SvnPropListDialog.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Plugins/VcsPlugins/vcsPySvn/SvnPropListDialog.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing a dialog to show the output of the svn proplist command process.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 import os

 import pysvn
@@ -30,7 +32,7 @@
         @param vcs reference to the vcs object
         @param parent parent widget (QWidget)
         """
-        super().__init__(parent)
+        super(SvnPropListDialog, self).__init__(parent)
         self.setupUi(self)
         SvnDialogMixin.__init__(self)
--- a/Plugins/VcsPlugins/vcsPySvn/SvnPropSetDialog.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Plugins/VcsPlugins/vcsPySvn/SvnPropSetDialog.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing a dialog to enter the data for a new property.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.QtGui import QDialog

 from .Ui_SvnPropSetDialog import Ui_SvnPropSetDialog
@@ -23,7 +25,7 @@
         @param recursive flag indicating a recursive set is requested
         @param parent parent widget (QWidget)
         """
-        super().__init__(parent)
+        super(SvnPropSetDialog, self).__init__(parent)
         self.setupUi(self)

         self.recurseCheckBox.setChecked(recursive)
--- a/Plugins/VcsPlugins/vcsPySvn/SvnRelocateDialog.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Plugins/VcsPlugins/vcsPySvn/SvnRelocateDialog.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing a dialog to enter the data to relocate the workspace.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.QtGui import QDialog

 from .Ui_SvnRelocateDialog import Ui_SvnRelocateDialog
@@ -23,7 +25,7 @@
         @param currUrl current repository URL (string)
         @param parent parent widget (QWidget)
         """
-        super().__init__(parent)
+        super(SvnRelocateDialog, self).__init__(parent)
         self.setupUi(self)

         self.currUrlLabel.setText(currUrl)
--- a/Plugins/VcsPlugins/vcsPySvn/SvnRepoBrowserDialog.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Plugins/VcsPlugins/vcsPySvn/SvnRepoBrowserDialog.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing the subversion repository browser dialog.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 import pysvn

 from PyQt4.QtCore import QMutexLocker, Qt, pyqtSlot
@@ -35,7 +37,7 @@
         @param mode mode of the dialog (string, "browse" or "select")
         @param parent parent widget (QWidget)
         """
-        super().__init__(parent)
+        super(SvnRepoBrowserDialog, self).__init__(parent)
         self.setupUi(self)
         SvnDialogMixin.__init__(self)

@@ -278,7 +280,7 @@
         if self.focusWidget() == self.urlCombo:
             return

-        super().accept()
+        super(SvnRepoBrowserDialog, self).accept()

     def getSelectedUrl(self):
         """
--- a/Plugins/VcsPlugins/vcsPySvn/SvnRevisionSelectionDialog.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Plugins/VcsPlugins/vcsPySvn/SvnRevisionSelectionDialog.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing a dialog to enter the revisions for the svn diff command.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.QtCore import QDate, QDateTime, Qt
 from PyQt4.QtGui import QDialog

@@ -23,7 +25,7 @@

         @param parent parent widget of the dialog (QWidget)
         """
-        super().__init__(parent)
+        super(SvnRevisionSelectionDialog, self).__init__(parent)
         self.setupUi(self)

         self.date1Edit.setDate(QDate.currentDate())
--- a/Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py	Mon Mar 25 03:11:06 2013 +0100
@@ -8,6 +8,8 @@
 process.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 import os

 import pysvn
@@ -40,7 +42,7 @@
         @param vcs reference to the vcs object
         @param parent parent widget (QWidget)
         """
-        super().__init__(parent)
+        super(SvnStatusDialog, self).__init__(parent)
         self.setupUi(self)
         SvnDialogMixin.__init__(self)
--- a/Plugins/VcsPlugins/vcsPySvn/SvnStatusMonitorThread.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Plugins/VcsPlugins/vcsPySvn/SvnStatusMonitorThread.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing the VCS status monitor thread class for Subversion.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 import os

 import pysvn
--- a/Plugins/VcsPlugins/vcsPySvn/SvnSwitchDialog.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Plugins/VcsPlugins/vcsPySvn/SvnSwitchDialog.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing a dialog to enter the data for a switch operation.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.QtGui import QDialog

 from .Ui_SvnSwitchDialog import Ui_SvnSwitchDialog
@@ -26,7 +28,7 @@
             repository (boolean)
         @param parent parent widget (QWidget)
         """
-        super().__init__(parent)
+        super(SvnSwitchDialog, self).__init__(parent)
         self.setupUi(self)

         self.tagCombo.clear()
--- a/Plugins/VcsPlugins/vcsPySvn/SvnTagBranchListDialog.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Plugins/VcsPlugins/vcsPySvn/SvnTagBranchListDialog.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing a dialog to show a list of tags or branches.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 import os

 import pysvn
@@ -34,7 +36,7 @@
         @param vcs reference to the vcs object
         @param parent parent widget (QWidget)
         """
-        super().__init__(parent)
+        super(SvnTagBranchListDialog, self).__init__(parent)
         self.setupUi(self)
         SvnDialogMixin.__init__(self)
--- a/Plugins/VcsPlugins/vcsPySvn/SvnTagDialog.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Plugins/VcsPlugins/vcsPySvn/SvnTagDialog.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing a dialog to enter the data for a tagging operation.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.QtCore import pyqtSlot
 from PyQt4.QtGui import QDialog, QDialogButtonBox

@@ -27,7 +29,7 @@
             repository (boolean)
         @param parent parent widget (QWidget)
         """
-        super().__init__(parent)
+        super(SvnTagDialog, self).__init__(parent)
         self.setupUi(self)

         self.okButton = self.buttonBox.button(QDialogButtonBox.Ok)
--- a/Plugins/VcsPlugins/vcsPySvn/SvnUrlSelectionDialog.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Plugins/VcsPlugins/vcsPySvn/SvnUrlSelectionDialog.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing a dialog to enter the URLs for the svn diff command.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.QtCore import QRegExp, pyqtSlot
 from PyQt4.QtGui import QDialog

@@ -34,7 +36,7 @@
         @param path pathname to determine the repository URL from (string)
         @param parent parent widget of the dialog (QWidget)
         """
-        super().__init__(parent)
+        super(SvnUrlSelectionDialog, self).__init__(parent)
         self.setupUi(self)

         if not hasattr(pysvn.Client(), 'diff_summarize'):
--- a/Plugins/VcsPlugins/vcsPySvn/SvnUtilities.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Plugins/VcsPlugins/vcsPySvn/SvnUtilities.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing some common utility functions for the pysvn package.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 import os

 from PyQt4.QtCore import QDateTime, Qt
--- a/Plugins/VcsPlugins/vcsPySvn/subversion.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Plugins/VcsPlugins/vcsPySvn/subversion.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing the version control systems interface to Subversion.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 import os
 import shutil
 import urllib.request
--- a/Plugins/VcsPlugins/vcsSubversion/Config.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Plugins/VcsPlugins/vcsSubversion/Config.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module defining configuration variables for the subversion package
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 # Available protocols for the repository URL
 ConfigSvnProtocols = [
     'file://',
--- a/Plugins/VcsPlugins/vcsSubversion/ConfigurationPage/SubversionPage.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Plugins/VcsPlugins/vcsSubversion/ConfigurationPage/SubversionPage.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing the Subversion configuration page.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.QtCore import pyqtSlot

 from Preferences.ConfigurationPages.ConfigurationPageBase import ConfigurationPageBase
@@ -23,7 +25,7 @@

         @param plugin reference to the plugin object
         """
-        super().__init__()
+        super(SubversionPage, self).__init__()
         self.setupUi(self)
         self.setObjectName("SubversionPage")
--- a/Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing the VCS project browser helper for subversion.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 import os
 from PyQt4.QtGui import QMenu
--- a/Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing the VCS project helper for Subversion.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 import os

 from E5Gui.E5Application import e5App
--- a/Plugins/VcsPlugins/vcsSubversion/SvnBlameDialog.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Plugins/VcsPlugins/vcsSubversion/SvnBlameDialog.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,12 @@
 Module implementing a dialog to show the output of the svn blame command.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+try:
+    str = unicode
+except (NameError):
+    pass
+
 import os

 from PyQt4.QtCore import QTimer, QProcess, Qt, pyqtSlot
@@ -32,7 +38,7 @@
         @param vcs reference to the vcs object
         @param parent parent widget (QWidget)
         """
-        super().__init__(parent)
+        super(SvnBlameDialog, self).__init__(parent)
         self.setupUi(self)

         self.buttonBox.button(QDialogButtonBox.Close).setEnabled(False)
@@ -250,4 +256,4 @@
             self.intercept = False
             evt.accept()
             return
-        super().keyPressEvent(evt)
+        super(SvnBlameDialog, self).keyPressEvent(evt)
--- a/Plugins/VcsPlugins/vcsSubversion/SvnChangeListsDialog.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Plugins/VcsPlugins/vcsSubversion/SvnChangeListsDialog.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,12 @@
 Module implementing a dialog to browse the change lists.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+try:
+    str = unicode
+except (NameError):
+    pass
+
 import os

 from PyQt4.QtCore import pyqtSlot, Qt, QProcess, QRegExp, QTimer
@@ -30,7 +36,7 @@
         @param vcs reference to the vcs object
         @param parent parent widget (QWidget)
         """
-        super().__init__(parent)
+        super(SvnChangeListsDialog, self).__init__(parent)
         self.setupUi(self)

         self.buttonBox.button(QDialogButtonBox.Close).setEnabled(False)
@@ -254,4 +260,4 @@
             self.intercept = False
             evt.accept()
             return
-        super().keyPressEvent(evt)
+        super(SvnChangeListsDialog, self).keyPressEvent(evt)
--- a/Plugins/VcsPlugins/vcsSubversion/SvnCommandDialog.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Plugins/VcsPlugins/vcsSubversion/SvnCommandDialog.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing the Subversion command dialog.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.QtCore import pyqtSlot
 from PyQt4.QtGui import QDialog, QDialogButtonBox

@@ -35,7 +37,7 @@
         @param ppath pathname of the project directory (string)
         @param parent parent widget of this dialog (QWidget)
         """
-        super().__init__(parent)
+        super(SvnCommandDialog, self).__init__(parent)
         self.setupUi(self)

         self.workdirCompleter = E5DirCompleter(self.workdirCombo)
--- a/Plugins/VcsPlugins/vcsSubversion/SvnCommitDialog.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Plugins/VcsPlugins/vcsSubversion/SvnCommitDialog.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing a dialog to enter the commit message.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.QtCore import pyqtSignal, Qt, pyqtSlot
 from PyQt4.QtGui import QWidget, QDialogButtonBox

@@ -32,7 +34,7 @@
         @param vcs reference to the vcs object
         @param parent parent widget (QWidget)
         """
-        super().__init__(parent, Qt.WindowFlags(Qt.Window))
+        super(SvnCommitDialog, self).__init__(parent, Qt.WindowFlags(Qt.Window))
         self.setupUi(self)

         if vcs.version < (1, 5, 0):
--- a/Plugins/VcsPlugins/vcsSubversion/SvnCopyDialog.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Plugins/VcsPlugins/vcsSubversion/SvnCopyDialog.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing a dialog to enter the data for a copy operation.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 import os.path

 from PyQt4.QtCore import pyqtSlot
@@ -33,7 +35,7 @@
         @param move flag indicating a move operation (boolean)
         @param force flag indicating a forced operation (boolean)
         """
-        super().__init__(parent)
+        super(SvnCopyDialog, self).__init__(parent)
         self.setupUi(self)

         self.source = source
--- a/Plugins/VcsPlugins/vcsSubversion/SvnDialog.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Plugins/VcsPlugins/vcsSubversion/SvnDialog.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,12 @@
 Module implementing a dialog starting a process and showing its output.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+try:
+    str = unicode
+except (NameError):
+    pass
+
 import os

 from PyQt4.QtCore import QTimer, QProcess, pyqtSlot, Qt, QProcessEnvironment
@@ -34,7 +40,7 @@
         @param text text to be shown by the label (string)
         @param parent parent widget (QWidget)
         """
-        super().__init__(parent)
+        super(SvnDialog, self).__init__(parent)
         self.setupUi(self)

         self.buttonBox.button(QDialogButtonBox.Close).setEnabled(False)
@@ -247,7 +253,7 @@
             self.intercept = False
             evt.accept()
             return
-        super().keyPressEvent(evt)
+        super(SvnDialog, self).keyPressEvent(evt)

     def hasAddOrDelete(self):
         """
--- a/Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,12 @@
 Module implementing a dialog to show the output of the svn diff command process.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+try:
+    str = unicode
+except (NameError):
+    pass
+
 import os

 from PyQt4.QtCore import QTimer, QFileInfo, QProcess, pyqtSlot, Qt
@@ -32,7 +38,7 @@
         @param vcs reference to the vcs object
         @param parent parent widget (QWidget)
         """
-        super().__init__(parent)
+        super(SvnDiffDialog, self).__init__(parent)
         self.setupUi(self)

         self.buttonBox.button(QDialogButtonBox.Save).setEnabled(False)
@@ -440,4 +446,4 @@
             self.intercept = False
             evt.accept()
             return
-        super().keyPressEvent(evt)
+        super(SvnDiffDialog, self).keyPressEvent(evt)
--- a/Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,12 @@
 Module implementing a dialog to browse the log history.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+try:
+    str = unicode
+except (NameError):
+    pass
+
 import os

 from PyQt4.QtCore import QTimer, QDate, QProcess, QRegExp, Qt, pyqtSlot
@@ -31,7 +37,7 @@
         @param vcs reference to the vcs object
         @param parent parent widget (QWidget)
         """
-        super().__init__(parent)
+        super(SvnLogBrowserDialog, self).__init__(parent)
         self.setupUi(self)

         self.buttonBox.button(QDialogButtonBox.Close).setEnabled(False)
@@ -633,4 +639,4 @@
             self.intercept = False
             evt.accept()
             return
-        super().keyPressEvent(evt)
+        super(SvnLogBrowserDialog, self).keyPressEvent(evt)
--- a/Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,12 @@
 Module implementing a dialog to show the output of the svn log command process.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+try:
+    str = unicode
+except (NameError):
+    pass
+
 import os

 from PyQt4.QtCore import QTimer, QByteArray, QProcess, QRegExp, QUrl, pyqtSlot
@@ -34,7 +40,7 @@
         @param vcs reference to the vcs object
         @param parent parent widget (QWidget)
         """
-        super().__init__(parent)
+        super(SvnLogDialog, self).__init__(parent)
         self.setupUi(self)

         self.buttonBox.button(QDialogButtonBox.Close).setDefault(True)
@@ -320,4 +326,4 @@
             self.intercept = False
             evt.accept()
             return
-        super().keyPressEvent(evt)
+        super(SvnLogDialog, self).keyPressEvent(evt)
--- a/Plugins/VcsPlugins/vcsSubversion/SvnMergeDialog.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Plugins/VcsPlugins/vcsSubversion/SvnMergeDialog.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing a dialog to enter the data for a merge operation.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.QtCore import QRegExp
 from PyQt4.QtGui import QDialog, QDialogButtonBox

@@ -27,7 +29,7 @@
         @param force flag indicating a forced merge (boolean)
         @param parent parent widget (QWidget)
         """
-        super().__init__(parent)
+        super(SvnMergeDialog, self).__init__(parent)
         self.setupUi(self)

         self.forceCheckBox.setChecked(force)
--- a/Plugins/VcsPlugins/vcsSubversion/SvnNewProjectOptionsDialog.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Plugins/VcsPlugins/vcsSubversion/SvnNewProjectOptionsDialog.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing the Subversion Options Dialog for a new project from the repository.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 import os

 from PyQt4.QtCore import QDir, pyqtSlot
@@ -33,7 +35,7 @@
         @param vcs reference to the version control object
         @param parent parent widget (QWidget)
         """
-        super().__init__(parent)
+        super(SvnNewProjectOptionsDialog, self).__init__(parent)
         self.setupUi(self)

         self.vcsDirectoryCompleter = E5DirCompleter(self.vcsUrlEdit)
--- a/Plugins/VcsPlugins/vcsSubversion/SvnOptionsDialog.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Plugins/VcsPlugins/vcsSubversion/SvnOptionsDialog.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing a dialog to enter options used to start a project in the VCS.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 import os

 from PyQt4.QtCore import QDir, pyqtSlot
@@ -34,7 +36,7 @@
         @param project reference to the project object
         @param parent parent widget (QWidget)
         """
-        super().__init__(parent)
+        super(SvnOptionsDialog, self).__init__(parent)
         self.setupUi(self)

         self.vcsDirectoryCompleter = E5DirCompleter(self.vcsUrlEdit)
--- a/Plugins/VcsPlugins/vcsSubversion/SvnPropListDialog.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Plugins/VcsPlugins/vcsSubversion/SvnPropListDialog.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,12 @@
 Module implementing a dialog to show the output of the svn proplist command process.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+try:
+    str = unicode
+except (NameError):
+    pass
+
 from PyQt4.QtCore import QTimer, QProcess, QProcessEnvironment, QRegExp, Qt
 from PyQt4.QtGui import QWidget, QHeaderView, QDialogButtonBox, QTreeWidgetItem

@@ -28,7 +34,7 @@
         @param vcs reference to the vcs object
         @param parent parent widget (QWidget)
         """
-        super().__init__(parent)
+        super(SvnPropListDialog, self).__init__(parent)
         self.setupUi(self)

         self.buttonBox.button(QDialogButtonBox.Close).setEnabled(False)
--- a/Plugins/VcsPlugins/vcsSubversion/SvnPropSetDialog.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Plugins/VcsPlugins/vcsSubversion/SvnPropSetDialog.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing a dialog to enter the data for a new property.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.QtCore import pyqtSlot
 from PyQt4.QtGui import QDialog

@@ -28,7 +30,7 @@

         @param parent parent widget (QWidget)
         """
-        super().__init__(parent)
+        super(SvnPropSetDialog, self).__init__(parent)
         self.setupUi(self)

         self.propFileCompleter = E5FileCompleter(self.propFileEdit)
--- a/Plugins/VcsPlugins/vcsSubversion/SvnRelocateDialog.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Plugins/VcsPlugins/vcsSubversion/SvnRelocateDialog.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing a dialog to enter the data to relocate the workspace.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.QtGui import QDialog

 from .Ui_SvnRelocateDialog import Ui_SvnRelocateDialog
@@ -23,7 +25,7 @@
         @param currUrl current repository URL (string)
         @param parent parent widget (QWidget)
         """
-        super().__init__(parent)
+        super(SvnRelocateDialog, self).__init__(parent)
         self.setupUi(self)

         self.currUrlLabel.setText(currUrl)
--- a/Plugins/VcsPlugins/vcsSubversion/SvnRepoBrowserDialog.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Plugins/VcsPlugins/vcsSubversion/SvnRepoBrowserDialog.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,12 @@
 Module implementing the subversion repository browser dialog.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+try:
+    str = unicode
+except (NameError):
+    pass
+
 import os

 from PyQt4.QtGui import QCursor, QHeaderView, QLineEdit, QDialog, \
@@ -34,7 +40,7 @@
         @param mode mode of the dialog (string, "browse" or "select")
         @param parent parent widget (QWidget)
         """
-        super().__init__(parent)
+        super(SvnRepoBrowserDialog, self).__init__(parent)
         self.setupUi(self)

         self.repoTree.headerItem().setText(self.repoTree.columnCount(), "")
@@ -328,7 +334,7 @@
         if self.focusWidget() == self.urlCombo:
             return

-        super().accept()
+        super(SvnRepoBrowserDialog, self).accept()

     def getSelectedUrl(self):
         """
@@ -465,4 +471,4 @@
             self.intercept = False
             evt.accept()
             return
-        super().keyPressEvent(evt)
+        super(SvnRepoBrowserDialog, self).keyPressEvent(evt)
--- a/Plugins/VcsPlugins/vcsSubversion/SvnRevisionSelectionDialog.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Plugins/VcsPlugins/vcsSubversion/SvnRevisionSelectionDialog.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing a dialog to enter the revisions for the svn diff command.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.QtCore import QDate, QDateTime, Qt
 from PyQt4.QtGui import QDialog

@@ -23,7 +25,7 @@

         @param parent parent widget of the dialog (QWidget)
         """
-        super().__init__(parent)
+        super(SvnRevisionSelectionDialog, self).__init__(parent)
         self.setupUi(self)

         self.date1Edit.setDate(QDate.currentDate())
--- a/Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py	Mon Mar 25 03:11:06 2013 +0100
@@ -8,6 +8,12 @@
 process.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+try:
+    str = unicode
+except (NameError):
+    pass
+
 import os

 from PyQt4.QtCore import QTimer, QProcess, QRegExp, Qt, pyqtSlot
@@ -34,7 +40,7 @@
         @param vcs reference to the vcs object
         @param parent parent widget (QWidget)
         """
-        super().__init__(parent)
+        super(SvnStatusDialog, self).__init__(parent)
         self.setupUi(self)

         self.__toBeCommittedColumn = 0
@@ -566,7 +572,7 @@
             self.intercept = False
             evt.accept()
             return
-        super().keyPressEvent(evt)
+        super(SvnStatusDialog, self).keyPressEvent(evt)

     @pyqtSlot()
     def on_refreshButton_clicked(self):
--- a/Plugins/VcsPlugins/vcsSubversion/SvnStatusMonitorThread.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Plugins/VcsPlugins/vcsSubversion/SvnStatusMonitorThread.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,12 @@
 Module implementing the VCS status monitor thread class for Subversion.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+try:
+    str = unicode
+except (NameError):
+    pass
+
 from PyQt4.QtCore import QRegExp, QProcess

 from VCS.StatusMonitorThread import VcsStatusMonitorThread
--- a/Plugins/VcsPlugins/vcsSubversion/SvnSwitchDialog.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Plugins/VcsPlugins/vcsSubversion/SvnSwitchDialog.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing a dialog to enter the data for a switch operation.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.QtGui import QDialog

 from .Ui_SvnSwitchDialog import Ui_SvnSwitchDialog
@@ -26,7 +28,7 @@
             repository (boolean)
         @param parent parent widget (QWidget)
         """
-        super().__init__(parent)
+        super(SvnSwitchDialog, self).__init__(parent)
         self.setupUi(self)

         self.tagCombo.clear()
--- a/Plugins/VcsPlugins/vcsSubversion/SvnTagBranchListDialog.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Plugins/VcsPlugins/vcsSubversion/SvnTagBranchListDialog.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,12 @@
 Module implementing a dialog to show a list of tags or branches.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+try:
+    str = unicode
+except (NameError):
+    pass
+
 import os

 from PyQt4.QtCore import QTimer, QProcess, QRegExp, Qt, pyqtSlot
@@ -31,7 +37,7 @@
         @param vcs reference to the vcs object
         @param parent parent widget (QWidget)
         """
-        super().__init__(parent)
+        super(SvnTagBranchListDialog, self).__init__(parent)
         self.setupUi(self)

         self.buttonBox.button(QDialogButtonBox.Close).setEnabled(False)
@@ -322,4 +328,4 @@
             self.intercept = False
             evt.accept()
             return
-        super().keyPressEvent(evt)
+        super(SvnTagBranchListDialog, self).keyPressEvent(evt)
--- a/Plugins/VcsPlugins/vcsSubversion/SvnTagDialog.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Plugins/VcsPlugins/vcsSubversion/SvnTagDialog.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing a dialog to enter the data for a tagging operation.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.QtGui import QDialog, QDialogButtonBox

 from .Ui_SvnTagDialog import Ui_SvnTagDialog
@@ -26,7 +28,7 @@
             repository (boolean)
         @param parent parent widget (QWidget)
         """
-        super().__init__(parent)
+        super(SvnTagDialog, self).__init__(parent)
         self.setupUi(self)

         self.okButton = self.buttonBox.button(QDialogButtonBox.Ok)
--- a/Plugins/VcsPlugins/vcsSubversion/SvnUrlSelectionDialog.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Plugins/VcsPlugins/vcsSubversion/SvnUrlSelectionDialog.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing a dialog to enter the URLs for the svn diff command.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.QtCore import QRegExp, pyqtSlot
 from PyQt4.QtGui import QDialog

@@ -32,7 +34,7 @@
         @param path pathname to determine the repository URL from (string)
         @param parent parent widget of the dialog (QWidget)
         """
-        super().__init__(parent)
+        super(SvnUrlSelectionDialog, self).__init__(parent)
         self.setupUi(self)

         if vcs.version < (1, 4, 0):
--- a/Plugins/VcsPlugins/vcsSubversion/SvnUtilities.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Plugins/VcsPlugins/vcsSubversion/SvnUtilities.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing some common utility functions for the subversion package.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 import os

 import Utilities
--- a/Plugins/VcsPlugins/vcsSubversion/subversion.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Plugins/VcsPlugins/vcsSubversion/subversion.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,12 @@
 Module implementing the version control systems interface to Subversion.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+try:
+    str = unicode
+except (NameError):
+    pass
+
 import os
 import re
 import shutil
--- a/Plugins/ViewManagerPlugins/Listspace/Listspace.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Plugins/ViewManagerPlugins/Listspace/Listspace.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing the listspace viewmanager class.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 import os

 from PyQt4.QtCore import pyqtSignal, QFileInfo, QEvent, Qt
@@ -31,7 +33,7 @@

         @param parent parent widget (QWidget)
         """
-        super().__init__(parent)
+        super(StackedWidget, self).__init__(parent)
         self.setAttribute(Qt.WA_DeleteOnClose, True)

         self.editors = []
@@ -44,7 +46,7 @@
             (QScintilla.EditorAssembly.EditorAssembly)
         """
         editor = assembly.getEditor()
-        super().addWidget(assembly)
+        super(StackedWidget, self).addWidget(assembly)
         if not editor in self.editors:
             self.editors.append(editor)

@@ -57,7 +59,7 @@
         if isinstance(widget, QScintilla.Editor.Editor):
             self.editors.remove(widget)
             widget = widget.parent()
-        super().removeWidget(widget)
+        super(StackedWidget, self).removeWidget(widget)

     def currentWidget(self):
         """
@@ -65,7 +67,7 @@

         @return reference to the current editor (Editor)
         """
-        widget = super().currentWidget()
+        widget = super(StackedWidget, self).currentWidget()
         if widget is not None:
             widget = widget.getEditor()
         return widget
@@ -80,7 +82,7 @@
             self.editors.remove(widget)
             self.editors.insert(0, widget)
             widget = widget.parent()
-        super().setCurrentWidget(widget)
+        super(StackedWidget, self).setCurrentWidget(widget)

     def setCurrentIndex(self, index):
         """
--- a/Plugins/ViewManagerPlugins/Tabview/Tabview.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Plugins/ViewManagerPlugins/Tabview/Tabview.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing a tabbed viewmanager class.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 import os

 from PyQt4.QtCore import QPoint, QFileInfo, pyqtSignal, QEvent, QByteArray, QMimeData, Qt
@@ -56,7 +58,7 @@

         @param parent reference to the parent widget (QWidget)
         """
-        super().__init__(parent)
+        super(TabBar, self).__init__(parent)
         self.setAcceptDrops(True)

         self.__dragStartPos = QPoint()
@@ -69,7 +71,7 @@
         """
         if event.button() == Qt.LeftButton:
             self.__dragStartPos = QPoint(event.pos())
-        super().mousePressEvent(event)
+        super(TabBar, self).mousePressEvent(event)

     def mouseMoveEvent(self, event):
         """
@@ -94,7 +96,7 @@
                 drag.exec_(Qt.DropActions(Qt.CopyAction))
             elif event.modifiers() == Qt.KeyboardModifiers(Qt.NoModifier):
                 drag.exec_(Qt.DropActions(Qt.MoveAction))
-        super().mouseMoveEvent(event)
+        super(TabBar, self).mouseMoveEvent(event)

     def dragEnterEvent(self, event):
         """
@@ -110,7 +112,7 @@
            "source-index" in formats and \
            "tabwidget-id" in formats:
             event.acceptProposedAction()
-        super().dragEnterEvent(event)
+        super(TabBar, self).dragEnterEvent(event)

     def dropEvent(self, event):
         """
@@ -139,7 +141,7 @@
                 elif event.proposedAction() == Qt.CopyAction:
                     self.tabCopyRequested[int, int].emit(fromIndex, toIndex)
                     event.acceptProposedAction()
-        super().dropEvent(event)
+        super(TabBar, self).dropEvent(event)


 class TabWidget(E5TabWidget):
@@ -152,7 +154,7 @@

         @param vm view manager widget (Tabview)
         """
-        super().__init__()
+        super(TabWidget, self).__init__()
         self.setAttribute(Qt.WA_DeleteOnClose, True)

         self.__tabBar = TabBar(self)
@@ -216,7 +218,7 @@
         self.emptyLabel = QLabel()
         self.emptyLabel.setPixmap(ericPic)
         self.emptyLabel.setAlignment(Qt.AlignVCenter | Qt.AlignHCenter)
-        super().addTab(self.emptyLabel, UI.PixmapCache.getIcon("empty.png"), "")
+        super(TabWidget, self).addTab(self.emptyLabel, UI.PixmapCache.getIcon("empty.png"), "")

     def __initMenu(self):
         """
@@ -331,7 +333,7 @@
         @param title title for the new tab (string)
         """
         editor = assembly.getEditor()
-        super().addTab(assembly, UI.PixmapCache.getIcon("empty.png"), title)
+        super(TabWidget, self).addTab(assembly, UI.PixmapCache.getIcon("empty.png"), title)
         if self.closeButton:
             self.closeButton.setEnabled(True)
         else:
@@ -357,7 +359,7 @@
         @return index of the inserted tab (integer)
         """
         editor = assembly.getEditor()
-        newIndex = super().insertTab(index, assembly,
+        newIndex = super(TabWidget, self).insertTab(index, assembly,
                                      UI.PixmapCache.getIcon("empty.png"),
                                      title)
         if self.closeButton:
@@ -420,7 +422,7 @@
             self.removeTab(index)

         if not self.editors:
-            super().addTab(self.emptyLabel, UI.PixmapCache.getIcon("empty.png"), "")
+            super(TabWidget, self).addTab(self.emptyLabel, UI.PixmapCache.getIcon("empty.png"), "")
             self.emptyLabel.show()
             if self.closeButton:
                 self.closeButton.setEnabled(False)
@@ -495,7 +497,7 @@
         if not self.editors:
             return None
         else:
-            return super().currentWidget()
+            return super(TabWidget, self).currentWidget()

     def setCurrentWidget(self, assembly):
         """
@@ -504,7 +506,7 @@
         @param assembly editor assembly to determine current tab from
             (EditorAssembly.EditorAssembly)
         """
-        super().setCurrentWidget(assembly)
+        super(TabWidget, self).setCurrentWidget(assembly)

     def indexOf(self, object):
         """
@@ -515,7 +517,7 @@
         """
         if isinstance(object, QScintilla.Editor.Editor):
             object = object.parent()
-        return super().indexOf(object)
+        return super(TabWidget, self).indexOf(object)

     def hasEditor(self, editor):
         """
--- a/Plugins/WizardPlugins/ColorDialogWizard/ColorDialogWizardDialog.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Plugins/WizardPlugins/ColorDialogWizard/ColorDialogWizardDialog.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing the color dialog wizard dialog.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 import os

 from PyQt4.QtCore import pyqtSlot
@@ -30,7 +32,7 @@

         @param parent parent widget (QWidget)
         """
-        super().__init__(parent)
+        super(ColorDialogWizardDialog, self).__init__(parent)
         self.setupUi(self)

         self.bTest = \
--- a/Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py	Mon Mar 25 03:11:06 2013 +0100
@@ -4,6 +4,8 @@
 Module implementing the eric5 message box wizard dialog.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 import os

 from PyQt4.QtCore import pyqtSlot
@@ -27,7 +29,7 @@

         @param parent reference to the parent widget (QWidget)
         """
-        super().__init__(parent)
+        super(E5MessageBoxWizardDialog, self).__init__(parent)
         self.setupUi(self)

         # keep the following three lists in sync
--- a/Plugins/WizardPlugins/FileDialogWizard/FileDialogWizardDialog.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Plugins/WizardPlugins/FileDialogWizard/FileDialogWizardDialog.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing the file dialog wizard dialog.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 import os

 from PyQt4.QtCore import pyqtSlot
@@ -32,7 +34,7 @@

         @param parent parent widget (QWidget)
         """
-        super().__init__(parent)
+        super(FileDialogWizardDialog, self).__init__(parent)
         self.setupUi(self)

         self.eStartWithCompleter = E5FileCompleter(self.eStartWith)
--- a/Plugins/WizardPlugins/FontDialogWizard/FontDialogWizardDialog.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Plugins/WizardPlugins/FontDialogWizard/FontDialogWizardDialog.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing the font dialog wizard dialog.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 import os

 from PyQt4.QtCore import pyqtSlot
@@ -28,7 +30,7 @@

         @param parent parent widget (QWidget)
         """
-        super().__init__(parent)
+        super(FontDialogWizardDialog, self).__init__(parent)
         self.setupUi(self)

         self.bTest = \
--- a/Plugins/WizardPlugins/InputDialogWizard/InputDialogWizardDialog.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Plugins/WizardPlugins/InputDialogWizard/InputDialogWizardDialog.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing the input dialog wizard dialog.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 import os

 from PyQt4.QtCore import pyqtSlot
@@ -29,7 +31,7 @@

         @param parent parent widget (QWidget)
         """
-        super().__init__(parent)
+        super(InputDialogWizardDialog, self).__init__(parent)
         self.setupUi(self)

         # set the validators for the double line edots
--- a/Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing the message box wizard dialog.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 import os

 from PyQt4.QtCore import pyqtSlot
@@ -28,7 +30,7 @@

         @param parent parent widget (QWidget)
         """
-        super().__init__(parent)
+        super(MessageBoxWizardDialog, self).__init__(parent)
         self.setupUi(self)

         # keep the following three lists in sync
--- a/Plugins/WizardPlugins/PyRegExpWizard/PyRegExpWizardCharactersDialog.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Plugins/WizardPlugins/PyRegExpWizard/PyRegExpWizardCharactersDialog.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing a dialog for entering character classes.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.QtCore import QRegExp
 from PyQt4.QtGui import QSizePolicy, QSpacerItem, QWidget, QHBoxLayout, QLineEdit, \
     QPushButton, QDialog, QScrollArea, QComboBox, QVBoxLayout, QRegExpValidator, QLabel
@@ -35,7 +37,7 @@

         @param parent parent widget (QWidget)
         """
-        super().__init__(parent)
+        super(PyRegExpWizardCharactersDialog, self).__init__(parent)
         self.setupUi(self)

         self.comboItems = []
--- a/Plugins/WizardPlugins/PyRegExpWizard/PyRegExpWizardDialog.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Plugins/WizardPlugins/PyRegExpWizard/PyRegExpWizardDialog.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing the Python re wizard dialog.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 import os
 import re

@@ -36,7 +38,7 @@
         @param parent parent widget (QWidget)
         @param fromEric flag indicating a call from within eric5
         """
-        super().__init__(parent)
+        super(PyRegExpWizardWidget, self).__init__(parent)
         self.setupUi(self)

         # initialize icons of the tool buttons
@@ -638,7 +640,7 @@
         @param parent parent widget (QWidget)
         @param fromEric flag indicating a call from within eric5
         """
-        super().__init__(parent)
+        super(PyRegExpWizardDialog, self).__init__(parent)
         self.setModal(fromEric)
         self.setSizeGripEnabled(True)

@@ -675,7 +677,7 @@

         @param parent reference to the parent widget (QWidget)
         """
-        super().__init__(parent)
+        super(PyRegExpWizardWindow, self).__init__(parent)
         self.cw = PyRegExpWizardWidget(self, fromEric=False)
         size = self.cw.size()
         self.setCentralWidget(self.cw)
--- a/Plugins/WizardPlugins/PyRegExpWizard/PyRegExpWizardRepeatDialog.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Plugins/WizardPlugins/PyRegExpWizard/PyRegExpWizardRepeatDialog.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing a dialog for entering repeat counts.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.QtCore import pyqtSlot
 from PyQt4.QtGui import QDialog

@@ -23,7 +25,7 @@

         @param parent parent widget (QWidget)
         """
-        super().__init__(parent)
+        super(PyRegExpWizardRepeatDialog, self).__init__(parent)
         self.setupUi(self)

         self.unlimitedButton.setChecked(True)
--- a/Plugins/WizardPlugins/QRegExpWizard/QRegExpWizardCharactersDialog.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Plugins/WizardPlugins/QRegExpWizard/QRegExpWizardCharactersDialog.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing a dialog for entering character classes.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.QtCore import QRegExp
 from PyQt4.QtGui import QSizePolicy, QSpacerItem, QWidget, QHBoxLayout, QLineEdit, \
     QPushButton, QDialog, QScrollArea, QComboBox, QVBoxLayout, QRegExpValidator, QLabel
@@ -29,7 +31,7 @@
         @param mode mode of the dialog (one of RegExpMode, WildcardMode, W3CMode)
         @param parent parent widget (QWidget)
         """
-        super().__init__(parent)
+        super(QRegExpWizardCharactersDialog, self).__init__(parent)
         self.setupUi(self)

         self.__mode = mode
--- a/Plugins/WizardPlugins/QRegExpWizard/QRegExpWizardDialog.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Plugins/WizardPlugins/QRegExpWizard/QRegExpWizardDialog.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing the QRegExp wizard dialog.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 import os

 from PyQt4.QtCore import QFileInfo, QRegExp, Qt, pyqtSlot, qVersion
@@ -35,7 +37,7 @@
         @param parent parent widget (QWidget)
         @param fromEric flag indicating a call from within eric5
         """
-        super().__init__(parent)
+        super(QRegExpWizardWidget, self).__init__(parent)
         self.setupUi(self)

         # initialize icons of the tool buttons
@@ -625,7 +627,7 @@
         @param parent parent widget (QWidget)
         @param fromEric flag indicating a call from within eric5
         """
-        super().__init__(parent)
+        super(QRegExpWizardDialog, self).__init__(parent)
         self.setModal(fromEric)
         self.setSizeGripEnabled(True)

@@ -662,7 +664,7 @@

         @param parent reference to the parent widget (QWidget)
         """
-        super().__init__(parent)
+        super(QRegExpWizardWindow, self).__init__(parent)
         self.cw = QRegExpWizardWidget(self, fromEric=False)
         size = self.cw.size()
         self.setCentralWidget(self.cw)
--- a/Plugins/WizardPlugins/QRegExpWizard/QRegExpWizardRepeatDialog.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Plugins/WizardPlugins/QRegExpWizard/QRegExpWizardRepeatDialog.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing a dialog for entering repeat counts.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.QtCore import pyqtSlot
 from PyQt4.QtGui import QDialog

@@ -23,7 +25,7 @@

         @param parent parent widget (QWidget)
         """
-        super().__init__(parent)
+        super(QRegExpWizardRepeatDialog, self).__init__(parent)
         self.setupUi(self)

         self.unlimitedButton.setChecked(True)
--- a/Preferences/ConfigurationDialog.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Preferences/ConfigurationDialog.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing a dialog for the configuration of eric5.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 import os
 import types

@@ -42,7 +44,7 @@
         @param pageName name of the configuration page (string)
         @param iconFile file name of the icon to be shown (string)
         """
-        super().__init__(parent, [text])
+        super(ConfigurationPageItem, self).__init__(parent, [text])
         self.setIcon(0, UI.PixmapCache.getIcon(iconFile))

         self.__pageName = pageName
@@ -91,7 +93,7 @@
             ConfigurationWidget.TrayStarterMode
         )

-        super().__init__(parent)
+        super(ConfigurationWidget, self).__init__(parent)
         self.fromEric = fromEric
         self.displayMode = displayMode

@@ -745,7 +747,7 @@
         @keyparam displayMode mode of the configuration dialog
             (DefaultMode, HelpBrowserMode, TrayStarterMode)
         """
-        super().__init__(parent)
+        super(ConfigurationDialog, self).__init__(parent)
         if name:
             self.setObjectName(name)
         self.setModal(modal)
@@ -802,7 +804,7 @@
         self.cw.setPreferences()

     def accept(self):
-        super().accept()
+        super(ConfigurationDialog, self).accept()


 class ConfigurationWindow(E5MainWindow):
@@ -815,7 +817,7 @@

         @param parent reference to the parent widget (QWidget)
         """
-        super().__init__(parent)
+        super(ConfigurationWindow, self).__init__(parent)

         self.cw = ConfigurationWidget(self, fromEric=False)
         size = self.cw.size()
--- a/Preferences/ConfigurationPages/ApplicationPage.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Preferences/ConfigurationPages/ApplicationPage.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing the Application configuration page.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from .ConfigurationPageBase import ConfigurationPageBase
 from .Ui_ApplicationPage import Ui_ApplicationPage

@@ -21,7 +23,7 @@
         """
         Constructor
         """
-        super().__init__()
+        super(ApplicationPage, self).__init__()
         self.setupUi(self)
         self.setObjectName("ApplicationPage")
--- a/Preferences/ConfigurationPages/ConfigurationPageBase.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Preferences/ConfigurationPages/ConfigurationPageBase.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing the base class for all configuration pages.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.QtCore import pyqtSlot
 from PyQt4.QtGui import QWidget, QIcon, QPixmap, QColor, QColorDialog, QFontDialog

@@ -19,7 +21,7 @@
         """
         Constructor
         """
-        super().__init__()
+        super(ConfigurationPageBase, self).__init__()

         self.__coloursDict = {}
--- a/Preferences/ConfigurationPages/CooperationPage.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Preferences/ConfigurationPages/CooperationPage.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing the Cooperation configuration page.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.QtCore import pyqtSlot, QRegExp
 from PyQt4.QtGui import QRegExpValidator, QValidator

@@ -24,7 +26,7 @@
         """
         Constructor
         """
-        super().__init__()
+        super(CooperationPage, self).__init__()
         self.setupUi(self)
         self.setObjectName("CooperationPage")
--- a/Preferences/ConfigurationPages/CorbaPage.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Preferences/ConfigurationPages/CorbaPage.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing the Corba configuration page.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.QtCore import pyqtSlot

 from E5Gui.E5Completers import E5FileCompleter
@@ -27,7 +29,7 @@
         """
         Constructor
         """
-        super().__init__()
+        super(CorbaPage, self).__init__()
         self.setupUi(self)
         self.setObjectName("CorbaPage")
--- a/Preferences/ConfigurationPages/DebuggerGeneralPage.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Preferences/ConfigurationPages/DebuggerGeneralPage.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing the Debugger General configuration page.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 import socket

 from PyQt4.QtCore import QRegExp, pyqtSlot
@@ -32,7 +34,7 @@
         """
         Constructor
         """
-        super().__init__()
+        super(DebuggerGeneralPage, self).__init__()
         self.setupUi(self)
         self.setObjectName("DebuggerGeneralPage")
--- a/Preferences/ConfigurationPages/DebuggerPython3Page.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Preferences/ConfigurationPages/DebuggerPython3Page.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing the Debugger Python3 configuration page.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.QtCore import pyqtSlot

 from E5Gui.E5Completers import E5FileCompleter
@@ -27,7 +29,7 @@
         """
         Constructor
         """
-        super().__init__()
+        super(DebuggerPython3Page, self).__init__()
         self.setupUi(self)
         self.setObjectName("DebuggerPython3Page")
--- a/Preferences/ConfigurationPages/DebuggerPythonPage.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Preferences/ConfigurationPages/DebuggerPythonPage.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing the Debugger Python configuration page.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.QtCore import pyqtSlot

 from E5Gui.E5Completers import E5FileCompleter
@@ -27,7 +29,7 @@
         """
         Constructor
         """
-        super().__init__()
+        super(DebuggerPythonPage, self).__init__()
         self.setupUi(self)
         self.setObjectName("DebuggerPythonPage")
--- a/Preferences/ConfigurationPages/DebuggerRubyPage.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Preferences/ConfigurationPages/DebuggerRubyPage.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing the Debugger Ruby configuration page.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.QtCore import pyqtSlot

 from E5Gui.E5Completers import E5FileCompleter
@@ -27,7 +29,7 @@
         """
         Constructor
         """
-        super().__init__()
+        super(DebuggerRubyPage, self).__init__()
         self.setupUi(self)
         self.setObjectName("DebuggerRubyPage")
--- a/Preferences/ConfigurationPages/EditorAPIsPage.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Preferences/ConfigurationPages/EditorAPIsPage.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing the Editor APIs configuration page.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.QtCore import QDir, pyqtSlot, QFileInfo
 from PyQt4.QtGui import QInputDialog

@@ -29,7 +31,7 @@
         """
         Constructor
         """
-        super().__init__()
+        super(EditorAPIsPage, self).__init__()
         self.setupUi(self)
         self.setObjectName("EditorAPIsPage")
--- a/Preferences/ConfigurationPages/EditorAutocompletionPage.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Preferences/ConfigurationPages/EditorAutocompletionPage.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing the Editor Autocompletion configuration page.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from .ConfigurationPageBase import ConfigurationPageBase
 from .Ui_EditorAutocompletionPage import Ui_EditorAutocompletionPage

@@ -21,7 +23,7 @@
         """
         Constructor
         """
-        super().__init__()
+        super(EditorAutocompletionPage, self).__init__()
         self.setupUi(self)
         self.setObjectName("EditorAutocompletionPage")
--- a/Preferences/ConfigurationPages/EditorAutocompletionQScintillaPage.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Preferences/ConfigurationPages/EditorAutocompletionQScintillaPage.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing the QScintilla Autocompletion configuration page.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.Qsci import QsciScintilla

 from .ConfigurationPageBase import ConfigurationPageBase
@@ -24,7 +26,7 @@
         """
         Constructor
         """
-        super().__init__()
+        super(EditorAutocompletionQScintillaPage, self).__init__()
         self.setupUi(self)
         self.setObjectName("EditorAutocompletionQScintillaPage")
--- a/Preferences/ConfigurationPages/EditorCalltipsPage.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Preferences/ConfigurationPages/EditorCalltipsPage.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing the Editor Calltips configuration page.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.Qsci import QsciScintilla

 from QScintilla.QsciScintillaCompat import QSCINTILLA_VERSION
@@ -25,7 +27,7 @@
         """
         Constructor
         """
-        super().__init__()
+        super(EditorCalltipsPage, self).__init__()
         self.setupUi(self)
         self.setObjectName("EditorCalltipsPage")
--- a/Preferences/ConfigurationPages/EditorCalltipsQScintillaPage.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Preferences/ConfigurationPages/EditorCalltipsQScintillaPage.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing the QScintilla Calltips configuration page.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.Qsci import QsciScintilla

 from .ConfigurationPageBase import ConfigurationPageBase
@@ -24,7 +26,7 @@
         """
         Constructor
         """
-        super().__init__()
+        super(EditorCalltipsQScintillaPage, self).__init__()
         self.setupUi(self)
         self.setObjectName("EditorCalltipsQScintillaPage")
--- a/Preferences/ConfigurationPages/EditorExportersPage.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Preferences/ConfigurationPages/EditorExportersPage.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing the Editor Exporters configuration page.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.QtCore import pyqtSlot
 from PyQt4.QtGui import QFontDialog

@@ -24,7 +26,7 @@
         """
         Constructor
         """
-        super().__init__()
+        super(EditorExportersPage, self).__init__()
         self.setupUi(self)
         self.setObjectName("EditorExportersPage")
--- a/Preferences/ConfigurationPages/EditorFilePage.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Preferences/ConfigurationPages/EditorFilePage.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing the Editor File Handling configuration page.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.QtCore import pyqtSlot
 from PyQt4.QtGui import QListWidgetItem, QInputDialog, QLineEdit
 from PyQt4.Qsci import QsciScintilla
@@ -28,7 +30,7 @@
         """
         Constructor
         """
-        super().__init__()
+        super(EditorFilePage, self).__init__()
         self.setupUi(self)
         self.setObjectName("EditorFilePage")
--- a/Preferences/ConfigurationPages/EditorGeneralPage.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Preferences/ConfigurationPages/EditorGeneralPage.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing the Editor General configuration page.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from .ConfigurationPageBase import ConfigurationPageBase
 from .Ui_EditorGeneralPage import Ui_EditorGeneralPage

@@ -21,7 +23,7 @@
         """
         Constructor
         """
-        super().__init__()
+        super(EditorGeneralPage, self).__init__()
         self.setupUi(self)
         self.setObjectName("EditorGeneralPage")
--- a/Preferences/ConfigurationPages/EditorHighlightersPage.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Preferences/ConfigurationPages/EditorHighlightersPage.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing the Editor Highlighter Associations configuration page.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 import os

 from pygments.lexers import get_all_lexers
@@ -30,7 +32,7 @@

         @param lexers reference to the lexers dictionary
         """
-        super().__init__()
+        super(EditorHighlightersPage, self).__init__()
         self.setupUi(self)
         self.setObjectName("EditorHighlightersPage")
--- a/Preferences/ConfigurationPages/EditorHighlightingStylesPage.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Preferences/ConfigurationPages/EditorHighlightingStylesPage.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing the Editor Highlighting Styles configuration page.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.QtCore import pyqtSlot, QFileInfo, QFile, QIODevice
 from PyQt4.QtGui import QPalette, QColorDialog, QFontDialog, \
                         QInputDialog, QFont, QMenu
@@ -35,7 +37,7 @@

         @param lexers reference to the lexers dictionary
         """
-        super().__init__()
+        super(EditorHighlightingStylesPage, self).__init__()
         self.setupUi(self)
         self.setObjectName("EditorHighlightingStylesPage")
--- a/Preferences/ConfigurationPages/EditorKeywordsPage.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Preferences/ConfigurationPages/EditorKeywordsPage.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing the editor highlighter keywords configuration page.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.QtCore import pyqtSlot

 from .ConfigurationPageBase import ConfigurationPageBase
@@ -23,7 +25,7 @@
         """
         Constructor
         """
-        super().__init__()
+        super(EditorKeywordsPage, self).__init__()
         self.setupUi(self)
         self.setObjectName("EditorKeywordsPage")
--- a/Preferences/ConfigurationPages/EditorPropertiesPage.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Preferences/ConfigurationPages/EditorPropertiesPage.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing the Editor Properties configuration page.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from QScintilla.QsciScintillaCompat import QSCINTILLA_VERSION

 from .ConfigurationPageBase import ConfigurationPageBase
@@ -25,7 +27,7 @@

         @param lexers reference to the lexers dictionary
         """
-        super().__init__()
+        super(EditorPropertiesPage, self).__init__()
         self.setupUi(self)
         self.setObjectName("EditorPropertiesPage")
--- a/Preferences/ConfigurationPages/EditorSearchPage.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Preferences/ConfigurationPages/EditorSearchPage.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing the Editor Search configuration page.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from .ConfigurationPageBase import ConfigurationPageBase
 from .Ui_EditorSearchPage import Ui_EditorSearchPage

@@ -21,7 +23,7 @@
         """
         Constructor
         """
-        super().__init__()
+        super(EditorSearchPage, self).__init__()
         self.setupUi(self)
         self.setObjectName("EditorSearchPage")
--- a/Preferences/ConfigurationPages/EditorSpellCheckingPage.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Preferences/ConfigurationPages/EditorSpellCheckingPage.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing the Editor Spellchecking configuration page.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.QtCore import pyqtSlot

 from E5Gui.E5Completers import E5FileCompleter
@@ -27,7 +29,7 @@
         """
         Constructor
         """
-        super().__init__()
+        super(EditorSpellCheckingPage, self).__init__()
         self.setupUi(self)
         self.setObjectName("EditorSpellCheckingPage")
--- a/Preferences/ConfigurationPages/EditorStylesPage.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Preferences/ConfigurationPages/EditorStylesPage.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing the Editor Styles configuration page.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.QtCore import pyqtSlot
 from PyQt4.QtGui import QColor, QPalette, QColorDialog
 from PyQt4.Qsci import QsciScintilla
@@ -25,7 +27,7 @@
         """
         Constructor
         """
-        super().__init__()
+        super(EditorStylesPage, self).__init__()
         self.setupUi(self)
         self.setObjectName("EditorStylesPage")
--- a/Preferences/ConfigurationPages/EditorSyntaxPage.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Preferences/ConfigurationPages/EditorSyntaxPage.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing the Editor Syntax Checker configuration page.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from .ConfigurationPageBase import ConfigurationPageBase
 from .Ui_EditorSyntaxPage import Ui_EditorSyntaxPage

@@ -23,7 +25,7 @@

         @param parent reference to the parent widget (QWidget)
         """
-        super().__init__()
+        super(EditorSyntaxPage, self).__init__()
         self.setupUi(self)
         self.setObjectName("EditorSyntaxPage")
--- a/Preferences/ConfigurationPages/EditorTypingPage.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Preferences/ConfigurationPages/EditorTypingPage.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing the Editor Typing configuration page.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.QtCore import pyqtSlot

 from .ConfigurationPageBase import ConfigurationPageBase
@@ -23,7 +25,7 @@
         """
         Constructor
         """
-        super().__init__()
+        super(EditorTypingPage, self).__init__()
         self.setupUi(self)
         self.setObjectName("EditorTypingPage")
--- a/Preferences/ConfigurationPages/EmailPage.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Preferences/ConfigurationPages/EmailPage.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing the Email configuration page.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 import smtplib
 import socket

@@ -29,7 +31,7 @@
         """
         Constructor
         """
-        super().__init__()
+        super(EmailPage, self).__init__()
         self.setupUi(self)
         self.setObjectName("EmailPage")
--- a/Preferences/ConfigurationPages/GraphicsPage.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Preferences/ConfigurationPages/GraphicsPage.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing the Printer configuration page.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.QtCore import pyqtSlot

 from .ConfigurationPageBase import ConfigurationPageBase
@@ -23,7 +25,7 @@
         """
         Constructor
         """
-        super().__init__()
+        super(GraphicsPage, self).__init__()
         self.setupUi(self)
         self.setObjectName("GraphicsPage")
--- a/Preferences/ConfigurationPages/HelpAppearancePage.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Preferences/ConfigurationPages/HelpAppearancePage.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing the Help Viewers configuration page.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.QtCore import pyqtSlot

 from E5Gui.E5Completers import E5FileCompleter
@@ -27,7 +29,7 @@
         """
         Constructor
         """
-        super().__init__()
+        super(HelpAppearancePage, self).__init__()
         self.setupUi(self)
         self.setObjectName("HelpAppearancePage")
--- a/Preferences/ConfigurationPages/HelpDocumentationPage.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Preferences/ConfigurationPages/HelpDocumentationPage.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing the Help Documentation configuration page.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.QtCore import pyqtSlot, QUrl

 from E5Gui.E5Completers import E5FileCompleter
@@ -27,7 +29,7 @@
         """
         Constructor
         """
-        super().__init__()
+        super(HelpDocumentationPage, self).__init__()
         self.setupUi(self)
         self.setObjectName("HelpDocumentationPage")
--- a/Preferences/ConfigurationPages/HelpInterfacePage.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Preferences/ConfigurationPages/HelpInterfacePage.py	Mon Mar 25 03:11:06 2013 +0100
@@ -4,6 +4,8 @@
 Module implementing the Interface configuration page (variant for web browser).
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.QtCore import pyqtSlot
 from PyQt4.QtGui import QStyleFactory

@@ -25,7 +27,7 @@
         """
         Constructor
         """
-        super().__init__()
+        super(HelpInterfacePage, self).__init__()
         self.setupUi(self)
         self.setObjectName("InterfacePage")
--- a/Preferences/ConfigurationPages/HelpViewersPage.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Preferences/ConfigurationPages/HelpViewersPage.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing the Help Viewers configuration page.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.QtCore import pyqtSlot
 from PyQt4.QtGui import QButtonGroup

@@ -28,7 +30,7 @@
         """
         Constructor
         """
-        super().__init__()
+        super(HelpViewersPage, self).__init__()
         self.setupUi(self)
         self.setObjectName("HelpViewersPage")
--- a/Preferences/ConfigurationPages/HelpVirusTotalPage.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Preferences/ConfigurationPages/HelpVirusTotalPage.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing HelpVirusTotalPage.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.QtCore import pyqtSlot

 from .ConfigurationPageBase import ConfigurationPageBase
@@ -25,7 +27,7 @@

         @param parent reference to the parent widget (QWidget)
         """
-        super().__init__()
+        super(HelpVirusTotalPage, self).__init__()
         self.setupUi(self)
         self.setObjectName("HelpVirusTotalPage")
--- a/Preferences/ConfigurationPages/HelpWebBrowserPage.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Preferences/ConfigurationPages/HelpWebBrowserPage.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing the Help web browser configuration page.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.QtCore import pyqtSlot, QLocale
 from PyQt4.QtNetwork import QNetworkRequest
 from PyQt4.QtWebKit import QWebSettings
@@ -28,7 +30,7 @@

         @param configDialog reference to the configuration dialog (ConfigurationDialog)
         """
-        super().__init__()
+        super(HelpWebBrowserPage, self).__init__()
         self.setupUi(self)
         self.setObjectName("HelpWebBrowserPage")
--- a/Preferences/ConfigurationPages/IconsPage.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Preferences/ConfigurationPages/IconsPage.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing the Icons configuration page.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.QtCore import pyqtSlot
 from PyQt4.QtGui import QListWidgetItem

@@ -28,7 +30,7 @@
         """
         Constructor
         """
-        super().__init__()
+        super(IconsPage, self).__init__()
         self.setupUi(self)
         self.setObjectName("IconsPage")
--- a/Preferences/ConfigurationPages/IconsPreviewDialog.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Preferences/ConfigurationPages/IconsPreviewDialog.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing a dialog to preview the contents of an icon directory.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 import os.path

 from PyQt4.QtGui import QListWidgetItem, QDialog, QIcon
@@ -26,7 +28,7 @@
         @param parent parent widget (QWidget)
         @param dirName name of directory to show (string)
         """
-        super().__init__(parent)
+        super(IconsPreviewDialog, self).__init__(parent)
         self.setupUi(self)

         dir = QDir(dirName)
--- a/Preferences/ConfigurationPages/InterfacePage.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Preferences/ConfigurationPages/InterfacePage.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing the Interface configuration page.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 import glob
 import os

@@ -33,7 +35,7 @@
         """
         Constructor
         """
-        super().__init__()
+        super(InterfacePage, self).__init__()
         self.setupUi(self)
         self.setObjectName("InterfacePage")
--- a/Preferences/ConfigurationPages/IrcPage.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Preferences/ConfigurationPages/IrcPage.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing the IRC configuration page.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from .ConfigurationPageBase import ConfigurationPageBase
 from .Ui_IrcPage import Ui_IrcPage

@@ -25,7 +27,7 @@
         """
         Constructor
         """
-        super().__init__()
+        super(IrcPage, self).__init__()
         self.setupUi(self)
         self.setObjectName("IrcPage")
--- a/Preferences/ConfigurationPages/MasterPasswordEntryDialog.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Preferences/ConfigurationPages/MasterPasswordEntryDialog.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing a dialog to enter or change the master password.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.QtCore import pyqtSlot
 from PyQt4.QtGui import QDialog, QDialogButtonBox

@@ -24,7 +26,7 @@
         @param oldPasswordHash hash of the current password (string)
         @param parent reference to the parent widget (QWidget)
         """
-        super().__init__(parent)
+        super(MasterPasswordEntryDialog, self).__init__(parent)
         self.setupUi(self)

         self.__oldPasswordHash = oldPasswordHash
--- a/Preferences/ConfigurationPages/MultiProjectPage.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Preferences/ConfigurationPages/MultiProjectPage.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing the Multi Project configuration page.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.QtCore import pyqtSlot

 from .ConfigurationPageBase import ConfigurationPageBase
@@ -26,7 +28,7 @@
         """
         Constructor
         """
-        super().__init__()
+        super(MultiProjectPage, self).__init__()
         self.setupUi(self)
         self.setObjectName("MultiProjectPage")
--- a/Preferences/ConfigurationPages/NetworkPage.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Preferences/ConfigurationPages/NetworkPage.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing the Network configuration page.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 import os

 from PyQt4.QtCore import pyqtSlot
@@ -30,7 +32,7 @@
         """
         Constructor
         """
-        super().__init__()
+        super(NetworkPage, self).__init__()
         self.setupUi(self)
         self.setObjectName("NetworkPage")
--- a/Preferences/ConfigurationPages/NotificationsPage.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Preferences/ConfigurationPages/NotificationsPage.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing the Notifications configuration page.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.QtCore import pyqtSlot, QPoint
 from PyQt4.QtGui import QApplication

@@ -27,7 +29,7 @@

         @param parent reference to the parent widget (QWidget)
         """
-        super().__init__()
+        super(NotificationsPage, self).__init__()
         self.setupUi(self)
         self.setObjectName("NotificationsPage")
--- a/Preferences/ConfigurationPages/PluginManagerPage.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Preferences/ConfigurationPages/PluginManagerPage.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing the Plugin Manager configuration page.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 import os

 from PyQt4.QtCore import pyqtSlot
@@ -29,7 +31,7 @@
         """
         Constructor
         """
-        super().__init__()
+        super(PluginManagerPage, self).__init__()
         self.setupUi(self)
         self.setObjectName("PluginManagerPage")
--- a/Preferences/ConfigurationPages/PrinterPage.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Preferences/ConfigurationPages/PrinterPage.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing the Printer configuration page.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.QtCore import pyqtSlot

 from .ConfigurationPageBase import ConfigurationPageBase
@@ -23,7 +25,7 @@
         """
         Constructor
         """
-        super().__init__()
+        super(PrinterPage, self).__init__()
         self.setupUi(self)
         self.setObjectName("PrinterPage")
--- a/Preferences/ConfigurationPages/ProjectBrowserPage.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Preferences/ConfigurationPages/ProjectBrowserPage.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing the Project Browser configuration page.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.QtCore import pyqtSlot

 from E5Gui.E5Application import e5App
@@ -25,7 +27,7 @@
         """
         Constructor
         """
-        super().__init__()
+        super(ProjectBrowserPage, self).__init__()
         self.setupUi(self)
         self.setObjectName("ProjectBrowserPage")
--- a/Preferences/ConfigurationPages/ProjectPage.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Preferences/ConfigurationPages/ProjectPage.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing the Project configuration page.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from .ConfigurationPageBase import ConfigurationPageBase
 from .Ui_ProjectPage import Ui_ProjectPage

@@ -21,7 +23,7 @@
         """
         Constructor
         """
-        super().__init__()
+        super(ProjectPage, self).__init__()
         self.setupUi(self)
         self.setObjectName("ProjectPage")
--- a/Preferences/ConfigurationPages/Py3FlakesPage.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Preferences/ConfigurationPages/Py3FlakesPage.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing the Py3Flakes configuration page.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from .ConfigurationPageBase import ConfigurationPageBase
 from .Ui_Py3FlakesPage import Ui_Py3FlakesPage

@@ -21,7 +23,7 @@
         """
         Constructor
         """
-        super().__init__()
+        super(Py3FlakesPage, self).__init__()
         self.setupUi(self)
         self.setObjectName("Py3FlakesPage")
--- a/Preferences/ConfigurationPages/PythonPage.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Preferences/ConfigurationPages/PythonPage.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing the Python configuration page.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from .ConfigurationPageBase import ConfigurationPageBase
 from .Ui_PythonPage import Ui_PythonPage

@@ -22,7 +24,7 @@
         """
         Constructor
         """
-        super().__init__()
+        super(PythonPage, self).__init__()
         self.setupUi(self)
         self.setObjectName("PythonPage")
--- a/Preferences/ConfigurationPages/QtPage.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Preferences/ConfigurationPages/QtPage.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing the Qt configuration page.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.QtCore import pyqtSlot

 from E5Gui.E5Completers import E5DirCompleter
@@ -27,7 +29,7 @@
         """
         Constructor
         """
-        super().__init__()
+        super(QtPage, self).__init__()
         self.setupUi(self)
         self.setObjectName("QtPage")
--- a/Preferences/ConfigurationPages/SecurityPage.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Preferences/ConfigurationPages/SecurityPage.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing the Security configuration page.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.QtCore import pyqtSlot
 from PyQt4.QtGui import QDialog
 from PyQt4.QtWebKit import QWebSettings
@@ -27,7 +29,7 @@

         @param configDialog reference to the configuration dialog (ConfigurationDialog)
         """
-        super().__init__()
+        super(SecurityPage, self).__init__()
         self.setupUi(self)
         self.setObjectName("SecurityPage")
--- a/Preferences/ConfigurationPages/ShellPage.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Preferences/ConfigurationPages/ShellPage.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing the Shell configuration page.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.QtCore import pyqtSlot

 from .ConfigurationPageBase import ConfigurationPageBase
@@ -23,7 +25,7 @@
         """
         Constructor
         """
-        super().__init__()
+        super(ShellPage, self).__init__()
         self.setupUi(self)
         self.setObjectName("ShellPage")
--- a/Preferences/ConfigurationPages/TasksPage.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Preferences/ConfigurationPages/TasksPage.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing the Tasks configuration page.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from .ConfigurationPageBase import ConfigurationPageBase
 from .Ui_TasksPage import Ui_TasksPage

@@ -21,7 +23,7 @@
         """
         Constructor
         """
-        super().__init__()
+        super(TasksPage, self).__init__()
         self.setupUi(self)
         self.setObjectName("TasksPage")
--- a/Preferences/ConfigurationPages/TemplatesPage.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Preferences/ConfigurationPages/TemplatesPage.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing the Templates configuration page.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from .ConfigurationPageBase import ConfigurationPageBase
 from .Ui_TemplatesPage import Ui_TemplatesPage

@@ -21,7 +23,7 @@
         """
         Constructor
         """
-        super().__init__()
+        super(TemplatesPage, self).__init__()
         self.setupUi(self)
         self.setObjectName("TemplatesPage")
--- a/Preferences/ConfigurationPages/TrayStarterPage.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Preferences/ConfigurationPages/TrayStarterPage.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing the tray starter configuration page.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from .ConfigurationPageBase import ConfigurationPageBase
 from .Ui_TrayStarterPage import Ui_TrayStarterPage

@@ -24,7 +26,7 @@

         @param parent reference to the parent widget (QWidget)
         """
-        super().__init__()
+        super(TrayStarterPage, self).__init__()
         self.setupUi(self)
         self.setObjectName("Py3FlakesPage")
--- a/Preferences/ConfigurationPages/VcsPage.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Preferences/ConfigurationPages/VcsPage.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing the VCS configuration page.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from .ConfigurationPageBase import ConfigurationPageBase
 from .Ui_VcsPage import Ui_VcsPage

@@ -21,7 +23,7 @@
         """
         Constructor
         """
-        super().__init__()
+        super(VcsPage, self).__init__()
         self.setupUi(self)
         self.setObjectName("VcsPage")
--- a/Preferences/ConfigurationPages/ViewmanagerPage.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Preferences/ConfigurationPages/ViewmanagerPage.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing the Viewmanager configuration page.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.QtCore import pyqtSlot

 from E5Gui.E5Application import e5App
@@ -25,7 +27,7 @@
         """
         Constructor
         """
-        super().__init__()
+        super(ViewmanagerPage, self).__init__()
         self.setupUi(self)
         self.setObjectName("ViewmanagerPage")
--- a/Preferences/PreferencesLexer.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Preferences/PreferencesLexer.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing a special QextScintilla lexer to handle the preferences.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.QtGui import QColor, QFont, QApplication
 from PyQt4.Qsci import QsciLexer

@@ -68,7 +70,7 @@
         @param language The lexer language. (string)
         @param parent The parent widget of this lexer. (QextScintilla)
         """
-        super().__init__(parent)
+        super(PreferencesLexer, self).__init__(parent)

         # These default font families are taken from QScintilla
         if Globals.isWindowsPlatform():
--- a/Preferences/ProgramsDialog.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Preferences/ProgramsDialog.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,12 @@
 Module implementing the Programs page.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+try:
+    str = unicode
+except (NameError):
+    pass
+
 import os
 import re

@@ -32,7 +38,7 @@

         @param parent The parent widget of this dialog. (QWidget)
         """
-        super().__init__(parent)
+        super(ProgramsDialog, self).__init__(parent)
         self.setupUi(self)
         self.setObjectName("ProgramsDialog")
--- a/Preferences/ShortcutDialog.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Preferences/ShortcutDialog.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing a dialog for the configuration of a keyboard shortcut.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.QtCore import pyqtSignal, QEvent, Qt
 from PyQt4.QtGui import QKeySequence, QDialog, QDialogButtonBox

@@ -30,7 +32,7 @@
         @param name The name of this dialog. (string)
         @param modal Flag indicating a modal dialog. (boolean)
         """
-        super().__init__(parent)
+        super(ShortcutDialog, self).__init__(parent)
         if name:
             self.setObjectName(name)
         self.setModal(modal)
--- a/Preferences/Shortcuts.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Preferences/Shortcuts.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing functions dealing with keyboard shortcuts.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.QtCore import QFile, QIODevice
 from PyQt4.QtGui import QKeySequence, QApplication
--- a/Preferences/ShortcutsDialog.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Preferences/ShortcutsDialog.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing a dialog for the configuration of eric5s keyboard shortcuts.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.QtCore import pyqtSignal, QRegExp, Qt, pyqtSlot
 from PyQt4.QtGui import QKeySequence, QHeaderView, QDialog, QTreeWidgetItem

@@ -39,7 +41,7 @@
         @param name The name of this dialog. (string)
         @param modal Flag indicating a modal dialog. (boolean)
         """
-        super().__init__(parent)
+        super(ShortcutsDialog, self).__init__(parent)
         if name:
             self.setObjectName(name)
         self.setModal(modal)
--- a/Preferences/ToolConfigurationDialog.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Preferences/ToolConfigurationDialog.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing a configuration dialog for the tools menu.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 import copy

 from PyQt4.QtCore import Qt, pyqtSlot
@@ -30,7 +32,7 @@
         @param toollist list of configured tools
         @param parent parent widget (QWidget)
         """
-        super().__init__(parent)
+        super(ToolConfigurationDialog, self).__init__(parent)
         self.setupUi(self)

         self.iconCompleter = E5FileCompleter(self.iconEdit)
--- a/Preferences/ToolGroupConfigurationDialog.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Preferences/ToolGroupConfigurationDialog.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing a configuration dialog for the tools menu.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 import copy

 from PyQt4.QtCore import Qt, pyqtSlot
@@ -29,7 +31,7 @@
         @param currentGroup number of the active group (integer)
         @param parent parent widget (QWidget)
         """
-        super().__init__(parent)
+        super(ToolGroupConfigurationDialog, self).__init__(parent)
         self.setupUi(self)

         self.currentGroup = currentGroup
--- a/Preferences/ViewProfileDialog.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Preferences/ViewProfileDialog.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing a dialog to configure the various view profiles.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.QtGui import QDialog

 from .Ui_ViewProfileToolboxesDialog import Ui_ViewProfileToolboxesDialog
@@ -30,7 +32,7 @@
             is a separate window (boolean)
         @param parent parent widget of this dialog (QWidget)
         """
-        super().__init__(parent)
+        super(ViewProfileDialog, self).__init__(parent)

         self.__layout = layout
         if self.__layout == "Toolboxes":
--- a/Preferences/__init__.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Preferences/__init__.py	Mon Mar 25 03:11:06 2013 +0100
@@ -16,6 +16,8 @@
 to import it.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 import os
 import fnmatch
 import shutil
--- a/Project/AddDirectoryDialog.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Project/AddDirectoryDialog.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing a dialog to add files of a directory to the project.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.QtCore import pyqtSlot
 from PyQt4.QtGui import QDialog

@@ -33,7 +35,7 @@
         @param name name of this dialog (string)
         @param startdir start directory for the selection dialog
         """
-        super().__init__(parent)
+        super(AddDirectoryDialog, self).__init__(parent)
         if name:
             self.setObjectName(name)
         self.setupUi(self)
--- a/Project/AddFileDialog.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Project/AddFileDialog.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing a dialog to add a file to the project.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 import os

 from PyQt4.QtCore import pyqtSlot
@@ -35,7 +37,7 @@
         @param name name of this dialog (string)
         @param startdir start directory for the selection dialog
         """
-        super().__init__(parent)
+        super(AddFileDialog, self).__init__(parent)
         if name:
             self.setObjectName(name)
         self.setupUi(self)
--- a/Project/AddFoundFilesDialog.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Project/AddFoundFilesDialog.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing a dialog to show the found files to the user.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.QtCore import pyqtSlot
 from PyQt4.QtGui import QDialog, QDialogButtonBox

@@ -31,7 +33,7 @@
         @param parent parent widget of this dialog (QWidget)
         @param name name of this dialog (string)
         """
-        super().__init__(parent)
+        super(AddFoundFilesDialog, self).__init__(parent)
         if name:
             self.setObjectName(name)
         self.setupUi(self)
--- a/Project/AddLanguageDialog.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Project/AddLanguageDialog.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing a dialog to add a new language to the project.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.QtGui import QDialog

 from .Ui_AddLanguageDialog import Ui_AddLanguageDialog
@@ -23,7 +25,7 @@
         @param parent parent widget of this dialog (QWidget)
         @param name name of this dialog (string)
         """
-        super().__init__(parent)
+        super(AddLanguageDialog, self).__init__(parent)
         if name:
             self.setObjectName(name)
         self.setupUi(self)
--- a/Project/CreateDialogCodeDialog.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Project/CreateDialogCodeDialog.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing a dialog to generate code for a Qt4/Qt5 dialog.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 import os

 from PyQt4.QtCore import QMetaObject, QByteArray, QRegExp, Qt, pyqtSlot, QMetaMethod, \
@@ -44,7 +46,7 @@
         @param project reference to the project object
         @param parent parent widget if the dialog (QWidget)
         """
-        super().__init__(parent)
+        super(CreateDialogCodeDialog, self).__init__(parent)
         self.setupUi(self)

         self.okButton = self.buttonBox.button(QDialogButtonBox.Ok)
--- a/Project/DebuggerPropertiesDialog.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Project/DebuggerPropertiesDialog.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing a dialog for entering project specific debugger settings.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 import os
 import sys

@@ -35,7 +37,7 @@
         @param parent parent widget of this dialog (QWidget)
         @param name name of this dialog (string)
         """
-        super().__init__(parent)
+        super(DebuggerPropertiesDialog, self).__init__(parent)
         if name:
             self.setObjectName(name)
         self.setupUi(self)
--- a/Project/FiletypeAssociationDialog.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Project/FiletypeAssociationDialog.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing a dialog to enter filetype associations for the project.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.QtCore import Qt, pyqtSlot
 from PyQt4.QtGui import QHeaderView, QDialog, QTreeWidgetItem

@@ -24,7 +26,7 @@
         @param project reference to the project object
         @param parent reference to the parent widget (QWidget)
         """
-        super().__init__(parent)
+        super(FiletypeAssociationDialog, self).__init__(parent)
         self.setupUi(self)

         self.filetypeAssociationList.headerItem().setText(
--- a/Project/LexerAssociationDialog.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Project/LexerAssociationDialog.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing a dialog to enter lexer associations for the project.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 import os

 from PyQt4.QtCore import Qt, pyqtSlot, qVersion
@@ -26,7 +28,7 @@
         @param project reference to the project object
         @param parent reference to the parent widget (QWidget)
         """
-        super().__init__(parent)
+        super(LexerAssociationDialog, self).__init__(parent)
         self.setupUi(self)

         self.editorLexerList.headerItem().setText(self.editorLexerList.columnCount(), "")
--- a/Project/NewDialogClassDialog.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Project/NewDialogClassDialog.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing a dialog to enter the data for a new dialog class file.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 import os

 from PyQt4.QtCore import QDir, pyqtSlot
@@ -31,7 +33,7 @@
         @param defaultPath default path for the new file (string)
         @param parent parent widget if the dialog (QWidget)
         """
-        super().__init__(parent)
+        super(NewDialogClassDialog, self).__init__(parent)
         self.setupUi(self)

         self.okButton = self.buttonBox.button(QDialogButtonBox.Ok)
--- a/Project/NewPythonPackageDialog.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Project/NewPythonPackageDialog.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing a dialog to add a new Python package.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.QtGui import QDialog, QDialogButtonBox
 from PyQt4.QtCore import pyqtSlot

@@ -23,7 +25,7 @@

         @param relPath initial package path relative to the project root (string)
         """
-        super().__init__(parent)
+        super(NewPythonPackageDialog, self).__init__(parent)
         self.setupUi(self)

         self.okButton = self.buttonBox.button(QDialogButtonBox.Ok)
--- a/Project/Project.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Project/Project.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,12 @@
 Module implementing the project management functionality.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+try:
+    str = unicode
+except (NameError):
+    pass
+
 import os
 import time
 import shutil
@@ -159,7 +165,7 @@
         @param parent parent widget (usually the ui object) (QWidget)
         @param filename optional filename of a project file to open (string)
         """
-        super().__init__(parent)
+        super(Project, self).__init__(parent)

         self.ui = parent
--- a/Project/ProjectBaseBrowser.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Project/ProjectBaseBrowser.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing the baseclass for the various project browsers.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 import os

 from PyQt4.QtCore import QModelIndex, pyqtSignal, Qt
--- a/Project/ProjectBrowser.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Project/ProjectBrowser.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing the project browser part of the eric5 UI.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.QtCore import Qt
 from PyQt4.QtGui import QColor, QApplication
--- a/Project/ProjectBrowserModel.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Project/ProjectBrowserModel.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing the browser model.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 import os
 import re

@@ -221,7 +223,7 @@

         @param parent reference to parent object (Project.Project)
         """
-        super().__init__(parent)
+        super(ProjectBrowserModel, self).__init__(parent)

         rootData = self.trUtf8("Name")
         self.rootItem = BrowserItem(None, rootData)
--- a/Project/ProjectBrowserSortFilterProxyModel.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Project/ProjectBrowserSortFilterProxyModel.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing the browser sort filter proxy model.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from UI.BrowserSortFilterProxyModel import BrowserSortFilterProxyModel
 from .ProjectBrowserModel import ProjectBrowserSourceType
--- a/Project/ProjectFormsBrowser.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Project/ProjectFormsBrowser.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,12 @@
 Module implementing a class used to display the forms part of the project.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+try:
+    str = unicode
+except (NameError):
+    pass
+
 import os
 import sys
 import shutil
--- a/Project/ProjectInterfacesBrowser.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Project/ProjectInterfacesBrowser.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,12 @@
 Module implementing the a class used to display the interfaces (IDL) part of the project.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+try:
+    str = unicode
+except (NameError):
+    pass
+
 import os
 import glob
--- a/Project/ProjectOthersBrowser.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Project/ProjectOthersBrowser.py	Mon Mar 25 03:11:06 2013 +0100
@@ -8,6 +8,8 @@
 the other categories.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 import mimetypes

 from PyQt4.QtCore import QModelIndex, pyqtSignal, QUrl
--- a/Project/ProjectResourcesBrowser.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Project/ProjectResourcesBrowser.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,12 @@
 Module implementing a class used to display the resources part of the project.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+try:
+    str = unicode
+except (NameError):
+    pass
+
 import os

 from PyQt4.QtCore import QThread, QFileInfo, pyqtSignal, PYQT_VERSION, QProcess
--- a/Project/ProjectSourcesBrowser.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Project/ProjectSourcesBrowser.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing a class used to display the Sources part of the project.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 import os

 from PyQt4.QtCore import pyqtSignal
--- a/Project/ProjectTranslationsBrowser.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Project/ProjectTranslationsBrowser.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,12 @@
 Module implementing a class used to display the translations part of the project.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+try:
+    str = unicode
+except (NameError):
+    pass
+
 import os
 import shutil
 import fnmatch
--- a/Project/PropertiesDialog.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Project/PropertiesDialog.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing the project properties dialog.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 import os

 from PyQt4.QtCore import QDir, pyqtSlot
@@ -35,7 +37,7 @@
         @param parent parent widget of this dialog (QWidget)
         @param name name of this dialog (string)
         """
-        super().__init__(parent)
+        super(PropertiesDialog, self).__init__(parent)
         if name:
             self.setObjectName(name)
         self.setupUi(self)
--- a/Project/SpellingPropertiesDialog.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Project/SpellingPropertiesDialog.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing the Spelling Properties dialog.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 import os

 from PyQt4.QtCore import pyqtSlot
@@ -33,7 +35,7 @@
         @param new flag indicating the generation of a new project
         @param parent parent widget of this dialog (QWidget)
         """
-        super().__init__(parent)
+        super(SpellingPropertiesDialog, self).__init__(parent)
         self.setupUi(self)

         self.project = project
--- a/Project/TranslationPropertiesDialog.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Project/TranslationPropertiesDialog.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing the Translations Properties dialog.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 import os

 from PyQt4.QtCore import pyqtSlot
@@ -32,7 +34,7 @@
         @param new flag indicating the generation of a new project
         @param parent parent widget of this dialog (QWidget)
         """
-        super().__init__(parent)
+        super(TranslationPropertiesDialog, self).__init__(parent)
         self.setupUi(self)

         self.project = project
--- a/Project/UserPropertiesDialog.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Project/UserPropertiesDialog.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing the user specific project properties dialog.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.QtGui import QDialog

 from E5Gui.E5Application import e5App
@@ -28,7 +30,7 @@
         @param parent parent widget of this dialog (QWidget)
         @param name name of this dialog (string)
         """
-        super().__init__(parent)
+        super(UserPropertiesDialog, self).__init__(parent)
         if name:
             self.setObjectName(name)
         self.setupUi(self)
--- a/PyUnit/UnittestDialog.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/PyUnit/UnittestDialog.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing the UI to the pyunit package.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 import unittest
 import sys
 import time
@@ -54,7 +56,7 @@
         @param parent parent widget of this dialog (QWidget)
         @param name name of this dialog (string)
         """
-        super().__init__(parent)
+        super(UnittestDialog, self).__init__(parent)
         if name:
             self.setObjectName(name)
         self.setupUi(self)
@@ -655,7 +657,7 @@

         @param parent The parent widget.
         """
-        super().__init__()
+        super(QtTestResult, self).__init__()
         self.parent = parent

     def addFailure(self, test, err):
@@ -665,7 +667,7 @@
         @param test reference to the test object
         @param err error traceback
         """
-        super().addFailure(test, err)
+        super(QtTestResult, self).addFailure(test, err)
         tracebackLines = self._exc_info_to_string(err, test)
         self.parent.testFailed(str(test), tracebackLines, test.id())

@@ -676,7 +678,7 @@
         @param test reference to the test object
         @param err error traceback
         """
-        super().addError(test, err)
+        super(QtTestResult, self).addError(test, err)
         tracebackLines = self._exc_info_to_string(err, test)
         self.parent.testErrored(str(test), tracebackLines, test.id())

@@ -687,7 +689,7 @@
         @param test reference to the test object
         @param reason reason for skipping the test (string)
         """
-        super().addSkip(test, reason)
+        super(QtTestResult, self).addSkip(test, reason)
         self.parent.testSkipped(str(test), reason, test.id())

     def addExpectedFailure(self, test, err):
@@ -697,7 +699,7 @@
         @param test reference to the test object
         @param err error traceback
         """
-        super().addExpectedFailure(test, err)
+        super(QtTestResult, self).addExpectedFailure(test, err)
         tracebackLines = self._exc_info_to_string(err, test)
         self.parent.testFailedExpected(str(test), tracebackLines, test.id())

@@ -707,7 +709,7 @@

         @param test reference to the test object
         """
-        super().addUnexpectedSuccess(test)
+        super(QtTestResult, self).addUnexpectedSuccess(test)
         self.parent.testSucceededUnexpected(str(test), test.id())

     def startTest(self, test):
@@ -716,7 +718,7 @@

         @param test Reference to the test object
         """
-        super().startTest(test)
+        super(QtTestResult, self).startTest(test)
         self.parent.testStarted(str(test), test.shortDescription())

     def stopTest(self, test):
@@ -725,7 +727,7 @@

         @param test Reference to the test object
         """
-        super().stopTest(test)
+        super(QtTestResult, self).stopTest(test)
         self.parent.testFinished()


@@ -740,7 +742,7 @@
         @param prog filename of the program to open
         @param parent reference to the parent widget (QWidget)
         """
-        super().__init__(parent)
+        super(UnittestWindow, self).__init__(parent)
         self.cw = UnittestDialog(prog=prog, parent=self)
         self.cw.installEventFilter(self)
         size = self.cw.size()
--- a/QScintilla/APIsManager.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/QScintilla/APIsManager.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing the APIsManager.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 import os

 from PyQt4.QtCore import QDir, QFileInfo, pyqtSignal, QObject
@@ -38,7 +40,7 @@
             for a preparation process (boolean)
         @param parent reference to the parent object (QObject)
         """
-        super().__init__(parent)
+        super(APIs, self).__init__(parent)
         self.setObjectName("APIs_{0}".format(language))

         self.__inPreparation = False
@@ -205,7 +207,7 @@

         @param parent reference to the parent object (QObject)
         """
-        super().__init__(parent)
+        super(APIsManager, self).__init__(parent)
         self.setObjectName("APIsManager")

         self.__apis = {}
--- a/QScintilla/Editor.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/QScintilla/Editor.py	Mon Mar 25 03:11:06 2013 +0100
@@ -6,6 +6,8 @@
 """
 Module implementing the editor component of the eric5 IDE.
 """
+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 import os
 import re
 import difflib
@@ -131,7 +133,7 @@
         @param editor reference to an Editor object, if this is a cloned view
         @param tv reference to the task viewer object
         """
-        super().__init__()
+        super(Editor, self).__init__()
         self.setAttribute(Qt.WA_DeleteOnClose)
         self.setAttribute(Qt.WA_KeyCompression)
         self.setUtf8(True)
@@ -4199,7 +4201,7 @@
         if self.__ctHookFunction is not None:
             self.__callTip()
         else:
-            super().callTip()
+            super(Editor, self).callTip()

     def __callTip(self):
         """
@@ -4247,7 +4249,7 @@
         if len(callTips) == 0:
             if Preferences.getEditor("CallTipsScintillaOnFail"):
                 # try QScintilla calltips
-                super().callTip()
+                super(Editor, self).callTip()
             return

         ctshift = 0
@@ -5534,7 +5536,7 @@
         """
         Public method to undo the last recorded change.
         """
-        super().undo()
+        super(Editor, self).undo()
         self.undoAvailable.emit(self.isUndoAvailable())
         self.redoAvailable.emit(self.isRedoAvailable())

@@ -5542,7 +5544,7 @@
         """
         Public method to redo the last recorded change.
         """
-        super().redo()
+        super(Editor, self).redo()
         self.undoAvailable.emit(self.isUndoAvailable())
         self.redoAvailable.emit(self.isRedoAvailable())

@@ -5590,7 +5592,7 @@
         if self.fileName:
             self.taskViewer.clearFileTasks(self.fileName, True)

-        super().close()
+        super(Editor, self).close()

     def keyPressEvent(self, ev):
         """
@@ -5602,7 +5604,7 @@

         # See it is text to insert.
         if len(txt) and txt >= " ":
-            super().keyPressEvent(ev)
+            super(Editor, self).keyPressEvent(ev)
         else:
             ev.ignore()

@@ -5657,7 +5659,7 @@

         self.setCursorFlashTime(QApplication.cursorFlashTime())

-        super().focusInEvent(event)
+        super(Editor, self).focusInEvent(event)

     def focusOutEvent(self, event):
         """
@@ -5668,7 +5670,7 @@
         self.vm.editorActGrp.setEnabled(False)
         self.setCaretWidth(0)

-        super().focusOutEvent(event)
+        super(Editor, self).focusOutEvent(event)

     def changeEvent(self, evt):
         """
@@ -5693,7 +5695,7 @@
                 cap = self.trUtf8("{0} (ro)").format(cap)
             self.setWindowTitle(cap)

-        super().changeEvent(evt)
+        super(Editor, self).changeEvent(evt)

     def mousePressEvent(self, event):
         """
@@ -5702,7 +5704,7 @@
         @param event the mouse press event (QMouseEvent)
         """
         self.vm.eventFilter(self, event)
-        super().mousePressEvent(event)
+        super(Editor, self).mousePressEvent(event)

     def wheelEvent(self, evt):
         """
@@ -5726,7 +5728,7 @@
             evt.accept()
             return

-        super().wheelEvent(evt)
+        super(Editor, self).wheelEvent(evt)

     def event(self, evt):
         """
@@ -5739,7 +5741,7 @@
             self.gestureEvent(evt)
             return True

-        return super().event(evt)
+        return super(Editor, self).event(evt)

     def gestureEvent(self, evt):
         """
@@ -5866,7 +5868,7 @@
         if self.inDragDrop:
             event.acceptProposedAction()
         else:
-            super().dragEnterEvent(event)
+            super(Editor, self).dragEnterEvent(event)

     def dragMoveEvent(self, event):
         """
@@ -5877,7 +5879,7 @@
         if self.inDragDrop:
             event.accept()
         else:
-            super().dragMoveEvent(event)
+            super(Editor, self).dragMoveEvent(event)

     def dragLeaveEvent(self, event):
         """
@@ -5889,7 +5891,7 @@
             self.inDragDrop = False
             event.accept()
         else:
-            super().dragLeaveEvent(event)
+            super(Editor, self).dragLeaveEvent(event)

     def dropEvent(self, event):
         """
@@ -5910,7 +5912,7 @@
                                 .format(fname))
             event.acceptProposedAction()
         else:
-            super().dropEvent(event)
+            super(Editor, self).dropEvent(event)

         self.inDragDrop = False

@@ -6149,7 +6151,7 @@
                              for t in templateNames])
                         return

-        super().editorCommand(cmd)
+        super(Editor, self).editorCommand(cmd)

     def __completionListSelected(self, id, txt):
         """
--- a/QScintilla/EditorAssembly.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/QScintilla/EditorAssembly.py	Mon Mar 25 03:11:06 2013 +0100
@@ -8,6 +8,8 @@
 the editor widget.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.QtCore import QTimer
 from PyQt4.QtGui import QWidget, QGridLayout, QComboBox

@@ -31,7 +33,7 @@
         @param editor reference to an Editor object, if this is a cloned view
         @param tv reference to the task viewer object
         """
-        super().__init__()
+        super(EditorAssembly, self).__init__()

         self.__layout = QGridLayout(self)
         self.__layout.setContentsMargins(0, 0, 0, 0)
--- a/QScintilla/Exporters/ExporterBase.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/QScintilla/Exporters/ExporterBase.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing the exporter base class.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.QtCore import QFileInfo, QObject
 from PyQt4.QtGui import QApplication

@@ -26,7 +28,7 @@
         @param editor reference to the editor object (QScintilla.Editor.Editor)
         @param parent parent object of the exporter (QObject)
         """
-        super().__init__(parent)
+        super(ExporterBase, self).__init__(parent)
         self.editor = editor

     def _getFileName(self, filter):
--- a/QScintilla/Exporters/ExporterHTML.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/QScintilla/Exporters/ExporterHTML.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing an exporter for HTML.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 # This code is a port of the C++ code found in SciTE 1.74
 # Original code: Copyright 1998-2006 by Neil Hodgson <neilh@scintilla.org>
--- a/QScintilla/Exporters/ExporterODT.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/QScintilla/Exporters/ExporterODT.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing an exporter for ODT.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.QtCore import Qt
 from PyQt4.QtGui import QApplication, QCursor, QTextDocument, QTextDocumentWriter
--- a/QScintilla/Exporters/ExporterPDF.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/QScintilla/Exporters/ExporterPDF.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing an exporter for PDF.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 # This code is a port of the C++ code found in SciTE 1.74
 # Original code: Copyright 1998-2006 by Neil Hodgson <neilh@scintilla.org>
--- a/QScintilla/Exporters/ExporterRTF.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/QScintilla/Exporters/ExporterRTF.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing an exporter for RTF.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 # This code is a port of the C++ code found in SciTE 1.74
 # Original code: Copyright 1998-2006 by Neil Hodgson <neilh@scintilla.org>
--- a/QScintilla/Exporters/ExporterTEX.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/QScintilla/Exporters/ExporterTEX.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing an exporter for TeX.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 # This code is a port of the C++ code found in SciTE 1.74
 # Original code: Copyright 1998-2006 by Neil Hodgson <neilh@scintilla.org>
--- a/QScintilla/Exporters/__init__.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/QScintilla/Exporters/__init__.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Package implementing exporters for various file formats.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.QtGui import QApplication
--- a/QScintilla/GotoDialog.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/QScintilla/GotoDialog.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing the Goto dialog.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.QtGui import QDialog

 from .Ui_GotoDialog import Ui_GotoDialog
@@ -26,7 +28,7 @@
         @param name name of this dialog (string)
         @param modal flag indicating a modal dialog (boolean)
         """
-        super().__init__(parent)
+        super(GotoDialog, self).__init__(parent)
         if name:
             self.setObjectName(name)
         self.setupUi(self)
--- a/QScintilla/Lexers/Lexer.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/QScintilla/Lexers/Lexer.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing the lexer mixin class.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 import Preferences
--- a/QScintilla/Lexers/LexerBash.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/QScintilla/Lexers/LexerBash.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing a Bash lexer with some additional methods.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.Qsci import QsciLexerBash

 from .Lexer import Lexer
@@ -23,7 +25,7 @@

         @param parent parent widget of this lexer
         """
-        super().__init__(parent)
+        super(LexerBash, self).__init__(parent)
         Lexer.__init__(self)

         self.commentString = "#"
--- a/QScintilla/Lexers/LexerBatch.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/QScintilla/Lexers/LexerBatch.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing a Batch file lexer with some additional methods.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.Qsci import QsciLexerBatch

 from .Lexer import Lexer
@@ -22,7 +24,7 @@

         @param parent parent widget of this lexer
         """
-        super().__init__(parent)
+        super(LexerBatch, self).__init__(parent)
         Lexer.__init__(self)

         self.commentString = "REM "
--- a/QScintilla/Lexers/LexerCMake.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/QScintilla/Lexers/LexerCMake.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing a CMake lexer with some additional methods.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.Qsci import QsciLexerCMake

 from .Lexer import Lexer
@@ -23,7 +25,7 @@

         @param parent parent widget of this lexer
         """
-        super().__init__(parent)
+        super(LexerCMake, self).__init__(parent)
         Lexer.__init__(self)

         self.commentString = "#"
--- a/QScintilla/Lexers/LexerCPP.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/QScintilla/Lexers/LexerCPP.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing a CPP lexer with some additional methods.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.Qsci import QsciLexerCPP,  QsciScintilla

 from .Lexer import Lexer
@@ -23,7 +25,7 @@

         @param parent parent widget of this lexer
         """
-        super().__init__(parent, caseInsensitiveKeywords)
+        super(LexerCPP, self).__init__(parent, caseInsensitiveKeywords)
         Lexer.__init__(self)

         self.commentString = "//"
--- a/QScintilla/Lexers/LexerCSS.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/QScintilla/Lexers/LexerCSS.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing a CSS lexer with some additional methods.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.Qsci import QsciLexerCSS

 from .Lexer import Lexer
@@ -23,7 +25,7 @@

         @param parent parent widget of this lexer
         """
-        super().__init__(parent)
+        super(LexerCSS, self).__init__(parent)
         Lexer.__init__(self)

         self.commentString = "#"
--- a/QScintilla/Lexers/LexerCSharp.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/QScintilla/Lexers/LexerCSharp.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing a C# lexer with some additional methods.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.Qsci import QsciLexerCSharp,  QsciScintilla

 from .Lexer import Lexer
@@ -23,7 +25,7 @@

         @param parent parent widget of this lexer
         """
-        super().__init__(parent)
+        super(LexerCSharp, self).__init__(parent)
         Lexer.__init__(self)

         self.commentString = "//"
--- a/QScintilla/Lexers/LexerContainer.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/QScintilla/Lexers/LexerContainer.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing a base class for custom lexers.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.Qsci import QsciLexer

 from .Lexer import Lexer
@@ -22,7 +24,7 @@

         @param parent parent widget of this lexer
         """
-        super().__init__(parent)
+        super(LexerContainer, self).__init__(parent)
         Lexer.__init__(self)

         self.editor = parent
--- a/QScintilla/Lexers/LexerD.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/QScintilla/Lexers/LexerD.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing a D lexer with some additional methods.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.Qsci import QsciLexerD, QsciScintilla

 from .Lexer import Lexer
@@ -23,7 +25,7 @@

         @param parent parent widget of this lexer
         """
-        super().__init__(parent)
+        super(LexerD, self).__init__(parent)
         Lexer.__init__(self)

         self.commentString = "//"
--- a/QScintilla/Lexers/LexerDiff.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/QScintilla/Lexers/LexerDiff.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing a Diff lexer with some additional methods.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.Qsci import QsciLexerDiff

 from .Lexer import Lexer
@@ -22,7 +24,7 @@

         @param parent parent widget of this lexer
         """
-        super().__init__(parent)
+        super(LexerDiff, self).__init__(parent)
         Lexer.__init__(self)

     def isCommentStyle(self, style):
--- a/QScintilla/Lexers/LexerFortran.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/QScintilla/Lexers/LexerFortran.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing a Fortran lexer with some additional methods.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.Qsci import QsciLexerFortran

 from .Lexer import Lexer
@@ -23,7 +25,7 @@

         @param parent parent widget of this lexer
         """
-        super().__init__(parent)
+        super(LexerFortran, self).__init__(parent)
         Lexer.__init__(self)

         self.commentString = "!"
--- a/QScintilla/Lexers/LexerFortran77.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/QScintilla/Lexers/LexerFortran77.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing a Fortran lexer with some additional methods.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.Qsci import QsciLexerFortran77

 from .Lexer import Lexer
@@ -23,7 +25,7 @@

         @param parent parent widget of this lexer
         """
-        super().__init__(parent)
+        super(LexerFortran77, self).__init__(parent)
         Lexer.__init__(self)

         self.commentString = "c"
--- a/QScintilla/Lexers/LexerHTML.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/QScintilla/Lexers/LexerHTML.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing a HTML lexer with some additional methods.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.Qsci import QsciLexerHTML

 from .Lexer import Lexer
@@ -23,7 +25,7 @@

         @param parent parent widget of this lexer
         """
-        super().__init__(parent)
+        super(LexerHTML, self).__init__(parent)
         Lexer.__init__(self)

         self.streamCommentString = {
--- a/QScintilla/Lexers/LexerIDL.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/QScintilla/Lexers/LexerIDL.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing an IDL lexer with some additional methods.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.Qsci import QsciLexerIDL,  QsciScintilla

 from .Lexer import Lexer
@@ -23,7 +25,7 @@

         @param parent parent widget of this lexer
         """
-        super().__init__(parent)
+        super(LexerIDL, self).__init__(parent)
         Lexer.__init__(self)

         self.commentString = "//"
--- a/QScintilla/Lexers/LexerJava.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/QScintilla/Lexers/LexerJava.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing a Java lexer with some additional methods.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.Qsci import QsciLexerJava,  QsciScintilla

 from .Lexer import Lexer
@@ -23,7 +25,7 @@

         @param parent parent widget of this lexer
         """
-        super().__init__(parent)
+        super(LexerJava, self).__init__(parent)
         Lexer.__init__(self)

         self.commentString = "//"
--- a/QScintilla/Lexers/LexerJavaScript.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/QScintilla/Lexers/LexerJavaScript.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing a JavaScript lexer with some additional methods.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.Qsci import QsciLexerJavaScript,  QsciScintilla

 from .Lexer import Lexer
@@ -23,7 +25,7 @@

         @param parent parent widget of this lexer
         """
-        super().__init__(parent)
+        super(LexerJavaScript, self).__init__(parent)
         Lexer.__init__(self)

         self.commentString = "//"
--- a/QScintilla/Lexers/LexerLua.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/QScintilla/Lexers/LexerLua.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing a Lua lexer with some additional methods.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.Qsci import QsciLexerLua

 from .Lexer import Lexer
@@ -23,7 +25,7 @@

         @param parent parent widget of this lexer
         """
-        super().__init__(parent)
+        super(LexerLua, self).__init__(parent)
         Lexer.__init__(self)

         self.commentString = "--"
--- a/QScintilla/Lexers/LexerMakefile.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/QScintilla/Lexers/LexerMakefile.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing a Makefile lexer with some additional methods.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.Qsci import QsciLexerMakefile

 from .Lexer import Lexer
@@ -22,7 +24,7 @@

         @param parent parent widget of this lexer
         """
-        super().__init__(parent)
+        super(LexerMakefile, self).__init__(parent)
         Lexer.__init__(self)

         self.commentString = "#"
--- a/QScintilla/Lexers/LexerMatlab.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/QScintilla/Lexers/LexerMatlab.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing a Matlab lexer with some additional methods.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.Qsci import QsciLexerMatlab

 from .Lexer import Lexer
@@ -22,7 +24,7 @@

         @param parent parent widget of this lexer
         """
-        super().__init__(parent)
+        super(LexerMatlab, self).__init__(parent)
         Lexer.__init__(self)

         self.commentString = "%~"
--- a/QScintilla/Lexers/LexerOctave.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/QScintilla/Lexers/LexerOctave.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing a Octave lexer with some additional methods.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.Qsci import QsciLexerOctave

 from .Lexer import Lexer
@@ -22,7 +24,7 @@

         @param parent parent widget of this lexer
         """
-        super().__init__(parent)
+        super(LexerOctave, self).__init__(parent)
         Lexer.__init__(self)

         self.commentString = "#"
--- a/QScintilla/Lexers/LexerPOV.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/QScintilla/Lexers/LexerPOV.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing a Povray lexer with some additional methods.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.Qsci import QsciLexerPOV

 from .Lexer import Lexer
@@ -23,7 +25,7 @@

         @param parent parent widget of this lexer
         """
-        super().__init__(parent)
+        super(LexerPOV, self).__init__(parent)
         Lexer.__init__(self)

         self.commentString = "//"
--- a/QScintilla/Lexers/LexerPascal.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/QScintilla/Lexers/LexerPascal.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing a Pascal lexer with some additional methods.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.Qsci import QsciLexerPascal

 from .Lexer import Lexer
@@ -23,7 +25,7 @@

         @param parent parent widget of this lexer
         """
-        super().__init__(parent)
+        super(LexerPascal, self).__init__(parent)
         Lexer.__init__(self)

         self.commentString = "//"
--- a/QScintilla/Lexers/LexerPerl.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/QScintilla/Lexers/LexerPerl.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing a Perl lexer with some additional methods.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.Qsci import QsciLexerPerl

 from .Lexer import Lexer
@@ -23,7 +25,7 @@

         @param parent parent widget of this lexer
         """
-        super().__init__(parent)
+        super(LexerPerl, self).__init__(parent)
         Lexer.__init__(self)

         self.commentString = "#"
--- a/QScintilla/Lexers/LexerPostScript.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/QScintilla/Lexers/LexerPostScript.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing a PostScript lexer with some additional methods.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.Qsci import QsciLexerPostScript

 from .Lexer import Lexer
@@ -23,7 +25,7 @@

         @param parent parent widget of this lexer
         """
-        super().__init__(parent)
+        super(LexerPostScript, self).__init__(parent)
         Lexer.__init__(self)

         self.commentString = "%"
--- a/QScintilla/Lexers/LexerProperties.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/QScintilla/Lexers/LexerProperties.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing a Properties lexer with some additional methods.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.Qsci import QsciLexerProperties

 from .Lexer import Lexer
@@ -23,7 +25,7 @@

         @param parent parent widget of this lexer
         """
-        super().__init__(parent)
+        super(LexerProperties, self).__init__(parent)
         Lexer.__init__(self)

         self.commentString = "#"
--- a/QScintilla/Lexers/LexerPygments.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/QScintilla/Lexers/LexerPygments.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing a custom lexer using pygments.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from pygments.token import Token
 from pygments.lexers import guess_lexer_for_filename, guess_lexer, find_lexer_class
 from pygments.util import ClassNotFound
--- a/QScintilla/Lexers/LexerPython.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/QScintilla/Lexers/LexerPython.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing a Python lexer with some additional methods.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 import re

 from PyQt4.Qsci import QsciLexerPython,  QsciScintilla
@@ -26,7 +28,7 @@
         @param variant name of the language variant (string)
         @param parent parent widget of this lexer
         """
-        super().__init__(parent)
+        super(LexerPython, self).__init__(parent)
         Lexer.__init__(self)

         self.variant = variant
--- a/QScintilla/Lexers/LexerRuby.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/QScintilla/Lexers/LexerRuby.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing a Ruby lexer with some additional methods.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.Qsci import QsciLexerRuby

 from .Lexer import Lexer
@@ -23,7 +25,7 @@

         @param parent parent widget of this lexer
         """
-        super().__init__(parent)
+        super(LexerRuby, self).__init__(parent)
         Lexer.__init__(self)

         self.commentString = "#"
--- a/QScintilla/Lexers/LexerSQL.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/QScintilla/Lexers/LexerSQL.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing a SQL lexer with some additional methods.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.Qsci import QsciLexerSQL

 from .Lexer import Lexer
@@ -23,7 +25,7 @@

         @param parent parent widget of this lexer
         """
-        super().__init__(parent)
+        super(LexerSQL, self).__init__(parent)
         Lexer.__init__(self)

         self.commentString = "--"
--- a/QScintilla/Lexers/LexerTCL.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/QScintilla/Lexers/LexerTCL.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing a TCL/Tk lexer with some additional methods.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.Qsci import QsciLexerTCL

 from .Lexer import Lexer
@@ -24,7 +26,7 @@

         @param parent parent widget of this lexer
         """
-        super().__init__(parent)
+        super(LexerTCL, self).__init__(parent)
         Lexer.__init__(self)

         self.commentString = "#"
--- a/QScintilla/Lexers/LexerTeX.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/QScintilla/Lexers/LexerTeX.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing a Tex lexer with some additional methods.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.Qsci import QsciLexerTeX

 from .Lexer import Lexer
@@ -23,7 +25,7 @@

         @param parent parent widget of this lexer
         """
-        super().__init__(parent)
+        super(LexerTeX, self).__init__(parent)
         Lexer.__init__(self)

         self.commentString = "%"
--- a/QScintilla/Lexers/LexerVHDL.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/QScintilla/Lexers/LexerVHDL.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing a VHDL lexer with some additional methods.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.Qsci import QsciLexerVHDL

 from .Lexer import Lexer
@@ -23,7 +25,7 @@

         @param parent parent widget of this lexer
         """
-        super().__init__(parent)
+        super(LexerVHDL, self).__init__(parent)
         Lexer.__init__(self)

         self.commentString = "--"
--- a/QScintilla/Lexers/LexerXML.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/QScintilla/Lexers/LexerXML.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing a XML lexer with some additional methods.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.Qsci import QsciLexerXML

 from .Lexer import Lexer
@@ -23,7 +25,7 @@

         @param parent parent widget of this lexer
         """
-        super().__init__(parent)
+        super(LexerXML, self).__init__(parent)
         Lexer.__init__(self)

         self.streamCommentString = {
--- a/QScintilla/Lexers/LexerYAML.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/QScintilla/Lexers/LexerYAML.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing a YAML lexer with some additional methods.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.Qsci import QsciLexerYAML

 from .Lexer import Lexer
@@ -23,7 +25,7 @@

         @param parent parent widget of this lexer
         """
-        super().__init__(parent)
+        super(LexerYAML, self).__init__(parent)
         Lexer.__init__(self)

         self.commentString = "---"
--- a/QScintilla/Lexers/__init__.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/QScintilla/Lexers/__init__.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Package implementing lexers for the various supported programming languages.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.QtGui import QApplication

 from QScintilla.QsciScintillaCompat import QSCINTILLA_VERSION
--- a/QScintilla/MiniEditor.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/QScintilla/MiniEditor.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing a minimalistic editor for simple editing tasks.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 import os
 import re

@@ -44,7 +46,7 @@
         @param name name of this instance (string)
         @param flags window flags
         """
-        super().__init__(parent)
+        super(MiniScintilla, self).__init__(parent)

         self.mw = parent

@@ -74,7 +76,7 @@

         self.setCursorFlashTime(QApplication.cursorFlashTime())

-        super().focusInEvent(event)
+        super(MiniScintilla, self).focusInEvent(event)

     def focusOutEvent(self, event):
         """
@@ -85,7 +87,7 @@
         self.mw.editorActGrp.setEnabled(False)
         self.setCaretWidth(0)

-        super().focusOutEvent(event)
+        super(MiniScintilla, self).focusOutEvent(event)


 class MiniEditor(E5MainWindow):
@@ -105,7 +107,7 @@
         @param parent reference to the parent widget (QWidget)
         @param name object name of the window (string)
         """
-        super().__init__(parent)
+        super(MiniEditor, self).__init__(parent)
         if name is not None:
             self.setObjectName(name)
         self.setAttribute(Qt.WA_DeleteOnClose)
--- a/QScintilla/Printer.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/QScintilla/Printer.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing the printer functionality.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.QtCore import QTime, QDate, Qt
 from PyQt4.QtGui import QColor, QPrinter, QApplication
 from PyQt4.Qsci import QsciPrinter
@@ -24,7 +26,7 @@

         @param mode mode of the printer (QPrinter.PrinterMode)
         """
-        super().__init__(mode)
+        super(Printer, self).__init__(mode)

         self.setMagnification(Preferences.getPrinter("Magnification"))
         if Preferences.getPrinter("ColorMode"):
--- a/QScintilla/QsciScintillaCompat.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/QScintilla/QsciScintillaCompat.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing a compatability interface class to QsciScintilla.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.QtCore import pyqtSignal, Qt
 from PyQt4.QtGui import QPalette, QColor, QApplication
 from PyQt4.Qsci import QsciScintilla, \
@@ -58,7 +60,7 @@
         @param name name of this instance (string)
         @param flags window flags
         """
-        super().__init__(parent)
+        super(QsciScintillaCompat, self).__init__(parent)

         self.zoom = 0

@@ -74,7 +76,7 @@

         @param lex the lexer to be set or None to reset it.
         """
-        super().setLexer(lex)
+        super(QsciScintillaCompat, self).setLexer(lex)
         if lex is None:
             self.clearStyles()

@@ -316,7 +318,7 @@

         @param zoom zoom factor increment (integer)
         """
-        super().zoomIn(zoom)
+        super(QsciScintillaCompat, self).zoomIn(zoom)

     def zoomOut(self, zoom=1):
         """
@@ -324,7 +326,7 @@

         @param zoom zoom factor decrement (integer)
         """
-        super().zoomOut(zoom)
+        super(QsciScintillaCompat, self).zoomOut(zoom)

     def zoomTo(self, zoom):
         """
@@ -333,7 +335,7 @@
         @param zoom zoom factor (integer)
         """
         self.zoom = zoom
-        super().zoomTo(zoom)
+        super(QsciScintillaCompat, self).zoomTo(zoom)
         self.zoomValueChanged.emit(self.zoom)

     def getZoom(self):
@@ -888,9 +890,9 @@
         @param margin margin number (integer)
         """
         if style < self.ArrowFoldStyle:
-            super().setFolding(style, margin)
+            super(QsciScintillaCompat, self).setFolding(style, margin)
         else:
-            super().setFolding(
+            super(QsciScintillaCompat, self).setFolding(
                 QsciScintilla.PlainFoldStyle, margin)

             if style == self.ArrowFoldStyle:
@@ -994,7 +996,7 @@
         if self.isListActive():
             self.cancelList()

-        super().focusOutEvent(event)
+        super(QsciScintillaCompat, self).focusOutEvent(event)

     def event(self, evt):
         """
--- a/QScintilla/SearchReplaceWidget.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/QScintilla/SearchReplaceWidget.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing the search and replace widget.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.QtCore import pyqtSignal, Qt, pyqtSlot
 from PyQt4.QtGui import QWidget, QHBoxLayout, QToolButton, QScrollArea, QSizePolicy, \
     QFrame
@@ -39,7 +41,7 @@
         @param sliding flag indicating the widget is embedded in the
             sliding widget (boolean)
         """
-        super().__init__(parent)
+        super(SearchReplaceWidget, self).__init__(parent)

         self.viewmanager = vm
         self.replace = replace
@@ -654,7 +656,7 @@
             self.__showReplace(text)
         else:
             self.__showFind(text)
-        super().show()
+        super(SearchReplaceWidget, self).show()
         self.activateWindow()

     @pyqtSlot()
@@ -700,7 +702,7 @@
         @param vm reference to the viewmanager object
         @param parent parent widget of this widget (QWidget)
         """
-        super().__init__(parent)
+        super(SearchReplaceSlidingWidget, self).__init__(parent)

         self.__searchReplaceWidget = SearchReplaceWidget(replace, vm, self, True)
         srHeight = self.__searchReplaceWidget.height()
@@ -777,7 +779,7 @@
         @param text text to be shown in the findtext edit (string)
         """
         self.__searchReplaceWidget.show(text)
-        super().show()
+        super(SearchReplaceSlidingWidget, self).show()
         self.__enableScrollerButtons()

     def __slideLeft(self):
@@ -826,4 +828,4 @@
         """
         self.__enableScrollerButtons()

-        super().resizeEvent(evt)
+        super(SearchReplaceSlidingWidget, self).resizeEvent(evt)
--- a/QScintilla/Shell.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/QScintilla/Shell.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing a graphical Python shell.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 import sys
 import re

@@ -40,7 +42,7 @@
         @param horizontal flag indicating a horizontal layout (boolean)
         @param parent parent widget (QWidget)
         """
-        super().__init__(parent)
+        super(ShellAssembly, self).__init__(parent)

         self.__shell = Shell(dbs, vm, self)

@@ -96,7 +98,7 @@
         @param vm reference to the viewmanager object
         @param parent parent widget (QWidget)
         """
-        super().__init__(parent)
+        super(Shell, self).__init__(parent)
         self.setUtf8(True)

         self.vm = vm
@@ -602,7 +604,7 @@
         @param platform platform of the remote interpreter (string)
         @param dbgclient debug client variant used (string)
         """
-        super().clear()
+        super(Shell, self).clear()
         if self.passive and not self.dbs.isConnected():
             self.__write(self.trUtf8('Passive Debug Mode'))
             self.__write(self.trUtf8('\nNot connected'))
@@ -790,7 +792,7 @@
         if event.button() == Qt.MidButton:
             self.__middleMouseButton()
         else:
-            super().mousePressEvent(event)
+            super(Shell, self).mousePressEvent(event)

     def wheelEvent(self, evt):
         """
@@ -806,7 +808,7 @@
             evt.accept()
             return

-        super().wheelEvent(evt)
+        super(Shell, self).wheelEvent(evt)

     def event(self, evt):
         """
@@ -819,7 +821,7 @@
             self.gestureEvent(evt)
             return True

-        return super().event(evt)
+        return super(Shell, self).event(evt)

     def gestureEvent(self, evt):
         """
@@ -879,7 +881,7 @@
                 self.prline, self.prcol = self.getCursorPosition()
             if self.echoInput:
                 ac = self.isListActive()
-                super().keyPressEvent(ev)
+                super(Shell, self).keyPressEvent(ev)
                 self.incrementalSearchActive = True
                 if ac and \
                    self.racEnabled:
@@ -1453,7 +1455,7 @@
         if self.inDragDrop:
             event.acceptProposedAction()
         else:
-            super().dragEnterEvent(event)
+            super(Shell, self).dragEnterEvent(event)

     def dragMoveEvent(self, event):
         """
@@ -1464,7 +1466,7 @@
         if self.inDragDrop:
             event.accept()
         else:
-            super().dragMoveEvent(event)
+            super(Shell, self).dragMoveEvent(event)

     def dragLeaveEvent(self, event):
         """
@@ -1476,7 +1478,7 @@
             self.inDragDrop = False
             event.accept()
         else:
-            super().dragLeaveEvent(event)
+            super(Shell, self).dragLeaveEvent(event)

     def dropEvent(self, event):
         """
@@ -1503,7 +1505,7 @@
                 self.executeLines(s)
             del s
         else:
-            super().dropEvent(event)
+            super(Shell, self).dropEvent(event)

         self.inDragDrop = False

@@ -1538,7 +1540,7 @@
         self.setCaretWidth(self.caretWidth)
         self.setCursorFlashTime(QApplication.cursorFlashTime())

-        super().focusInEvent(event)
+        super(Shell, self).focusInEvent(event)

     def focusOutEvent(self, event):
         """
@@ -1554,7 +1556,7 @@
         self.__searchNextShortcut.setEnabled(False)
         self.__searchPrevShortcut.setEnabled(False)
         self.setCaretWidth(0)
-        super().focusOutEvent(event)
+        super(Shell, self).focusOutEvent(event)

     def insert(self, txt):
         """
--- a/QScintilla/ShellHistoryDialog.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/QScintilla/ShellHistoryDialog.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing the shell history dialog.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 import os

 from PyQt4.QtCore import pyqtSlot
@@ -27,7 +29,7 @@
         @param vm reference to the viewmanager object
         @param shell reference to the shell object
         """
-        super().__init__(shell)
+        super(ShellHistoryDialog, self).__init__(shell)
         self.setupUi(self)

         self.historyList.addItems(history)
--- a/QScintilla/SpellChecker.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/QScintilla/SpellChecker.py	Mon Mar 25 03:11:06 2013 +0100
@@ -9,6 +9,8 @@
 The spell checker is based on pyenchant.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 import os

 from PyQt4.QtCore import QTimer, QObject
@@ -40,7 +42,7 @@
             The string should be in language locale format (e.g. en_US, de).
         @keyparam checkRegion reference to a function to check for a valid region
         """
-        super().__init__(editor)
+        super(SpellChecker, self).__init__(editor)

         self.editor = editor
         self.indicator = indicator
--- a/QScintilla/SpellCheckingDialog.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/QScintilla/SpellCheckingDialog.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing the spell checking dialog.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.QtCore import pyqtSlot
 from PyQt4.QtGui import QDialog

@@ -23,7 +25,7 @@
         """
         Constructor
         """
-        super().__init__(parent)
+        super(SpellCheckingDialog, self).__init__(parent)
         self.setupUi(self)

         self.__spell = spellChecker
--- a/QScintilla/SpellingDictionaryEditDialog.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/QScintilla/SpellingDictionaryEditDialog.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing a dialog to edit the various spell checking dictionaries.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 import os

 from PyQt4.QtCore import pyqtSlot, Qt
@@ -27,7 +29,7 @@
         @param info info string to show at the header (string)
         @param parent reference to the parent widget (QWidget)
         """
-        super().__init__(parent)
+        super(SpellingDictionaryEditDialog, self).__init__(parent)
         self.setupUi(self)

         self.infoLabel.setText(info)
--- a/QScintilla/TypingCompleters/CompleterBase.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/QScintilla/TypingCompleters/CompleterBase.py	Mon Mar 25 03:11:06 2013 +0100
@@ -11,6 +11,8 @@
 user types '(').
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.QtCore import QObject


@@ -29,7 +31,7 @@
         if parent is None:
             parent = editor

-        super().__init__(parent)
+        super(CompleterBase, self).__init__(parent)

         self.editor = editor
         self.enabled = False
--- a/QScintilla/TypingCompleters/CompleterPython.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/QScintilla/TypingCompleters/CompleterPython.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing a typing completer for Python.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 import re

 from PyQt4.QtCore import QRegExp
--- a/QScintilla/TypingCompleters/CompleterRuby.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/QScintilla/TypingCompleters/CompleterRuby.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing a typing completer for Ruby.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 import re

 from PyQt4.QtCore import QRegExp
--- a/QScintilla/TypingCompleters/__init__.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/QScintilla/TypingCompleters/__init__.py	Mon Mar 25 03:11:06 2013 +0100
@@ -8,6 +8,8 @@
 """


+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 def getCompleter(language, editor, parent=None):
     """
     Module function to instantiate a lexer object for a given language.
--- a/QScintilla/ZoomDialog.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/QScintilla/ZoomDialog.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing a dialog to select the zoom scale.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.QtGui import QDialog

 from .Ui_ZoomDialog import Ui_ZoomDialog
@@ -24,7 +26,7 @@
         @param parent parent widget of this dialog (QWidget)
         @param name name of this dialog (string)
         """
-        super().__init__(parent)
+        super(ZoomDialog, self).__init__(parent)
         if name:
             self.setObjectName(name)
         self.setupUi(self)
--- a/Snapshot/SnapWidget.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Snapshot/SnapWidget.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing the snapshot widget.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 #
 # SnapWidget and it's associated modules are PyQt4 ports of Ksnapshot.
 #
@@ -43,7 +45,7 @@

         @param parent reference to the parent widget (QWidget)
         """
-        super().__init__(parent)
+        super(SnapWidget, self).__init__(parent)
         self.setupUi(self)

         self.saveButton.setIcon(UI.PixmapCache.getIcon("fileSaveAs.png"))
--- a/Snapshot/SnapshotFreehandGrabber.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Snapshot/SnapshotFreehandGrabber.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing a grabber widget for a freehand snapshot region.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.QtCore import pyqtSignal, Qt, QRect, QPoint, QTimer, qVersion
 from PyQt4.QtGui import QWidget, QPixmap, QColor, QRegion, QApplication, QPainter, \
     QPalette, QToolTip, QPolygon, QPen, QBrush, QPaintEngine
@@ -48,7 +50,7 @@
         """
         Constructor
         """
-        super().__init__(None,
+        super(SnapshotFreehandGrabber, self).__init__(None,
             Qt.X11BypassWindowManagerHint | Qt.WindowStaysOnTopHint |
             Qt.FramelessWindowHint | Qt.Tool)
--- a/Snapshot/SnapshotPreview.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Snapshot/SnapshotPreview.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing the snapshot preview label.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.QtCore import pyqtSignal, QPoint, Qt
 from PyQt4.QtGui import QLabel, QApplication

@@ -25,7 +27,7 @@

         @param parent reference to the parent widget (QWidget)
         """
-        super().__init__(parent)
+        super(SnapshotPreview, self).__init__(parent)

         self.setAlignment(Qt.AlignHCenter | Qt.AlignCenter)
         self.setCursor(Qt.OpenHandCursor)
--- a/Snapshot/SnapshotRegionGrabber.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Snapshot/SnapshotRegionGrabber.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing a grabber widget for a rectangular snapshot region.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.QtCore import pyqtSignal, Qt, QRect, QPoint, QTimer, qVersion
 from PyQt4.QtGui import QWidget, QPixmap, QColor, QRegion, QApplication, QPainter, \
     QPalette, QToolTip, QPaintEngine, QPen, QBrush
@@ -57,7 +59,7 @@
         @param mode region grabber mode (SnapshotRegionGrabber.Rectangle or
             SnapshotRegionGrabber.Ellipse)
         """
-        super().__init__(None,
+        super(SnapshotRegionGrabber, self).__init__(None,
             Qt.X11BypassWindowManagerHint | Qt.WindowStaysOnTopHint |
             Qt.FramelessWindowHint | Qt.Tool)
--- a/Snapshot/SnapshotTimer.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Snapshot/SnapshotTimer.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing the snapshot timer widget.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.QtCore import pyqtSignal, Qt, QTimer, QRect
 from PyQt4.QtGui import QWidget, QApplication, QPainter, QToolTip, QPalette

@@ -23,7 +25,7 @@
         """
         Constructor
         """
-        super().__init__(None)
+        super(SnapshotTimer, self).__init__(None)

         self.setWindowFlags(Qt.WindowStaysOnTopHint | Qt.FramelessWindowHint |
                             Qt.X11BypassWindowManagerHint)
--- a/SqlBrowser/SqlBrowser.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/SqlBrowser/SqlBrowser.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing the SQL Browser main window.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.QtCore import QTimer, QUrl
 from PyQt4.QtGui import QKeySequence, qApp
 from PyQt4.QtSql import QSqlError, QSqlDatabase
@@ -32,7 +34,7 @@
         @param connections list of database connections to add (list of strings)
         @param reference to the parent widget (QWidget)
         """
-        super().__init__(parent)
+        super(SqlBrowser, self).__init__(parent)
         self.setObjectName("SqlBrowser")

         self.setWindowTitle(self.trUtf8("SQL Browser"))
--- a/SqlBrowser/SqlBrowserWidget.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/SqlBrowser/SqlBrowserWidget.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing the SQL Browser widget.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.QtCore import pyqtSignal, QVariant, Qt, pyqtSlot
 from PyQt4.QtGui import QWidget, QStandardItemModel, QDialog, QAbstractItemView
 from PyQt4.QtSql import QSqlDatabase, QSqlError, QSqlTableModel, QSqlQueryModel, QSqlQuery
@@ -32,7 +34,7 @@

         @param parent reference to the parent widget (QWidget)
         """
-        super().__init__(parent)
+        super(SqlBrowserWidget, self).__init__(parent)
         self.setupUi(self)

         self.table.addAction(self.insertRowAction)
--- a/SqlBrowser/SqlConnectionDialog.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/SqlBrowser/SqlConnectionDialog.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing a dialog to enter the connection parameters.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.QtCore import pyqtSlot
 from PyQt4.QtGui import QDialog, QDialogButtonBox
 from PyQt4.QtSql import QSqlDatabase
@@ -27,7 +29,7 @@
         """
         Constructor
         """
-        super().__init__(parent)
+        super(SqlConnectionDialog, self).__init__(parent)
         self.setupUi(self)

         self.databaseFileCompleter = E5FileCompleter()
--- a/SqlBrowser/SqlConnectionWidget.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/SqlBrowser/SqlConnectionWidget.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing a widget showing the SQL connections.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.QtCore import pyqtSignal, Qt, qVersion
 from PyQt4.QtGui import QWidget, QHeaderView, QTreeWidget, QVBoxLayout, \
     QTreeWidgetItem, QAction
@@ -31,7 +33,7 @@

         @param parent reference to the parent widget (QWidget)
         """
-        super().__init__(parent)
+        super(SqlConnectionWidget, self).__init__(parent)

         layout = QVBoxLayout(self)
         layout.setMargin(0)
--- a/Tasks/Task.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Tasks/Task.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing a class to store task data.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 import os
 import time

@@ -47,7 +49,7 @@
         @param project reference to the project object (Project)
         @param description explanatory text of the task (string)
         """
-        super().__init__()
+        super(Task, self).__init__()

         self.summary = summary
         self.description = description
--- a/Tasks/TaskFilter.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Tasks/TaskFilter.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing a class to store task data.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.QtCore import QRegExp

 from .Task import Task
--- a/Tasks/TaskFilterConfigDialog.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Tasks/TaskFilterConfigDialog.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing the task filter configuration dialog.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.QtGui import QDialog

 from .Task import Task
@@ -25,7 +27,7 @@
         @param taskFilter the task filter object to be configured
         @param parent the parent widget (QWidget)
         """
-        super().__init__(parent)
+        super(TaskFilterConfigDialog, self).__init__(parent)
         self.setupUi(self)

         self.typeCombo.addItem("", Task.TypeNone)
--- a/Tasks/TaskPropertiesDialog.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Tasks/TaskPropertiesDialog.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing the task properties dialog.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 import time

 from PyQt4.QtGui import QDialog
@@ -28,7 +30,7 @@
         @param parent the parent widget (QWidget)
         @param projectOpen flag indicating status of the project (boolean)
         """
-        super().__init__(parent)
+        super(TaskPropertiesDialog, self).__init__(parent)
         self.setupUi(self)

         self.filenameCompleter = E5FileCompleter(self.filenameEdit)
--- a/Tasks/TaskViewer.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Tasks/TaskViewer.py	Mon Mar 25 03:11:06 2013 +0100
@@ -11,6 +11,8 @@
 introductory text. This text is configurable.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 import os
 import fnmatch

@@ -46,7 +48,7 @@
         @param parent the parent (QWidget)
         @param project reference to the project object
         """
-        super().__init__(parent)
+        super(TaskViewer, self).__init__(parent)

         self.setRootIsDecorated(False)
         self.setItemsExpandable(False)
--- a/Templates/TemplateMultipleVariablesDialog.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Templates/TemplateMultipleVariablesDialog.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing a dialog for entering multiple template variables.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.QtCore import QSize, Qt
 from PyQt4.QtGui import QSizePolicy, QSpacerItem, QWidget, QHBoxLayout, QLineEdit, \
     QPushButton, QTextEdit, QDialog, QScrollArea, QFrame, QGridLayout, QVBoxLayout, QLabel
@@ -23,7 +25,7 @@
         @param variables list of template variable names (list of strings)
         @param parent parent widget of this dialog (QWidget)
         """
-        super().__init__(parent)
+        super(TemplateMultipleVariablesDialog, self).__init__(parent)

         self.TemplateMultipleVariablesDialogLayout = QVBoxLayout(self)
         self.TemplateMultipleVariablesDialogLayout.setMargin(6)
--- a/Templates/TemplatePropertiesDialog.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Templates/TemplatePropertiesDialog.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing the templates properties dialog.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.QtCore import QRegExp, Qt, pyqtSlot
 from PyQt4.QtGui import QDialog, QRegExpValidator

@@ -28,7 +30,7 @@
         @param itm item (TemplateEntry or TemplateGroup) to
             read the data from
         """
-        super().__init__(parent)
+        super(TemplatePropertiesDialog, self).__init__(parent)
         self.setupUi(self)

         if not groupMode:
--- a/Templates/TemplateSingleVariableDialog.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Templates/TemplateSingleVariableDialog.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing a dialog for entering a single template variable.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.QtGui import QDialog

 from .Ui_TemplateSingleVariableDialog import Ui_TemplateSingleVariableDialog
@@ -23,7 +25,7 @@
         @param variable template variable name (string)
         @param parent parent widget of this dialog (QWidget)
         """
-        super().__init__(parent)
+        super(TemplateSingleVariableDialog, self).__init__(parent)
         self.setupUi(self)

         self.variableLabel.setText(variable)
--- a/Templates/TemplateViewer.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Templates/TemplateViewer.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing a template viewer and associated classes.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 import datetime
 import os
 import re
@@ -39,7 +41,7 @@
         self.language = language
         self.entries = {}

-        super().__init__(parent, [name])
+        super(TemplateGroup, self).__init__(parent, [name])

         if Preferences.getTemplates("ShowTooltip"):
             self.setToolTip(0, language)
@@ -189,7 +191,7 @@
         self.template = templateText
         self.__extractVariables()

-        super().__init__(parent, [self.__displayText()])
+        super(TemplateEntry, self).__init__(parent, [self.__displayText()])
         if Preferences.getTemplates("ShowTooltip"):
             self.setToolTip(0, self.template)

@@ -370,7 +372,7 @@
         @param parent the parent (QWidget)
         @param viewmanager reference to the viewmanager object
         """
-        super().__init__(parent)
+        super(TemplateViewer, self).__init__(parent)

         self.viewmanager = viewmanager
         self.groups = {}
--- a/ThirdParty/Pygments/pygments/__init__.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/ThirdParty/Pygments/pygments/__init__.py	Mon Mar 25 03:11:06 2013 +0100
@@ -26,6 +26,8 @@
     :license: BSD, see LICENSE for details.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 __version__ = '1.6'
 __docformat__ = 'restructuredtext'
--- a/ThirdParty/Pygments/pygments/cmdline.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/ThirdParty/Pygments/pygments/cmdline.py	Mon Mar 25 03:11:06 2013 +0100
@@ -8,6 +8,8 @@
     :copyright: Copyright 2006-2013 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 import sys
 import getopt
 from textwrap import dedent
--- a/ThirdParty/Pygments/pygments/console.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/ThirdParty/Pygments/pygments/console.py	Mon Mar 25 03:11:06 2013 +0100
@@ -9,6 +9,8 @@
     :license: BSD, see LICENSE for details.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 esc = "\x1b["

 codes = {}
--- a/ThirdParty/Pygments/pygments/filter.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/ThirdParty/Pygments/pygments/filter.py	Mon Mar 25 03:11:06 2013 +0100
@@ -10,6 +10,8 @@
 """


+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 def apply_filters(stream, filters, lexer=None):
     """
     Use this method to apply an iterable of filters to
--- a/ThirdParty/Pygments/pygments/filters/__init__.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/ThirdParty/Pygments/pygments/filters/__init__.py	Mon Mar 25 03:11:06 2013 +0100
@@ -10,6 +10,8 @@
     :license: BSD, see LICENSE for details.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 import re

 from pygments.token import String, Comment, Keyword, Name, Error, Whitespace, \
--- a/ThirdParty/Pygments/pygments/formatter.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/ThirdParty/Pygments/pygments/formatter.py	Mon Mar 25 03:11:06 2013 +0100
@@ -9,6 +9,8 @@
     :license: BSD, see LICENSE for details.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 import codecs

 from pygments.util import get_bool_opt
--- a/ThirdParty/Pygments/pygments/formatters/__init__.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/ThirdParty/Pygments/pygments/formatters/__init__.py	Mon Mar 25 03:11:06 2013 +0100
@@ -8,6 +8,8 @@
     :copyright: Copyright 2006-2013 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 import os.path
 import fnmatch
--- a/ThirdParty/Pygments/pygments/formatters/_mapping.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/ThirdParty/Pygments/pygments/formatters/_mapping.py	Mon Mar 25 03:11:06 2013 +0100
@@ -13,6 +13,8 @@
     :license: BSD, see LICENSE for details.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 # start
 from pygments.formatters.bbcode import BBCodeFormatter
 from pygments.formatters.html import HtmlFormatter
--- a/ThirdParty/Pygments/pygments/formatters/bbcode.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/ThirdParty/Pygments/pygments/formatters/bbcode.py	Mon Mar 25 03:11:06 2013 +0100
@@ -10,6 +10,8 @@
 """


+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from pygments.formatter import Formatter
 from pygments.util import get_bool_opt
--- a/ThirdParty/Pygments/pygments/formatters/html.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/ThirdParty/Pygments/pygments/formatters/html.py	Mon Mar 25 03:11:06 2013 +0100
@@ -9,6 +9,8 @@
     :license: BSD, see LICENSE for details.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 import os
 import sys
 import os.path
--- a/ThirdParty/Pygments/pygments/formatters/img.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/ThirdParty/Pygments/pygments/formatters/img.py	Mon Mar 25 03:11:06 2013 +0100
@@ -9,6 +9,8 @@
     :license: BSD, see LICENSE for details.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 import sys

 from pygments.formatter import Formatter
--- a/ThirdParty/Pygments/pygments/formatters/latex.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/ThirdParty/Pygments/pygments/formatters/latex.py	Mon Mar 25 03:11:06 2013 +0100
@@ -9,6 +9,8 @@
     :license: BSD, see LICENSE for details.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from pygments.formatter import Formatter
 from pygments.token import Token, STANDARD_TYPES
 from pygments.util import get_bool_opt, get_int_opt, StringIO
--- a/ThirdParty/Pygments/pygments/formatters/other.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/ThirdParty/Pygments/pygments/formatters/other.py	Mon Mar 25 03:11:06 2013 +0100
@@ -9,6 +9,8 @@
     :license: BSD, see LICENSE for details.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from pygments.formatter import Formatter
 from pygments.util import OptionError, get_choice_opt, b
 from pygments.token import Token
--- a/ThirdParty/Pygments/pygments/formatters/rtf.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/ThirdParty/Pygments/pygments/formatters/rtf.py	Mon Mar 25 03:11:06 2013 +0100
@@ -9,6 +9,8 @@
     :license: BSD, see LICENSE for details.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from pygments.formatter import Formatter
--- a/ThirdParty/Pygments/pygments/formatters/svg.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/ThirdParty/Pygments/pygments/formatters/svg.py	Mon Mar 25 03:11:06 2013 +0100
@@ -9,6 +9,8 @@
     :license: BSD, see LICENSE for details.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from pygments.formatter import Formatter
 from pygments.util import get_bool_opt, get_int_opt
--- a/ThirdParty/Pygments/pygments/formatters/terminal.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/ThirdParty/Pygments/pygments/formatters/terminal.py	Mon Mar 25 03:11:06 2013 +0100
@@ -9,6 +9,8 @@
     :license: BSD, see LICENSE for details.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 import sys

 from pygments.formatter import Formatter
--- a/ThirdParty/Pygments/pygments/formatters/terminal256.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/ThirdParty/Pygments/pygments/formatters/terminal256.py	Mon Mar 25 03:11:06 2013 +0100
@@ -15,6 +15,8 @@
     :license: BSD, see LICENSE for details.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 # TODO:
 #  - Options to map style's bold/underline/italic/border attributes
 #    to some ANSI attrbutes (something like 'italic=underline')
--- a/ThirdParty/Pygments/pygments/lexer.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/ThirdParty/Pygments/pygments/lexer.py	Mon Mar 25 03:11:06 2013 +0100
@@ -8,6 +8,12 @@
     :copyright: Copyright 2006-2013 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
+from __future__ import unicode_literals    # __IGNORE_WARNING__
+try:
+    str = unicode
+except (NameError):
+    pass
+
 import re, itertools

 from pygments.filter import apply_filters, Filter
--- a/ThirdParty/Pygments/pygments/lexers/_asybuiltins.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/ThirdParty/Pygments/pygments/lexers/_asybuiltins.py	Mon Mar 25 03:11:06 2013 +0100
@@ -14,6 +14,8 @@
     :license: BSD, see LICENSE for details.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 ASYFUNCNAME = set([
     'AND',
     'Arc',
--- a/ThirdParty/Pygments/pygments/lexers/_clbuiltins.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/ThirdParty/Pygments/pygments/lexers/_clbuiltins.py	Mon Mar 25 03:11:06 2013 +0100
@@ -9,6 +9,8 @@
     :license: BSD, see LICENSE for details.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 BUILTIN_FUNCTIONS = [ # 638 functions
     '<', '<=', '=', '>', '>=', '-', '/', '/=', '*', '+', '1-', '1+',
     'abort', 'abs', 'acons', 'acos', 'acosh', 'add-method', 'adjoin',
--- a/ThirdParty/Pygments/pygments/lexers/_lassobuiltins.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/ThirdParty/Pygments/pygments/lexers/_lassobuiltins.py	Mon Mar 25 03:11:06 2013 +0100
@@ -9,6 +9,8 @@
     :license: BSD, see LICENSE for details.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 BUILTINS = {
     'Types': [
         'null',
--- a/ThirdParty/Pygments/pygments/lexers/_luabuiltins.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/ThirdParty/Pygments/pygments/lexers/_luabuiltins.py	Mon Mar 25 03:11:06 2013 +0100
@@ -13,6 +13,8 @@
     :license: BSD, see LICENSE for details.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 MODULES = {'basic': ['_G',
            '_VERSION',
            'assert',
--- a/ThirdParty/Pygments/pygments/lexers/_mapping.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/ThirdParty/Pygments/pygments/lexers/_mapping.py	Mon Mar 25 03:11:06 2013 +0100
@@ -13,6 +13,8 @@
     :license: BSD, see LICENSE for details.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 LEXERS = {
     'ABAPLexer': ('pygments.lexers.other', 'ABAP', ('abap',), ('*.abap',), ('text/x-abap',)),
     'ActionScript3Lexer': ('pygments.lexers.web', 'ActionScript 3', ('as3', 'actionscript3'), ('*.as',), ('application/x-actionscript', 'text/x-actionscript', 'text/actionscript')),
--- a/ThirdParty/Pygments/pygments/lexers/_openedgebuiltins.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/ThirdParty/Pygments/pygments/lexers/_openedgebuiltins.py	Mon Mar 25 03:11:06 2013 +0100
@@ -9,6 +9,8 @@
     :license: BSD, see LICENSE for details.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 OPENEDGEKEYWORDS = [
     'ABSOLUTE', 'ABS', 'ABSO', 'ABSOL', 'ABSOLU', 'ABSOLUT', 'ACCELERATOR',
     'ACCUM', 'ACCUMULATE', 'ACCUM', 'ACCUMU', 'ACCUMUL', 'ACCUMULA',
--- a/ThirdParty/Pygments/pygments/lexers/_phpbuiltins.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/ThirdParty/Pygments/pygments/lexers/_phpbuiltins.py	Mon Mar 25 03:11:06 2013 +0100
@@ -17,6 +17,8 @@
 """


+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 MODULES = {'.NET': ['dotnet_load'],
  'APC': ['apc_add',
          'apc_bin_dump',
--- a/ThirdParty/Pygments/pygments/lexers/_postgres_builtins.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/ThirdParty/Pygments/pygments/lexers/_postgres_builtins.py	Mon Mar 25 03:11:06 2013 +0100
@@ -9,6 +9,8 @@
     :license: BSD, see LICENSE for details.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 import re
 import urllib.request, urllib.parse, urllib.error
--- a/ThirdParty/Pygments/pygments/lexers/_robotframeworklexer.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/ThirdParty/Pygments/pygments/lexers/_robotframeworklexer.py	Mon Mar 25 03:11:06 2013 +0100
@@ -9,6 +9,8 @@
     :license: BSD, see LICENSE for details.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 #  Copyright 2012 Nokia Siemens Networks Oyj
 #
 #  Licensed under the Apache License, Version 2.0 (the "License");
--- a/ThirdParty/Pygments/pygments/lexers/_scilab_builtins.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/ThirdParty/Pygments/pygments/lexers/_scilab_builtins.py	Mon Mar 25 03:11:06 2013 +0100
@@ -9,6 +9,8 @@
     :license: BSD, see LICENSE for details.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 # These lists are generated automatically.
 # Run the following in a Scilab script:
 #
--- a/ThirdParty/Pygments/pygments/lexers/_sourcemodbuiltins.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/ThirdParty/Pygments/pygments/lexers/_sourcemodbuiltins.py	Mon Mar 25 03:11:06 2013 +0100
@@ -12,6 +12,8 @@
     :license: BSD, see LICENSE for details.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 FUNCTIONS = ['TopMenuHandler',
  'CreateTopMenu',
  'LoadTopMenuConfig',
--- a/ThirdParty/Pygments/pygments/lexers/_stan_builtins.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/ThirdParty/Pygments/pygments/lexers/_stan_builtins.py	Mon Mar 25 03:11:06 2013 +0100
@@ -10,6 +10,8 @@
     :license: BSD, see LICENSE for details.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 CONSTANTS=[   'e',
     'epsilon',
     'log10',
--- a/ThirdParty/Pygments/pygments/lexers/_vimbuiltins.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/ThirdParty/Pygments/pygments/lexers/_vimbuiltins.py	Mon Mar 25 03:11:06 2013 +0100
@@ -1,6 +1,8 @@
 # Split up in multiple functions so it's importable by jython, which has a
 # per-method size limit.

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 def _getauto():
     return [('BufAdd','BufAdd'),('BufCreate','BufCreate'),('BufDelete','BufDelete'),('BufEnter','BufEnter'),('BufFilePost','BufFilePost'),('BufFilePre','BufFilePre'),('BufHidden','BufHidden'),('BufLeave','BufLeave'),('BufNew','BufNew'),('BufNewFile','BufNewFile'),('BufRead','BufRead'),('BufReadCmd','BufReadCmd'),('BufReadPost','BufReadPost'),('BufReadPre','BufReadPre'),('BufUnload','BufUnload'),('BufWinEnter','BufWinEnter'),('BufWinLeave','BufWinLeave'),('BufWipeout','BufWipeout'),('BufWrite','BufWrite'),('BufWriteCmd','BufWriteCmd'),('BufWritePost','BufWritePost'),('BufWritePre','BufWritePre'),('Cmd','Cmd'),('CmdwinEnter','CmdwinEnter'),('CmdwinLeave','CmdwinLeave'),('ColorScheme','ColorScheme'),('CursorHold','CursorHold'),('CursorHoldI','CursorHoldI'),('CursorMoved','CursorMoved'),('CursorMovedI','CursorMovedI'),('EncodingChanged','EncodingChanged'),('FileAppendCmd','FileAppendCmd'),('FileAppendPost','FileAppendPost'),('FileAppendPre','FileAppendPre'),('FileChangedRO','FileChangedRO'),('FileChangedShell','FileChangedShell'),('FileChangedShellPost','FileChangedShellPost'),('FileEncoding','FileEncoding'),('FileReadCmd','FileReadCmd'),('FileReadPost','FileReadPost'),('FileReadPre','FileReadPre'),('FileType','FileType'),('FileWriteCmd','FileWriteCmd'),('FileWritePost','FileWritePost'),('FileWritePre','FileWritePre'),('FilterReadPost','FilterReadPost'),('FilterReadPre','FilterReadPre'),('FilterWritePost','FilterWritePost'),('FilterWritePre','FilterWritePre'),('FocusGained','FocusGained'),('FocusLost','FocusLost'),('FuncUndefined','FuncUndefined'),('GUIEnter','GUIEnter'),('GUIFailed','GUIFailed'),('InsertChange','InsertChange'),('InsertCharPre','InsertCharPre'),('InsertEnter','InsertEnter'),('InsertLeave','InsertLeave'),('MenuPopup','MenuPopup'),('QuickFixCmdPost','QuickFixCmdPost'),('QuickFixCmdPre','QuickFixCmdPre'),('RemoteReply','RemoteReply'),('SessionLoadPost','SessionLoadPost'),('ShellCmdPost','ShellCmdPost'),('ShellFilterPost','ShellFilterPost'),('SourceCmd','SourceCmd'),('SourcePre','SourcePre'),('SpellFileMissing','SpellFileMissing'),('StdinReadPost','StdinReadPost'),('StdinReadPre','StdinReadPre'),('SwapExists','SwapExists'),('Syntax','Syntax'),('TabEnter','TabEnter'),('TabLeave','TabLeave'),('TermChanged','TermChanged'),('TermResponse','TermResponse'),('User','User'),('UserGettingBored','UserGettingBored'),('VimEnter','VimEnter'),('VimLeave','VimLeave'),('VimLeavePre','VimLeavePre'),('VimResized','VimResized'),('WinEnter','WinEnter'),('WinLeave','WinLeave'),('event','event')]
 def _getcommand():
--- a/ThirdParty/Pygments/pygments/lexers/agile.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/ThirdParty/Pygments/pygments/lexers/agile.py	Mon Mar 25 03:11:06 2013 +0100
@@ -9,6 +9,8 @@
     :license: BSD, see LICENSE for details.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 import re

 from pygments.lexer import Lexer, RegexLexer, ExtendedRegexLexer, \
--- a/ThirdParty/Pygments/pygments/lexers/asm.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/ThirdParty/Pygments/pygments/lexers/asm.py	Mon Mar 25 03:11:06 2013 +0100
@@ -9,6 +9,8 @@
     :license: BSD, see LICENSE for details.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 import re

 from pygments.lexer import RegexLexer, include, bygroups, using, DelegatingLexer
--- a/ThirdParty/Pygments/pygments/lexers/compiled.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/ThirdParty/Pygments/pygments/lexers/compiled.py	Mon Mar 25 03:11:06 2013 +0100
@@ -9,6 +9,8 @@
     :license: BSD, see LICENSE for details.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 import re
 from string import Template
--- a/ThirdParty/Pygments/pygments/lexers/dalvik.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/ThirdParty/Pygments/pygments/lexers/dalvik.py	Mon Mar 25 03:11:06 2013 +0100
@@ -9,6 +9,8 @@
     :license: BSD, see LICENSE for details.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from pygments.lexer import RegexLexer, include, bygroups
 from pygments.token import Keyword, Text, Comment, Name, String, Number, \
                            Punctuation
--- a/ThirdParty/Pygments/pygments/lexers/dotnet.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/ThirdParty/Pygments/pygments/lexers/dotnet.py	Mon Mar 25 03:11:06 2013 +0100
@@ -8,6 +8,8 @@
     :copyright: Copyright 2006-2013 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 import re

 from pygments.lexer import RegexLexer, DelegatingLexer, bygroups, include, \
--- a/ThirdParty/Pygments/pygments/lexers/foxpro.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/ThirdParty/Pygments/pygments/lexers/foxpro.py	Mon Mar 25 03:11:06 2013 +0100
@@ -9,6 +9,8 @@
     :license: BSD, see LICENSE for details.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 import re

 from pygments.lexer import RegexLexer
--- a/ThirdParty/Pygments/pygments/lexers/functional.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/ThirdParty/Pygments/pygments/lexers/functional.py	Mon Mar 25 03:11:06 2013 +0100
@@ -9,6 +9,8 @@
     :license: BSD, see LICENSE for details.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 import re

 from pygments.lexer import Lexer, RegexLexer, bygroups, include, do_insertions
--- a/ThirdParty/Pygments/pygments/lexers/hdl.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/ThirdParty/Pygments/pygments/lexers/hdl.py	Mon Mar 25 03:11:06 2013 +0100
@@ -9,6 +9,8 @@
     :license: BSD, see LICENSE for details.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 import re
 from pygments.lexer import RegexLexer, bygroups, include, using, this
 from pygments.token import \
--- a/ThirdParty/Pygments/pygments/lexers/jvm.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/ThirdParty/Pygments/pygments/lexers/jvm.py	Mon Mar 25 03:11:06 2013 +0100
@@ -9,6 +9,8 @@
     :license: BSD, see LICENSE for details.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 import re

 from pygments.lexer import Lexer, RegexLexer, include, bygroups, using, \
--- a/ThirdParty/Pygments/pygments/lexers/math.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/ThirdParty/Pygments/pygments/lexers/math.py	Mon Mar 25 03:11:06 2013 +0100
@@ -9,6 +9,8 @@
     :license: BSD, see LICENSE for details.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 import re

 from pygments.util import shebang_matches
--- a/ThirdParty/Pygments/pygments/lexers/other.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/ThirdParty/Pygments/pygments/lexers/other.py	Mon Mar 25 03:11:06 2013 +0100
@@ -9,6 +9,8 @@
     :license: BSD, see LICENSE for details.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 import re

 from pygments.lexer import RegexLexer, include, bygroups, using, \
--- a/ThirdParty/Pygments/pygments/lexers/parsers.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/ThirdParty/Pygments/pygments/lexers/parsers.py	Mon Mar 25 03:11:06 2013 +0100
@@ -9,6 +9,8 @@
     :license: BSD, see LICENSE for details.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 import re

 from pygments.lexer import RegexLexer, DelegatingLexer, \
--- a/ThirdParty/Pygments/pygments/lexers/shell.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/ThirdParty/Pygments/pygments/lexers/shell.py	Mon Mar 25 03:11:06 2013 +0100
@@ -9,6 +9,8 @@
     :license: BSD, see LICENSE for details.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 import re

 from pygments.lexer import Lexer, RegexLexer, do_insertions, bygroups, include
--- a/ThirdParty/Pygments/pygments/lexers/special.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/ThirdParty/Pygments/pygments/lexers/special.py	Mon Mar 25 03:11:06 2013 +0100
@@ -9,6 +9,8 @@
     :license: BSD, see LICENSE for details.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 import re
 import io
--- a/ThirdParty/Pygments/pygments/lexers/sql.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/ThirdParty/Pygments/pygments/lexers/sql.py	Mon Mar 25 03:11:06 2013 +0100
@@ -38,6 +38,8 @@
     :license: BSD, see LICENSE for details.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 import re

 from pygments.lexer import Lexer, RegexLexer, do_insertions, bygroups
--- a/ThirdParty/Pygments/pygments/lexers/templates.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/ThirdParty/Pygments/pygments/lexers/templates.py	Mon Mar 25 03:11:06 2013 +0100
@@ -9,6 +9,8 @@
     :license: BSD, see LICENSE for details.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 import re

 from pygments.lexers.web import \
--- a/ThirdParty/Pygments/pygments/lexers/text.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/ThirdParty/Pygments/pygments/lexers/text.py	Mon Mar 25 03:11:06 2013 +0100
@@ -9,6 +9,8 @@
     :license: BSD, see LICENSE for details.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 import re
 from bisect import bisect
--- a/ThirdParty/Pygments/pygments/lexers/web.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/ThirdParty/Pygments/pygments/lexers/web.py	Mon Mar 25 03:11:06 2013 +0100
@@ -9,6 +9,8 @@
     :license: BSD, see LICENSE for details.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 import re
 import copy
--- a/ThirdParty/Pygments/pygments/plugin.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/ThirdParty/Pygments/pygments/plugin.py	Mon Mar 25 03:11:06 2013 +0100
@@ -35,6 +35,8 @@
     :copyright: Copyright 2006-2013 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 try:
     import pkg_resources
 except ImportError:
--- a/ThirdParty/Pygments/pygments/scanner.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/ThirdParty/Pygments/pygments/scanner.py	Mon Mar 25 03:11:06 2013 +0100
@@ -15,6 +15,8 @@
     :copyright: Copyright 2006-2013 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 import re
--- a/ThirdParty/Pygments/pygments/style.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/ThirdParty/Pygments/pygments/style.py	Mon Mar 25 03:11:06 2013 +0100
@@ -9,6 +9,8 @@
     :license: BSD, see LICENSE for details.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from pygments.token import Token, STANDARD_TYPES
--- a/ThirdParty/Pygments/pygments/styles/__init__.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/ThirdParty/Pygments/pygments/styles/__init__.py	Mon Mar 25 03:11:06 2013 +0100
@@ -9,6 +9,8 @@
     :license: BSD, see LICENSE for details.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from pygments.plugin import find_plugin_styles
 from pygments.util import ClassNotFound
--- a/ThirdParty/Pygments/pygments/styles/autumn.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/ThirdParty/Pygments/pygments/styles/autumn.py	Mon Mar 25 03:11:06 2013 +0100
@@ -9,6 +9,8 @@
     :license: BSD, see LICENSE for details.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from pygments.style import Style
 from pygments.token import Keyword, Name, Comment, String, Error, \
      Number, Operator, Generic, Whitespace
--- a/ThirdParty/Pygments/pygments/styles/borland.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/ThirdParty/Pygments/pygments/styles/borland.py	Mon Mar 25 03:11:06 2013 +0100
@@ -9,6 +9,8 @@
     :license: BSD, see LICENSE for details.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from pygments.style import Style
 from pygments.token import Keyword, Name, Comment, String, Error, \
      Number, Operator, Generic, Whitespace
--- a/ThirdParty/Pygments/pygments/styles/bw.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/ThirdParty/Pygments/pygments/styles/bw.py	Mon Mar 25 03:11:06 2013 +0100
@@ -9,6 +9,8 @@
     :license: BSD, see LICENSE for details.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from pygments.style import Style
 from pygments.token import Keyword, Name, Comment, String, Error, \
      Operator, Generic
--- a/ThirdParty/Pygments/pygments/styles/colorful.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/ThirdParty/Pygments/pygments/styles/colorful.py	Mon Mar 25 03:11:06 2013 +0100
@@ -9,6 +9,8 @@
     :license: BSD, see LICENSE for details.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from pygments.style import Style
 from pygments.token import Keyword, Name, Comment, String, Error, \
      Number, Operator, Generic, Whitespace
--- a/ThirdParty/Pygments/pygments/styles/default.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/ThirdParty/Pygments/pygments/styles/default.py	Mon Mar 25 03:11:06 2013 +0100
@@ -9,6 +9,8 @@
     :license: BSD, see LICENSE for details.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from pygments.style import Style
 from pygments.token import Keyword, Name, Comment, String, Error, \
      Number, Operator, Generic, Whitespace
--- a/ThirdParty/Pygments/pygments/styles/emacs.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/ThirdParty/Pygments/pygments/styles/emacs.py	Mon Mar 25 03:11:06 2013 +0100
@@ -9,6 +9,8 @@
     :license: BSD, see LICENSE for details.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from pygments.style import Style
 from pygments.token import Keyword, Name, Comment, String, Error, \
      Number, Operator, Generic, Whitespace
--- a/ThirdParty/Pygments/pygments/styles/friendly.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/ThirdParty/Pygments/pygments/styles/friendly.py	Mon Mar 25 03:11:06 2013 +0100
@@ -9,6 +9,8 @@
     :license: BSD, see LICENSE for details.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from pygments.style import Style
 from pygments.token import Keyword, Name, Comment, String, Error, \
      Number, Operator, Generic, Whitespace
--- a/ThirdParty/Pygments/pygments/styles/fruity.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/ThirdParty/Pygments/pygments/styles/fruity.py	Mon Mar 25 03:11:06 2013 +0100
@@ -9,6 +9,8 @@
     :license: BSD, see LICENSE for details.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from pygments.style import Style
 from pygments.token import Token, Comment, Name, Keyword, \
     Generic, Number, String, Whitespace
--- a/ThirdParty/Pygments/pygments/styles/manni.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/ThirdParty/Pygments/pygments/styles/manni.py	Mon Mar 25 03:11:06 2013 +0100
@@ -12,6 +12,8 @@
     :license: BSD, see LICENSE for details.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from pygments.style import Style
 from pygments.token import Keyword, Name, Comment, String, Error, \
      Number, Operator, Generic, Whitespace
--- a/ThirdParty/Pygments/pygments/styles/monokai.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/ThirdParty/Pygments/pygments/styles/monokai.py	Mon Mar 25 03:11:06 2013 +0100
@@ -11,6 +11,8 @@
     :license: BSD, see LICENSE for details.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from pygments.style import Style
 from pygments.token import Keyword, Name, Comment, String, Error, Text, \
      Number, Operator, Generic, Whitespace, Punctuation, Other, Literal
--- a/ThirdParty/Pygments/pygments/styles/murphy.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/ThirdParty/Pygments/pygments/styles/murphy.py	Mon Mar 25 03:11:06 2013 +0100
@@ -9,6 +9,8 @@
     :license: BSD, see LICENSE for details.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from pygments.style import Style
 from pygments.token import Keyword, Name, Comment, String, Error, \
      Number, Operator, Generic, Whitespace
--- a/ThirdParty/Pygments/pygments/styles/native.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/ThirdParty/Pygments/pygments/styles/native.py	Mon Mar 25 03:11:06 2013 +0100
@@ -9,6 +9,8 @@
     :license: BSD, see LICENSE for details.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from pygments.style import Style
 from pygments.token import Keyword, Name, Comment, String, Error, \
      Number, Operator, Generic, Token, Whitespace
--- a/ThirdParty/Pygments/pygments/styles/pastie.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/ThirdParty/Pygments/pygments/styles/pastie.py	Mon Mar 25 03:11:06 2013 +0100
@@ -11,6 +11,8 @@
     :license: BSD, see LICENSE for details.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from pygments.style import Style
 from pygments.token import Keyword, Name, Comment, String, Error, \
      Number, Operator, Generic, Whitespace
--- a/ThirdParty/Pygments/pygments/styles/perldoc.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/ThirdParty/Pygments/pygments/styles/perldoc.py	Mon Mar 25 03:11:06 2013 +0100
@@ -11,6 +11,8 @@
     :license: BSD, see LICENSE for details.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from pygments.style import Style
 from pygments.token import Keyword, Name, Comment, String, Error, \
      Number, Operator, Generic, Whitespace
--- a/ThirdParty/Pygments/pygments/styles/rrt.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/ThirdParty/Pygments/pygments/styles/rrt.py	Mon Mar 25 03:11:06 2013 +0100
@@ -9,6 +9,8 @@
     :license: BSD, see LICENSE for details.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from pygments.style import Style
 from pygments.token import Comment, Name, Keyword, String
--- a/ThirdParty/Pygments/pygments/styles/tango.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/ThirdParty/Pygments/pygments/styles/tango.py	Mon Mar 25 03:11:06 2013 +0100
@@ -37,6 +37,8 @@
     :license: BSD, see LICENSE for details.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from pygments.style import Style
 from pygments.token import Keyword, Name, Comment, String, Error, \
      Number, Operator, Generic, Whitespace, Punctuation, Other, Literal
--- a/ThirdParty/Pygments/pygments/styles/trac.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/ThirdParty/Pygments/pygments/styles/trac.py	Mon Mar 25 03:11:06 2013 +0100
@@ -9,6 +9,8 @@
     :license: BSD, see LICENSE for details.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from pygments.style import Style
 from pygments.token import Keyword, Name, Comment, String, Error, \
      Number, Operator, Generic, Whitespace
--- a/ThirdParty/Pygments/pygments/styles/vim.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/ThirdParty/Pygments/pygments/styles/vim.py	Mon Mar 25 03:11:06 2013 +0100
@@ -9,6 +9,8 @@
     :license: BSD, see LICENSE for details.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from pygments.style import Style
 from pygments.token import Keyword, Name, Comment, String, Error, \
      Number, Operator, Generic, Whitespace, Token
--- a/ThirdParty/Pygments/pygments/styles/vs.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/ThirdParty/Pygments/pygments/styles/vs.py	Mon Mar 25 03:11:06 2013 +0100
@@ -9,6 +9,8 @@
     :license: BSD, see LICENSE for details.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from pygments.style import Style
 from pygments.token import Keyword, Name, Comment, String, Error, \
      Operator, Generic
--- a/ThirdParty/Pygments/pygments/token.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/ThirdParty/Pygments/pygments/token.py	Mon Mar 25 03:11:06 2013 +0100
@@ -9,6 +9,8 @@
     :license: BSD, see LICENSE for details.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 class _TokenType(tuple):
     parent = None
--- a/ThirdParty/Pygments/pygments/unistring.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/ThirdParty/Pygments/pygments/unistring.py	Mon Mar 25 03:11:06 2013 +0100
@@ -11,6 +11,8 @@
     :copyright: Copyright 2006-2013 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from pygments.util import u_prefix

 Cc = '\x00\x01\x02\x03\x04\x05\x06\x07\x08\t\n\x0b\x0c\r\x0e\x0f\x10\x11\x12\x13\x14\x15\x16\x17\x18\x19\x1a\x1b\x1c\x1d\x1e\x1f\x7f\x80\x81\x82\x83\x84\x85\x86\x87\x88\x89\x8a\x8b\x8c\x8d\x8e\x8f\x90\x91\x92\x93\x94\x95\x96\x97\x98\x99\x9a\x9b\x9c\x9d\x9e\x9f'
--- a/ThirdParty/Pygments/pygments/util.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/ThirdParty/Pygments/pygments/util.py	Mon Mar 25 03:11:06 2013 +0100
@@ -9,6 +9,8 @@
     :license: BSD, see LICENSE for details.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 import re
 import sys
 import codecs
--- a/Toolbox/SingleApplication.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Toolbox/SingleApplication.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing the single application server and client.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.QtNetwork import QLocalServer, QLocalSocket


@@ -20,7 +22,7 @@

         @param name name this server is listening to (string)
         """
-        super().__init__()
+        super(SingleApplicationServer, self).__init__()

         res = self.listen(name)
         if not res:
--- a/Toolbox/Startup.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Toolbox/Startup.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing some startup helper funcions
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 import os
 import sys
--- a/Tools/TRPreviewer.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Tools/TRPreviewer.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing the TR Previewer main window.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 import os

 from PyQt4.QtCore import QDir, QTimer, QFileInfo, pyqtSignal, QEvent, QSize, \
@@ -42,7 +44,7 @@
         self.mainWidget = None
         self.currentFile = QDir.currentPath()

-        super().__init__(parent)
+        super(TRPreviewer, self).__init__(parent)
         if not name:
             self.setObjectName("TRPreviewer")
         else:
@@ -120,7 +122,7 @@
         the main window has been shown. This way, previewing a dialog
         doesn't interfere with showing the main window.
         """
-        super().show()
+        super(TRPreviewer, self).show()
         if self.filesToLoad:
             filenames, self.filesToLoad = (self.filesToLoad[:], [])
             first = True
@@ -429,7 +431,7 @@
             available languages (QComboBox)
         @param parent parent widget (QWidget)
         """
-        super().__init__(parent)
+        super(TranslationsDict, self).__init__(parent)

         self.selector = selector
         self.currentTranslator = None
@@ -647,7 +649,7 @@
         @param parent parent widget (QWidget)
         @param name name of this widget (string)
         """
-        super().__init__(parent)
+        super(WidgetView, self).__init__(parent)
         if name:
             self.setObjectName(name)
             self.setWindowTitle(name)
@@ -730,7 +732,7 @@

         @param parent parent widget (QWidget)
         """
-        super().__init__(parent)
+        super(WidgetArea, self).__init__(parent)

         self.setHorizontalScrollBarPolicy(Qt.ScrollBarAsNeeded)
         self.setVerticalScrollBarPolicy(Qt.ScrollBarAsNeeded)
--- a/Tools/TRSingleApplication.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Tools/TRSingleApplication.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing the single application server and client.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 import os

 from PyQt4.QtCore import pyqtSignal
--- a/Tools/TrayStarter.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Tools/TrayStarter.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing a starter for the system tray.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 import sys
 import os

@@ -32,7 +34,7 @@
         """
         Constructor
         """
-        super().__init__(
+        super(TrayStarter, self).__init__(
             UI.PixmapCache.getIcon(Preferences.getTrayStarter("TrayStarterIcon")))

         self.maxMenuFilePathLen = 75
--- a/Tools/UIPreviewer.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Tools/UIPreviewer.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing the UI Previewer main window.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.QtCore import qVersion, QDir, QFileInfo, QEvent, QSize, Qt
 from PyQt4.QtGui import QSizePolicy, QSpacerItem, QWidget, QHBoxLayout, QCursor, \
     QPrinter, QKeySequence, QPrintDialog, QWhatsThis, QPixmap, QImageWriter, QPainter, \
@@ -37,7 +39,7 @@
         self.mainWidget = None
         self.currentFile = QDir.currentPath()

-        super().__init__(parent)
+        super(UIPreviewer, self).__init__(parent)
         if not name:
             self.setObjectName("UIPreviewer")
         else:
@@ -111,7 +113,7 @@
         the main window has been shown. This way, previewing a dialog
         doesn't interfere with showing the main window.
         """
-        super().show()
+        super(UIPreviewer, self).show()
         if self.fileToLoad is not None:
             fn, self.fileToLoad = (self.fileToLoad, None)
             self.__loadFile(fn)
--- a/UI/AuthenticationDialog.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/UI/AuthenticationDialog.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing the authentication dialog for the help browser.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.QtGui import QDialog, QStyle

 from .Ui_AuthenticationDialog import Ui_AuthenticationDialog
@@ -25,7 +27,7 @@
         @param showSave flag to indicate to show the save checkbox (boolean)
         @param saveIt flag indicating the value for the save checkbox (boolean)
         """
-        super().__init__(parent)
+        super(AuthenticationDialog, self).__init__(parent)
         self.setupUi(self)

         self.infoLabel.setText(info)
--- a/UI/Browser.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/UI/Browser.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing a browser with class browsing capabilities.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 import os
 import mimetypes

@@ -64,7 +66,7 @@

         @param parent parent widget (QWidget)
         """
-        super().__init__(parent)
+        super(Browser, self).__init__(parent)

         self.setWindowTitle(QApplication.translate('Browser', 'File-Browser'))
         self.setWindowIcon(UI.PixmapCache.getIcon("eric.png"))
--- a/UI/BrowserModel.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/UI/BrowserModel.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing the browser model.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 import sys
 import os
 import fnmatch
@@ -39,7 +41,7 @@

         @param parent reference to parent object (QObject)
         """
-        super().__init__(parent)
+        super(BrowserModel, self).__init__(parent)

         rootData = QApplication.translate("BrowserModel", "Name")
         self.rootItem = BrowserItem(None, rootData)
--- a/UI/BrowserSortFilterProxyModel.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/UI/BrowserSortFilterProxyModel.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing the browser sort filter proxy model.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.QtCore import QModelIndex
 from PyQt4.QtGui import QSortFilterProxyModel

@@ -23,7 +25,7 @@

         @param parent reference to the parent object (QObject)
         """
-        super().__init__(parent)
+        super(BrowserSortFilterProxyModel, self).__init__(parent)
         self.hideNonPublic = Preferences.getUI("BrowsersHideNonPublic")

     def sort(self, column, order):
@@ -35,7 +37,7 @@
         """
         self.__sortColumn = column
         self.__sortOrder = order
-        super().sort(column, order)
+        super(BrowserSortFilterProxyModel, self).sort(column, order)

     def lessThan(self, left, right):
         """
--- a/UI/CompareDialog.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/UI/CompareDialog.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing a dialog to compare two files and show the result side by side.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 import re
 from difflib import _mdiff, IS_CHARACTER_JUNK

@@ -88,7 +90,7 @@
             (list of two tuples of two strings)
         @param parent parent widget (QWidget)
         """
-        super().__init__(parent)
+        super(CompareDialog, self).__init__(parent)
         self.setupUi(self)

         self.file1Completer = E5FileCompleter(self.file1Edit)
@@ -170,7 +172,7 @@
         """
         if filename:
             self.file1Edit.setText(filename)
-        super().show()
+        super(CompareDialog, self).show()

     def __appendText(self, pane, linenumber, line, format, interLine=False):
         """
@@ -437,7 +439,7 @@
             (list of two tuples of two strings)
         @param parent reference to the parent widget (QWidget)
         """
-        super().__init__(parent)
+        super(CompareWindow, self).__init__(parent)

         self.setStyle(Preferences.getUI("Style"), Preferences.getUI("StyleSheet"))
--- a/UI/DeleteFilesConfirmationDialog.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/UI/DeleteFilesConfirmationDialog.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing a dialog to confirm deletion of multiple files.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.QtGui import QDialog, QDialogButtonBox

 from .Ui_DeleteFilesConfirmationDialog import Ui_DeleteFilesConfirmationDialog
@@ -27,7 +29,7 @@
         @param cancelLabel label for the Cancel button (string)
         @param files list of filenames to be shown (list of strings)
         """
-        super().__init__(parent)
+        super(DeleteFilesConfirmationDialog, self).__init__(parent)
         self.setupUi(self)
         self.setModal(True)
--- a/UI/DiffDialog.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/UI/DiffDialog.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing a dialog to compare two files.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 import os
 import time

@@ -202,7 +204,7 @@
         """
         Constructor
         """
-        super().__init__(parent)
+        super(DiffDialog, self).__init__(parent)
         self.setupUi(self)

         self.file1Completer = E5FileCompleter(self.file1Edit)
@@ -251,7 +253,7 @@
         """
         if filename:
             self.file1Edit.setText(filename)
-        super().show()
+        super(DiffDialog, self).show()

     def on_buttonBox_clicked(self, button):
         """
@@ -500,7 +502,7 @@

         @param parent reference to the parent widget (QWidget)
         """
-        super().__init__(parent)
+        super(DiffWindow, self).__init__(parent)

         self.setStyle(Preferences.getUI("Style"), Preferences.getUI("StyleSheet"))
--- a/UI/EmailDialog.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/UI/EmailDialog.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing a dialog to send bug reports.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 import os
 import mimetypes
 import smtplib
@@ -67,7 +69,7 @@
         @param mode mode of this dialog (string, "bug" or "feature")
         @param parent parent widget of this dialog (QWidget)
         """
-        super().__init__(parent)
+        super(EmailDialog, self).__init__(parent)
         self.setupUi(self)

         self.__mode = mode
--- a/UI/ErrorLogDialog.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/UI/ErrorLogDialog.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing a dialog to display an error log.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 import os

 from PyQt4.QtCore import pyqtSlot
@@ -26,7 +28,7 @@
         @param logFile name of the log file containing the error info (string)
         @param parent reference to the parent widget (QWidget)
         """
-        super().__init__(parent)
+        super(ErrorLogDialog, self).__init__(parent)
         self.setupUi(self)

         pixmap = self.style().standardIcon(QStyle.SP_MessageBoxQuestion).pixmap(32, 32)
--- a/UI/FindFileDialog.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/UI/FindFileDialog.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing a dialog to search for text in files.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 import os
 import re

@@ -51,7 +53,7 @@
         @param project reference to the project object
         @param parent parent widget of this dialog (QWidget)
         """
-        super().__init__(parent)
+        super(FindFileDialog, self).__init__(parent)
         self.setupUi(self)
         self.setWindowFlags(Qt.WindowFlags(Qt.Window))

@@ -182,7 +184,7 @@
             self.findList.clear()
             self.replacetextCombo.setEditText("")

-        super().show()
+        super(FindFileDialog, self).show()

     def on_findtextCombo_editTextChanged(self, text):
         """
--- a/UI/FindFileNameDialog.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/UI/FindFileNameDialog.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing a dialog to search for files.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 import os
 import sys

@@ -43,7 +45,7 @@
         @param project reference to the project object
         @param parent parent widget of this dialog (QWidget)
         """
-        super().__init__(parent)
+        super(FindFileNameDialog, self).__init__(parent)
         self.setupUi(self)

         self.searchDirCompleter = E5DirCompleter(self.searchDirEdit)
@@ -247,4 +249,4 @@
         self.fileNameEdit.selectAll()
         self.fileNameEdit.setFocus()

-        super().show()
+        super(FindFileNameDialog, self).show()
--- a/UI/Info.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/UI/Info.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module defining some informational strings.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 Program = 'eric5'
 Version = '@@VERSION@@ (rev @@REVISION@@)'
 Copyright = 'Copyright (c) 2002 - 2013 Detlev Offenbach <detlev@die-offenbachs.de>'
--- a/UI/LogView.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/UI/LogView.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing the log viewer widget and the log widget.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.QtCore import Qt, pyqtSignal
 from PyQt4.QtGui import QTextEdit, QBrush, QApplication, QMenu, QTextCursor, QWidget, \
     QHBoxLayout, QTextDocument
@@ -27,7 +29,7 @@

         @param parent reference to the parent widget (QWidget)
         """
-        super().__init__(parent)
+        super(LogViewer, self).__init__(parent)

         self.setWindowIcon(UI.PixmapCache.getIcon("eric.png"))

@@ -90,7 +92,7 @@

         @param parent reference to the parent widget (QWidget)
         """
-        super().__init__(parent)
+        super(LogViewerEdit, self).__init__(parent)
         self.setAcceptRichText(False)
         self.setLineWrapMode(QTextEdit.NoWrap)
         self.setReadOnly(True)
--- a/UI/NotificationWidget.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/UI/NotificationWidget.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing a Notification widget.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.QtCore import Qt, QTimer, QPoint
 from PyQt4.QtGui import QWidget, QPixmap

@@ -27,7 +29,7 @@
         @param setPosition flag indicating to set the display
             position interactively (boolean)
         """
-        super().__init__(parent)
+        super(NotificationWidget, self).__init__(parent)
         self.setupUi(self)

         self.__timeout = 5000
@@ -98,7 +100,7 @@
             self.__timer.setInterval(self.__timeout)
             self.__timer.start()

-        super().show()
+        super(NotificationWidget, self).show()

     def mousePressEvent(self, evt):
         """
--- a/UI/NumbersWidget.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/UI/NumbersWidget.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing a widget to show numbers in different formats.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.QtCore import pyqtSlot, pyqtSignal, Qt, QAbstractTableModel, qVersion
 from PyQt4.QtGui import QWidget, QHeaderView

@@ -27,7 +29,7 @@

         @param parent reference to the parent widget (QWidget)
         """
-        super().__init__(parent)
+        super(BinaryModel, self).__init__(parent)

         self.__bits = 0
         self.__value = 0
@@ -162,7 +164,7 @@

         @param parent reference to the parent widget (QWidget)
         """
-        super().__init__(parent)
+        super(NumbersWidget, self).__init__(parent)
         self.setupUi(self)

         self.setWindowIcon(UI.PixmapCache.getIcon("eric.png"))
--- a/UI/PixmapCache.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/UI/PixmapCache.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing a pixmap cache for icons.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 import os

 from PyQt4.QtGui import QPixmap, QIcon, QPainter
--- a/UI/Previewer.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/UI/Previewer.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing a previewer widget for HTML, Markdown and ReST files.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 import os
 import threading
 import re
@@ -35,7 +37,7 @@
         @param splitter reference to the embedding splitter (QSplitter)
         @param parent reference to the parent widget (QWidget)
         """
-        super().__init__(parent)
+        super(Previewer, self).__init__(parent)
         self.setupUi(self)

         self.__vm = viewmanager
@@ -73,7 +75,7 @@
         """
         Public method to show the preview widget.
         """
-        super().show()
+        super(Previewer, self).show()
         if self.__firstShow:
             self.__splitter.restoreState(Preferences.getUI("PreviewSplitterState"))
             self.jsCheckBox.setChecked(Preferences.getUI("ShowFilePreviewJS"))
@@ -85,7 +87,7 @@
         """
         Public method to hide the preview widget.
         """
-        super().hide()
+        super(Previewer, self).hide()
         self.__typingTimer.stop()

     def shutdown(self):
@@ -331,7 +333,7 @@

         @param parent reference to the parent object (QObject)
         """
-        super().__init__()
+        super(PreviewProcessingThread, self).__init__()

         self.__lock = threading.Lock()
--- a/UI/SearchWidget.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/UI/SearchWidget.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing the search box for the shel, terminal and log viewer.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.QtCore import pyqtSlot, pyqtSignal, Qt
 from PyQt4.QtGui import QWidget, QSpacerItem, QSizePolicy

@@ -35,7 +37,7 @@
         @param spacer flag indicating to add a vertical spacer to the
             main layout (boolean)
         """
-        super().__init__(parent)
+        super(SearchWidget, self).__init__(parent)
         self.setupUi(self)
         if spacer:
             spacerItem = QSpacerItem(20, 1, QSizePolicy.Minimum, QSizePolicy.Expanding)
--- a/UI/SplashScreen.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/UI/SplashScreen.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing a splashscreen for eric5.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 import os.path
 import logging

@@ -27,7 +29,7 @@
         ericPic = QPixmap(os.path.join(getConfig('ericPixDir'), 'ericSplash.png'))
         self.labelAlignment = \
             Qt.Alignment(Qt.AlignBottom | Qt.AlignRight | Qt.AlignAbsolute)
-        super().__init__(ericPic)
+        super(SplashScreen, self).__init__(ericPic)
         self.show()
         QApplication.flush()

@@ -38,14 +40,14 @@
         @param msg message to be shown (string)
         """
         logging.debug(msg)
-        super().showMessage(msg, self.labelAlignment, QColor(Qt.white))
+        super(SplashScreen, self).showMessage(msg, self.labelAlignment, QColor(Qt.white))
         QApplication.processEvents()

     def clearMessage(self):
         """
         Public method to clear the message shown.
         """
-        super().clearMessage()
+        super(SplashScreen, self).clearMessage()
         QApplication.processEvents()
--- a/UI/SymbolsWidget.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/UI/SymbolsWidget.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing a widget to select a symbol in various formats.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 import unicodedata
 import html.entities

@@ -31,7 +33,7 @@

         @param parent reference to the parent object (QObject)
         """
-        super().__init__(parent)
+        super(SymbolsModel, self).__init__(parent)

         self.__headerData = [
             self.trUtf8("Code"),
@@ -345,7 +347,7 @@

         @param parent reference to the parent widget (QWidget)
         """
-        super().__init__(parent)
+        super(SymbolsWidget, self).__init__(parent)
         self.setupUi(self)

         self.setWindowIcon(UI.PixmapCache.getIcon("eric.png"))
--- a/UI/UserInterface.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/UI/UserInterface.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,12 @@
 Module implementing the main user interface.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+try:
+    str = unicode
+except (NameError):
+    pass
+
 import os
 import sys
 import logging
@@ -63,7 +69,7 @@

         @param stderr flag indicating stderr is being redirected
         """
-        super().__init__()
+        super(Redirector, self).__init__()
         self.stderr = stderr
         self.buffer = ''

@@ -145,7 +151,7 @@
         @param restartArguments list of command line parameters to be used for a
             restart (list of strings)
         """
-        super().__init__()
+        super(UserInterface, self).__init__()
         self.setAttribute(Qt.WA_DeleteOnClose)

         self.__restartArgs = restartArguments[:]
--- a/Utilities/AutoSaver.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Utilities/AutoSaver.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing an auto saver class.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.QtCore import QObject, QBasicTimer, QTime


@@ -24,7 +26,7 @@
         @param parent reference to the parent object (QObject)
         @param save slot to be called to perform the save operation
         """
-        super().__init__(parent)
+        super(AutoSaver, self).__init__(parent)

         if parent is None:
             raise RuntimeError("AutoSaver: parent must not be None.")
@@ -55,7 +57,7 @@
         if evt.timerId() == self.__timer.timerId():
             self.saveIfNeccessary()
         else:
-            super().timerEvent(evt)
+            super(AutoSaver, self).timerEvent(evt)

     def saveIfNeccessary(self):
         """
--- a/Utilities/ClassBrowsers/ClbrBaseClasses.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Utilities/ClassBrowsers/ClbrBaseClasses.py	Mon Mar 25 03:11:06 2013 +0100
@@ -8,6 +8,8 @@
 """


+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 class _ClbrBase(object):
     """
     Class implementing the base of all class browser objects.
--- a/Utilities/ClassBrowsers/__init__.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Utilities/ClassBrowsers/__init__.py	Mon Mar 25 03:11:06 2013 +0100
@@ -16,6 +16,8 @@
 </ul>
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 import os
 import imp
--- a/Utilities/ClassBrowsers/idlclbr.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Utilities/ClassBrowsers/idlclbr.py	Mon Mar 25 03:11:06 2013 +0100
@@ -12,6 +12,8 @@
 It is based on the Python class browser found in this package.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 import re

 import Utilities
--- a/Utilities/ClassBrowsers/pyclbr.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Utilities/ClassBrowsers/pyclbr.py	Mon Mar 25 03:11:06 2013 +0100
@@ -13,6 +13,8 @@
 """


+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 import sys
 import imp
 import re
--- a/Utilities/ClassBrowsers/rbclbr.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Utilities/ClassBrowsers/rbclbr.py	Mon Mar 25 03:11:06 2013 +0100
@@ -12,6 +12,8 @@
 It is based on the Python class browser found in this package.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 import re

 import Utilities
--- a/Utilities/FtpUtilities.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Utilities/FtpUtilities.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing some FTP related utilities.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 import os

 from PyQt4.QtCore import QObject, QDate, QDateTime, QTime
@@ -49,7 +51,7 @@

         @param parent reference to the parent object (QObject)
         """
-        super().__init__(parent)
+        super(FtpDirLineParser, self).__init__(parent)

         self.__parseLine = self.__parseUnixLine
         self.__modeSwitchAllowed = True
--- a/Utilities/ModuleParser.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Utilities/ModuleParser.py	Mon Mar 25 03:11:06 2013 +0100
@@ -16,6 +16,8 @@
 </ul>
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 import sys
 import os
 import imp
--- a/Utilities/PasswordChecker.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Utilities/PasswordChecker.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing a checker for password strength
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 import re
--- a/Utilities/__init__.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Utilities/__init__.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,12 @@
 Package implementing various functions/classes needed everywhere within eric5.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+try:
+    str = unicode
+except (NameError):
+    pass
+
 import os
 import sys
 import re
--- a/Utilities/binplistlib.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Utilities/binplistlib.py	Mon Mar 25 03:11:06 2013 +0100
@@ -51,6 +51,12 @@
 </pre>
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+try:
+    str = unicode
+except (NameError):
+    pass
+
 #
 # Ported from the Python 2 biplist.py script.
 #
--- a/Utilities/crypto/__init__.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Utilities/crypto/__init__.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Package implementing cryptography related functionality.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 import random
 import base64
--- a/Utilities/crypto/py3AES.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Utilities/crypto/py3AES.py	Mon Mar 25 03:11:06 2013 +0100
@@ -23,6 +23,8 @@
 Advanced Encryption Standard.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 import os
 import math
--- a/Utilities/crypto/py3PBKDF2.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Utilities/crypto/py3PBKDF2.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing PBKDF2 functions.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 import hashlib
 import hmac
 import os
--- a/Utilities/uic.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Utilities/uic.py	Mon Mar 25 03:11:06 2013 +0100
@@ -8,6 +8,8 @@
 directory or directory tree.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 import os
--- a/VCS/CommandOptionsDialog.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/VCS/CommandOptionsDialog.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing the VCS command options dialog.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.QtGui import QDialog

 from .Ui_CommandOptionsDialog import Ui_vcsCommandOptionsDialog
@@ -25,7 +27,7 @@
         @param vcs reference to the vcs object
         @param parent parent widget (QWidget)
         """
-        super().__init__(parent)
+        super(vcsCommandOptionsDialog, self).__init__(parent)
         self.setupUi(self)

         if Utilities.isWindowsPlatform():
--- a/VCS/ProjectBrowserHelper.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/VCS/ProjectBrowserHelper.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing the base class of the VCS project browser helper.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 import os

 from PyQt4.QtCore import QObject
@@ -39,7 +41,7 @@
         @param parent parent widget (QWidget)
         @param name name of this object (string)
         """
-        super().__init__(parent)
+        super(VcsProjectBrowserHelper, self).__init__(parent)
         if name:
             self.setObjectName(name)
--- a/VCS/ProjectHelper.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/VCS/ProjectHelper.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing the base class of the VCS project helper.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 import os
 import shutil
 import copy
@@ -34,7 +36,7 @@
         @param parent parent widget (QWidget)
         @param name name of this object (string)
         """
-        super().__init__(parent)
+        super(VcsProjectHelper, self).__init__(parent)
         if name:
             self.setObjectName(name)
--- a/VCS/RepositoryInfoDialog.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/VCS/RepositoryInfoDialog.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implemting a dialog to show repository information.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.QtGui import QDialog

 from .Ui_RepositoryInfoDialog import Ui_VcsRepositoryInfoDialog
@@ -17,6 +19,6 @@
     Class implemting a dialog to show repository information.
     """
     def __init__(self, parent, info):
-        super().__init__(parent)
+        super(VcsRepositoryInfoDialog, self).__init__(parent)
         self.setupUi(self)
         self.infoBrowser.setHtml(info)
--- a/VCS/StatusMonitorLed.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/VCS/StatusMonitorLed.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing a LED to indicate the status of the VCS status monitor thread.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.QtCore import Qt
 from PyQt4.QtGui import QColor, QInputDialog, QMenu
--- a/VCS/StatusMonitorThread.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/VCS/StatusMonitorThread.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing the VCS status monitor thread base class.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.QtCore import QThread, QMutex, QWaitCondition, pyqtSignal


@@ -30,7 +32,7 @@
         @param vcs reference to the version control object
         @param parent reference to the parent object (QObject)
         """
-        super().__init__(parent)
+        super(VcsStatusMonitorThread, self).__init__(parent)
         self.setObjectName("VcsStatusMonitorThread")

         self.setTerminationEnabled(True)
--- a/VCS/VersionControl.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/VCS/VersionControl.py	Mon Mar 25 03:11:06 2013 +0100
@@ -8,6 +8,8 @@
 VCS interfaces.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 import os

 from PyQt4.QtCore import QObject, QThread, QMutex, QProcess, \
@@ -44,7 +46,7 @@
         @param parent parent widget (QWidget)
         @param name name of this object (string)
         """
-        super().__init__(parent)
+        super(VersionControl, self).__init__(parent)
         if name:
             self.setObjectName(name)
         self.defaultOptions = {
--- a/VCS/__init__.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/VCS/__init__.py	Mon Mar 25 03:11:06 2013 +0100
@@ -12,6 +12,8 @@
 interfaces (i.e. CVS) have to be subclasses of this base class.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from E5Gui.E5Application import e5App

 ######################################################################
--- a/ViewManager/BookmarkedFilesDialog.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/ViewManager/BookmarkedFilesDialog.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing a configuration dialog for the bookmarked files menu.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.QtCore import QFileInfo, Qt, pyqtSlot
 from PyQt4.QtGui import QListWidgetItem, QColor, QDialog

@@ -29,7 +31,7 @@
         @param bookmarks list of bookmarked files (list of strings)
         @param parent parent widget (QWidget)
         """
-        super().__init__(parent)
+        super(BookmarkedFilesDialog, self).__init__(parent)
         self.setupUi(self)

         self.fileCompleter = E5FileCompleter(self.fileEdit)
--- a/ViewManager/ViewManager.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/ViewManager/ViewManager.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing the viewmanager base class.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 import os

 from PyQt4.QtCore import QSignalMapper, QTimer, QFileInfo, pyqtSignal, QRegExp, \
@@ -70,7 +72,7 @@
         if evt.key() == Qt.Key_Escape:
             self.escPressed.emit()
         else:
-            super().keyPressEvent(evt)  # pass it on
+            super(QuickSearchLineEdit, self).keyPressEvent(evt)  # pass it on

     def focusInEvent(self, evt):
         """
@@ -79,7 +81,7 @@
         @param evt focus event (QFocusEvent)
         """
         self.gotFocus.emit()
-        super().focusInEvent(evt)   # pass it on
+        super(QuickSearchLineEdit, self).focusInEvent(evt)   # pass it on


 class ViewManager(QObject):
@@ -132,7 +134,7 @@
         """
         Constructor
         """
-        super().__init__()
+        super(ViewManager, self).__init__()

         # initialize the instance variables
         self.editors = []
--- a/ViewManager/__init__.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/ViewManager/__init__.py	Mon Mar 25 03:11:06 2013 +0100
@@ -15,6 +15,8 @@
 default.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 import Preferences

 ######################################################################
--- a/compileUiFiles.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/compileUiFiles.py	Mon Mar 25 03:11:06 2013 +0100
@@ -8,6 +8,8 @@
 Script for eric5 to compile all .ui files to Python source.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 import sys
 import os
--- a/eric5.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/eric5.py	Mon Mar 25 03:11:06 2013 +0100
@@ -11,6 +11,8 @@
 of the IDE and starts the Qt event loop.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 import sys
 import os
 import traceback
--- a/eric5_api.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/eric5_api.py	Mon Mar 25 03:11:06 2013 +0100
@@ -12,6 +12,8 @@
 This script can be used via the commandline as well.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 import glob
 import os
 import sys
--- a/eric5_compare.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/eric5_compare.py	Mon Mar 25 03:11:06 2013 +0100
@@ -12,6 +12,8 @@
 version of the integrated Compare module.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 import sys

 for arg in sys.argv:
--- a/eric5_configure.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/eric5_configure.py	Mon Mar 25 03:11:06 2013 +0100
@@ -10,6 +10,8 @@
 This is the main Python script to configure the eric5 IDE from the outside.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 import sys
 import os
--- a/eric5_diff.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/eric5_diff.py	Mon Mar 25 03:11:06 2013 +0100
@@ -12,6 +12,8 @@
 version of the integrated Diff module.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 import sys

 for arg in sys.argv:
--- a/eric5_doc.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/eric5_doc.py	Mon Mar 25 03:11:06 2013 +0100
@@ -12,6 +12,8 @@
 This script can be used via the commandline as well.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 import glob
 import os
 import sys
--- a/eric5_editor.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/eric5_editor.py	Mon Mar 25 03:11:06 2013 +0100
@@ -12,6 +12,8 @@
 version of the integrated MiniEditor module.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 import sys
 import os
--- a/eric5_iconeditor.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/eric5_iconeditor.py	Mon Mar 25 03:11:06 2013 +0100
@@ -12,6 +12,8 @@
 of the integrated icon editor.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 import sys

 for arg in sys.argv:
--- a/eric5_plugininstall.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/eric5_plugininstall.py	Mon Mar 25 03:11:06 2013 +0100
@@ -10,6 +10,8 @@
 This is the main Python script to install eric5 plugins from outside of the IDE.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 import sys

 for arg in sys.argv:
--- a/eric5_pluginrepository.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/eric5_pluginrepository.py	Mon Mar 25 03:11:06 2013 +0100
@@ -10,6 +10,8 @@
 This is the main Python script to install eric5 plugins from outside of the IDE.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 import sys

 for arg in sys.argv:
--- a/eric5_pluginuninstall.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/eric5_pluginuninstall.py	Mon Mar 25 03:11:06 2013 +0100
@@ -10,6 +10,8 @@
 This is the main Python script to uninstall eric5 plugins from outside of the IDE.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 import sys

 for arg in sys.argv:
--- a/eric5_qregexp.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/eric5_qregexp.py	Mon Mar 25 03:11:06 2013 +0100
@@ -12,6 +12,8 @@
 version of the integrated QRegExp wizard.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 import sys

 for arg in sys.argv:
--- a/eric5_re.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/eric5_re.py	Mon Mar 25 03:11:06 2013 +0100
@@ -12,6 +12,8 @@
 version of the integrated PyRegExp wizard.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 import sys

 for arg in sys.argv:
--- a/eric5_snap.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/eric5_snap.py	Mon Mar 25 03:11:06 2013 +0100
@@ -11,6 +11,8 @@
 of the snapshot module and starts the Qt event loop.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 import sys

 for arg in sys.argv:
--- a/eric5_sqlbrowser.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/eric5_sqlbrowser.py	Mon Mar 25 03:11:06 2013 +0100
@@ -11,6 +11,8 @@
 of the SQL browser and starts the Qt event loop.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 import sys

 for arg in sys.argv:
--- a/eric5_tray.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/eric5_tray.py	Mon Mar 25 03:11:06 2013 +0100
@@ -12,6 +12,8 @@
 context menu to start the eric5 IDE and the eric5 tools.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 import sys

 for arg in sys.argv:
--- a/eric5_trpreviewer.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/eric5_trpreviewer.py	Mon Mar 25 03:11:06 2013 +0100
@@ -12,6 +12,8 @@
 of the integrated tr previewer.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 import sys

 for arg in sys.argv:
--- a/eric5_uipreviewer.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/eric5_uipreviewer.py	Mon Mar 25 03:11:06 2013 +0100
@@ -12,6 +12,8 @@
 of the integrated ui previewer.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 import sys

 for arg in sys.argv:
--- a/eric5_unittest.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/eric5_unittest.py	Mon Mar 25 03:11:06 2013 +0100
@@ -12,6 +12,8 @@
 version of the integrated unittest module.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 import sys

 for arg in sys.argv:
--- a/eric5_webbrowser.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/eric5_webbrowser.py	Mon Mar 25 03:11:06 2013 +0100
@@ -12,6 +12,8 @@
 of the integrated helpviewer.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 import sys
 import os
--- a/eric5config.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/eric5config.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module containing the default configuration of the eric5 installation
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 import sys
 import os
--- a/install-i18n.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/install-i18n.py	Mon Mar 25 03:11:06 2013 +0100
@@ -9,6 +9,8 @@
 Installation script for the eric5 IDE translation files.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 import sys
 import os
 import shutil
--- a/install.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/install.py	Mon Mar 25 03:11:06 2013 +0100
@@ -9,6 +9,8 @@
 Installation script for the eric5 IDE and all eric5 related tools.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 import sys
 import os
 import re
--- a/patch_modpython.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/patch_modpython.py	Mon Mar 25 03:11:06 2013 +0100
@@ -8,6 +8,8 @@
 Script to patch mod_python for usage with the eric5 IDE.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 import sys
 import os
 import shutil
--- a/uninstall.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/uninstall.py	Mon Mar 25 03:11:06 2013 +0100
@@ -9,6 +9,8 @@
 Uninstallation script for the eric5 IDE and all eric5 related tools.
 """

+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 import sys
 import os
 import shutil