Mon, 25 Mar 2013 03:11:06 +0100
Script changes: Future import added, super calls modified and unicode behavior for str.
--- 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