eric: changeset 3145:a9de05d4a22f

--- a/Cooperation/ChatWidget.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Cooperation/ChatWidget.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing the chat dialog.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.QtCore import Qt, pyqtSlot, pyqtSignal, QDateTime, QPoint, QFileInfo
 from PyQt4.QtGui import QWidget, QColor, QListWidgetItem, QMenu, QApplication
--- a/Cooperation/Connection.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Cooperation/Connection.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,9 +7,9 @@
 Module implementing a class representing a peer connection.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals
 try:
-    str = unicode
+    str = unicode    # __IGNORE_WARNING__
 except (NameError):
     pass
--- a/Cooperation/CooperationClient.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Cooperation/CooperationClient.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing the client of the cooperation package.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 import collections
--- a/Cooperation/CooperationServer.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Cooperation/CooperationServer.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing the cooperation server.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.QtCore import pyqtSignal
 from PyQt4.QtNetwork import QTcpServer
--- a/DataViews/CodeMetrics.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/DataViews/CodeMetrics.py	Sat Dec 14 23:44:25 2013 +0100
@@ -14,7 +14,7 @@
 @exception ValueError the tokenize module is too old
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 import os
 import io
--- a/DataViews/CodeMetricsDialog.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/DataViews/CodeMetricsDialog.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing a code metrics dialog.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 import os
 import fnmatch
--- a/DataViews/PyCoverageDialog.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/DataViews/PyCoverageDialog.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing a Python code coverage dialog.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 import os
--- a/DataViews/PyProfileDialog.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/DataViews/PyProfileDialog.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing a dialog to display profile data.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 import os
 import pickle
--- a/Debugger/BreakPointModel.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Debugger/BreakPointModel.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing the Breakpoint model.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.QtCore import pyqtSignal, Qt, QAbstractItemModel, QModelIndex
--- a/Debugger/BreakPointViewer.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Debugger/BreakPointViewer.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing the Breakpoint viewer widget.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.QtCore import pyqtSignal, Qt, qVersion
 from PyQt4.QtGui import QTreeView, QAbstractItemView, QSortFilterProxyModel, \
--- a/Debugger/CallStackViewer.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Debugger/CallStackViewer.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing the Call Stack viewer widget.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.QtCore import pyqtSignal, Qt, QFileInfo
 from PyQt4.QtGui import QTreeWidget, QTreeWidgetItem, QMenu
--- a/Debugger/CallTraceViewer.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Debugger/CallTraceViewer.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing the Call Trace viewer widget.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.QtCore import pyqtSlot, pyqtSignal, Qt, QRegExp, QFileInfo
 from PyQt4.QtGui import QWidget,  QTreeWidgetItem
--- a/Debugger/Config.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Debugger/Config.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module defining the different Python types and their display strings.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 try:
     from PyQt4.QtCore import QT_TRANSLATE_NOOP
--- a/Debugger/DebugProtocol.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Debugger/DebugProtocol.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module defining the debug protocol tokens.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 # The protocol "words".
 RequestOK = '>OK?<'
--- a/Debugger/DebugServer.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Debugger/DebugServer.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,9 +7,9 @@
 Module implementing the debug server.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals
 try:
-    str = unicode
+    str = unicode    # __IGNORE_WARNING__
 except (NameError):
     pass
--- a/Debugger/DebugUI.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Debugger/DebugUI.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing the debugger UI.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 import os
--- a/Debugger/DebugViewer.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Debugger/DebugViewer.py	Sat Dec 14 23:44:25 2013 +0100
@@ -20,7 +20,7 @@
 </ul>
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 import os
--- a/Debugger/DebuggerInterfaceNone.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Debugger/DebuggerInterfaceNone.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing a dummy debugger interface for the debug server.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.QtCore import QObject
--- a/Debugger/DebuggerInterfacePython.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Debugger/DebuggerInterfacePython.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing the Python debugger interface for the debug server.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 import sys
 import os
--- a/Debugger/DebuggerInterfacePython3.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Debugger/DebuggerInterfacePython3.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing the Python3 debugger interface for the debug server.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 import sys
 import os
--- a/Debugger/DebuggerInterfaceRuby.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Debugger/DebuggerInterfaceRuby.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing the Ruby debugger interface for the debug server.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 import os
--- a/Debugger/EditBreakpointDialog.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Debugger/EditBreakpointDialog.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing a dialog to edit breakpoint properties.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 import os.path
--- a/Debugger/EditWatchpointDialog.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Debugger/EditWatchpointDialog.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing a dialog to edit watch expression properties.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.QtGui import QDialog, QDialogButtonBox
--- a/Debugger/ExceptionLogger.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Debugger/ExceptionLogger.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing the Exception Logger widget.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.QtCore import pyqtSignal, Qt
 from PyQt4.QtGui import QTreeWidget, QTreeWidgetItem, QMenu
--- a/Debugger/ExceptionsFilterDialog.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Debugger/ExceptionsFilterDialog.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing the exceptions filter dialog.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.QtCore import pyqtSlot
 from PyQt4.QtGui import QDialog, QDialogButtonBox
--- a/Debugger/StartDialog.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Debugger/StartDialog.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing the Start Program dialog.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.QtCore import pyqtSlot
 from PyQt4.QtGui import QDialog, QDialogButtonBox
--- a/Debugger/VariableDetailDialog.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Debugger/VariableDetailDialog.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing the variable detail dialog.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.QtGui import QDialog
--- a/Debugger/VariablesFilterDialog.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Debugger/VariablesFilterDialog.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing the variables filter dialog.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.QtGui import QDialog, QDialogButtonBox
--- a/Debugger/VariablesViewer.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Debugger/VariablesViewer.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,9 +7,9 @@
 Module implementing the variables viewer widget.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals
 try:
-    str = unicode
+    str = unicode    # __IGNORE_WARNING__
 except (NameError):
     pass
--- a/Debugger/WatchPointModel.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Debugger/WatchPointModel.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing the Watch expression model.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.QtCore import pyqtSignal, Qt, QAbstractItemModel, QModelIndex
--- a/Debugger/WatchPointViewer.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Debugger/WatchPointViewer.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing the watch expression viewer widget.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.QtCore import Qt, QModelIndex, qVersion
 from PyQt4.QtGui import QTreeView, QAbstractItemView, QMenu, \
--- a/DocumentationTools/APIGenerator.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/DocumentationTools/APIGenerator.py	Sat Dec 14 23:44:25 2013 +0100
@@ -8,7 +8,7 @@
 """


-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals


 class APIGenerator(object):
--- a/DocumentationTools/IndexGenerator.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/DocumentationTools/IndexGenerator.py	Sat Dec 14 23:44:25 2013 +0100
@@ -8,7 +8,7 @@
 generator.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 import sys
 import os
--- a/DocumentationTools/ModuleDocumentor.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/DocumentationTools/ModuleDocumentor.py	Sat Dec 14 23:44:25 2013 +0100
@@ -11,7 +11,7 @@
 this module.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 import sys
 import re
--- a/DocumentationTools/QtHelpGenerator.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/DocumentationTools/QtHelpGenerator.py	Sat Dec 14 23:44:25 2013 +0100
@@ -8,7 +8,7 @@
 generator.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 import sys
 import os
--- a/DocumentationTools/TemplatesListsStyle.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/DocumentationTools/TemplatesListsStyle.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing templates for the documentation generator (lists style).
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 #################################################
 ##  Common templates for index and docu files  ##
--- a/DocumentationTools/TemplatesListsStyleCSS.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/DocumentationTools/TemplatesListsStyleCSS.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing templates for the documentation generator (lists style).
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 #################################################
 ##  Common templates for index and docu files  ##
--- a/E5Graphics/E5ArrowItem.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/E5Graphics/E5ArrowItem.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing a graphics item subclass for an arrow.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 import math
--- a/E5Graphics/E5GraphicsView.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/E5Graphics/E5GraphicsView.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing a canvas view class.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 import sys
--- a/E5Gui/E5Action.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/E5Gui/E5Action.py	Sat Dec 14 23:44:25 2013 +0100
@@ -10,7 +10,7 @@
 shortcuts.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.QtGui import QAction, QActionGroup, QIcon, QKeySequence, qApp
--- a/E5Gui/E5Application.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/E5Gui/E5Application.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Class implementing a specialized application class.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.QtCore import QCoreApplication
 from PyQt4.QtGui import QApplication
--- a/E5Gui/E5ClickableLabel.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/E5Gui/E5ClickableLabel.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing a clickable label.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.QtCore import pyqtSignal, Qt, QPoint
 from PyQt4.QtGui import QLabel
--- a/E5Gui/E5ComboBox.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/E5Gui/E5ComboBox.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing combobox classes using the eric5 line edits.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.QtGui import QComboBox
--- a/E5Gui/E5Completers.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/E5Gui/E5Completers.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing various kinds of completers.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.QtCore import QDir, Qt
 from PyQt4.QtGui import QCompleter, QFileSystemModel, QStringListModel
--- a/E5Gui/E5ErrorMessage.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/E5Gui/E5ErrorMessage.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing a specialized error message dialog.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.QtCore import qInstallMsgHandler, QCoreApplication, QtDebugMsg, \
     QtWarningMsg, QtCriticalMsg, QtFatalMsg, QThread, QMetaObject, Qt, Q_ARG, \
--- a/E5Gui/E5ErrorMessageFilterDialog.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/E5Gui/E5ErrorMessageFilterDialog.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing a dialog to manage the list of messages to be ignored.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.QtCore import pyqtSlot, Qt
 from PyQt4.QtGui import QDialog, QStringListModel, QSortFilterProxyModel, \
--- a/E5Gui/E5FileDialog.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/E5Gui/E5FileDialog.py	Sat Dec 14 23:44:25 2013 +0100
@@ -8,7 +8,7 @@
 to cope with distributor's usage of KDE wrapper dialogs for Qt file dialogs.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.QtGui import QFileDialog
--- a/E5Gui/E5Led.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/E5Gui/E5Led.py	Sat Dec 14 23:44:25 2013 +0100
@@ -9,7 +9,7 @@
 It was inspired by KLed.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.QtCore import Qt, QSize
 from PyQt4.QtGui import QWidget, QColor, QRadialGradient, QPalette, QPainter, \
--- a/E5Gui/E5LineEdit.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/E5Gui/E5LineEdit.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing specialized line edits.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.QtCore import pyqtSignal, Qt, QEvent, qVersion
 from PyQt4.QtGui import QLineEdit, QStyle, QPainter, QPalette, \
--- a/E5Gui/E5LineEditButton.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/E5Gui/E5LineEditButton.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing a button class to be used with E5LineEdit.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.QtCore import Qt, QPoint, QPointF
 from PyQt4.QtGui import QAbstractButton, QPainter, QPainterPath
--- a/E5Gui/E5ListView.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/E5Gui/E5ListView.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing specialized list views.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.QtCore import Qt
 from PyQt4.QtGui import QListView, QItemSelectionModel
--- a/E5Gui/E5MainWindow.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/E5Gui/E5MainWindow.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing a main window class with styling support.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.QtGui import QMainWindow, QStyleFactory,  QApplication
--- a/E5Gui/E5MessageBox.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/E5Gui/E5MessageBox.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing QMessageBox replacements and more convenience function.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.QtCore import Qt
 from PyQt4.QtGui import QMessageBox, QApplication
--- a/E5Gui/E5ModelMenu.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/E5Gui/E5ModelMenu.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing a menu populated from a QAbstractItemModel.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.QtCore import pyqtSignal, qVersion, Qt, QModelIndex, QPoint
 from PyQt4.QtGui import QMenu, QFontMetrics, QAction, QApplication, QDrag, \
--- a/E5Gui/E5ModelToolBar.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/E5Gui/E5ModelToolBar.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing a tool bar populated from a QAbstractItemModel.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.QtCore import pyqtSignal, qVersion, Qt, QModelIndex, QPoint, QEvent
 from PyQt4.QtGui import QApplication, QDrag, QPixmap, QToolBar, QIcon, \
--- a/E5Gui/E5PassivePopup.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/E5Gui/E5PassivePopup.py	Sat Dec 14 23:44:25 2013 +0100
@@ -8,7 +8,7 @@
 interrupting the user.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.QtCore import pyqtSignal, Qt, QTimer, QPoint, QRect
 from PyQt4.QtGui import QFrame, QVBoxLayout, QApplication
--- a/E5Gui/E5PasswordMeter.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/E5Gui/E5PasswordMeter.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing a custom widget indicating the strength of a password.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.QtGui import QProgressBar
--- a/E5Gui/E5ProgressDialog.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/E5Gui/E5ProgressDialog.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing a progress dialog allowing a customized progress bar label.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.QtCore import Qt
 from PyQt4.QtGui import QProgressBar, QProgressDialog
--- a/E5Gui/E5SideBar.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/E5Gui/E5SideBar.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing a sidebar class.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.QtCore import QEvent, QSize, Qt, QByteArray, QDataStream, \
     QIODevice, QTimer
--- a/E5Gui/E5SingleApplication.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/E5Gui/E5SingleApplication.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing the single application server and client.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 import os
--- a/E5Gui/E5SqueezeLabels.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/E5Gui/E5SqueezeLabels.py	Sat Dec 14 23:44:25 2013 +0100
@@ -8,7 +8,7 @@
 label.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.QtCore import Qt
 from PyQt4.QtGui import QLabel
--- a/E5Gui/E5TabWidget.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/E5Gui/E5TabWidget.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing a TabWidget class substituting QTabWidget.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.QtCore import Qt, QPoint, QMimeData, QByteArray, pyqtSignal
 from PyQt4.QtGui import QTabWidget, QTabBar, QApplication, QDrag, QStyle, \
--- a/E5Gui/E5TableView.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/E5Gui/E5TableView.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing specialized table views.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.QtCore import Qt
 from PyQt4.QtGui import QTableView, QItemSelectionModel
--- a/E5Gui/E5TextSpinBox.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/E5Gui/E5TextSpinBox.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing a spinbox with textual entries.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.QtGui import QSpinBox
--- a/E5Gui/E5ToolBarDialog.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/E5Gui/E5ToolBarDialog.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing a toolbar configuration dialog.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.QtCore import pyqtSlot, Qt
 from PyQt4.QtGui import QDialog, QDialogButtonBox, QTreeWidgetItem, QColor, \
--- a/E5Gui/E5ToolBarManager.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/E5Gui/E5ToolBarManager.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing a toolbar manager class.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.QtCore import QObject, QByteArray, QDataStream, QIODevice
 from PyQt4.QtGui import QToolBar
--- a/E5Gui/E5ToolBox.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/E5Gui/E5ToolBox.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing a horizontal and a vertical toolbox class.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.QtGui import QToolBox, QTabWidget
--- a/E5Gui/E5TreeSortFilterProxyModel.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/E5Gui/E5TreeSortFilterProxyModel.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing a modified QSortFilterProxyModel.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.QtCore import Qt, QModelIndex
 from PyQt4.QtGui import QSortFilterProxyModel
--- a/E5Gui/E5TreeView.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/E5Gui/E5TreeView.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing specialized tree views.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.QtCore import Qt
 from PyQt4.QtGui import QTreeView
--- a/E5Gui/E5TreeWidget.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/E5Gui/E5TreeWidget.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing specialized tree views.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.QtCore import pyqtSignal, Qt
 from PyQt4.QtGui import QTreeWidget, QTreeWidgetItem, QAbstractItemView
--- a/E5Gui/E5ZoomWidget.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/E5Gui/E5ZoomWidget.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing a zoom widget for the status bar.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.QtCore import pyqtSlot, pyqtSignal
 from PyQt4.QtGui import QWidget
--- a/E5Network/E5Ftp.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/E5Network/E5Ftp.py	Sat Dec 14 23:44:25 2013 +0100
@@ -8,7 +8,7 @@
 proxies.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 import ftplib
 from socket import _GLOBAL_DEFAULT_TIMEOUT
--- a/E5Network/E5NetworkHeaderDetailsDialog.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/E5Network/E5NetworkHeaderDetailsDialog.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing a dialog to show the data of a response or reply header.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.QtGui import QDialog
--- a/E5Network/E5NetworkMonitor.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/E5Network/E5NetworkMonitor.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing a network monitor dialog.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.QtCore import Qt, QAbstractTableModel, QModelIndex, QUrl
 from PyQt4.QtGui import QDialog, QStandardItemModel, QSortFilterProxyModel
--- a/E5Network/E5NetworkProxyFactory.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/E5Network/E5NetworkProxyFactory.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing a network proxy factory.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 import os
--- a/E5Network/E5SslCertificatesDialog.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/E5Network/E5SslCertificatesDialog.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing a dialog to show and edit all certificates.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.QtCore import pyqtSlot, Qt, QByteArray, QFile, QFileInfo, \
     QIODevice, qVersion
--- a/E5Network/E5SslCertificatesInfoDialog.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/E5Network/E5SslCertificatesInfoDialog.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing a dialog to show SSL certificate infos.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.QtGui import QDialog
--- a/E5Network/E5SslCertificatesInfoWidget.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/E5Network/E5SslCertificatesInfoWidget.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,9 +7,9 @@
 Module implementing a widget to show SSL certificate infos.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals
 try:
-    str = unicode
+    str = unicode    # __IGNORE_WARNING__
 except (NameError):
     pass
--- a/E5Network/E5SslErrorHandler.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/E5Network/E5SslErrorHandler.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing a SSL error handler.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.QtCore import qVersion, QObject, QByteArray
 from PyQt4.QtNetwork import QSslCertificate, QSslConfiguration, QSslSocket, \
--- a/E5Network/E5SslInfoWidget.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/E5Network/E5SslInfoWidget.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing a widget to show SSL information.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.QtCore import qVersion, Qt, QUrl, QPoint
 from PyQt4.QtGui import QMenu, QGridLayout, QLabel, QSizePolicy
--- a/E5Network/E5UrlInfo.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/E5Network/E5UrlInfo.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing a class replacing QUrlInfo.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.QtCore import QDateTime
--- a/E5XML/DebuggerPropertiesReader.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/E5XML/DebuggerPropertiesReader.py	Sat Dec 14 23:44:25 2013 +0100
@@ -8,7 +8,7 @@
 file.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from .Config import debuggerPropertiesFileFormatVersion
 from .XMLStreamReaderBase import XMLStreamReaderBase
--- a/E5XML/DebuggerPropertiesWriter.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/E5XML/DebuggerPropertiesWriter.py	Sat Dec 14 23:44:25 2013 +0100
@@ -8,7 +8,7 @@
 properties file.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 import time
--- a/E5XML/HighlightingStylesReader.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/E5XML/HighlightingStylesReader.py	Sat Dec 14 23:44:25 2013 +0100
@@ -8,7 +8,7 @@
 Module implementing a class for reading a highlighting styles XML file.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.QtGui import QColor, QFont
--- a/E5XML/HighlightingStylesWriter.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/E5XML/HighlightingStylesWriter.py	Sat Dec 14 23:44:25 2013 +0100
@@ -8,7 +8,7 @@
 file.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 import time
--- a/E5XML/MultiProjectReader.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/E5XML/MultiProjectReader.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing a class for reading an XML multi project file.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from .Config import multiProjectFileFormatVersion
 from .XMLStreamReaderBase import XMLStreamReaderBase
--- a/E5XML/MultiProjectWriter.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/E5XML/MultiProjectWriter.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing the writer class for writing an XML multi project file.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 import time
--- a/E5XML/PluginRepositoryReader.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/E5XML/PluginRepositoryReader.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module to read the plug-in repository contents file.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from .Config import pluginRepositoryFileFormatVersion
 from .XMLStreamReaderBase import XMLStreamReaderBase
--- a/E5XML/ProjectReader.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/E5XML/ProjectReader.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing a class for reading an XML project file.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from .Config import projectFileFormatVersion
 from .XMLStreamReaderBase import XMLStreamReaderBase
--- a/E5XML/ProjectWriter.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/E5XML/ProjectWriter.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing the writer class for writing an XML project file.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 import time
--- a/E5XML/SessionReader.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/E5XML/SessionReader.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing a class for reading an XML session file.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from E5Gui.E5Application import e5App
--- a/E5XML/SessionWriter.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/E5XML/SessionWriter.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing the writer class for writing an XML session file.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 import time
--- a/E5XML/ShortcutsReader.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/E5XML/ShortcutsReader.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing a class for reading an XML shortcuts file.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from .Config import shortcutsFileFormatVersion
 from .XMLStreamReaderBase import XMLStreamReaderBase
--- a/E5XML/ShortcutsWriter.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/E5XML/ShortcutsWriter.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing the writer class for writing an XML shortcuts file.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 import time
--- a/E5XML/TasksReader.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/E5XML/TasksReader.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing a class for reading an XML tasks file.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 import time
--- a/E5XML/TasksWriter.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/E5XML/TasksWriter.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing the writer class for writing an XML tasks file.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 import time
--- a/E5XML/TemplatesReader.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/E5XML/TemplatesReader.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing a class for reading an XML templates file.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from E5Gui.E5Application import e5App
--- a/E5XML/TemplatesWriter.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/E5XML/TemplatesWriter.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing the writer class for writing an XML templates file.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 import time
--- a/E5XML/UserProjectReader.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/E5XML/UserProjectReader.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing a class for reading an XML user project properties file.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from .Config import userProjectFileFormatVersion
 from .XMLStreamReaderBase import XMLStreamReaderBase
--- a/E5XML/UserProjectWriter.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/E5XML/UserProjectWriter.py	Sat Dec 14 23:44:25 2013 +0100
@@ -8,7 +8,7 @@
 properties file.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 import time
--- a/E5XML/XMLStreamReaderBase.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/E5XML/XMLStreamReaderBase.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing a base class for all of eric5s XML stream writers.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 import pickle
 import base64
--- a/E5XML/XMLStreamWriterBase.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/E5XML/XMLStreamWriterBase.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,9 +7,9 @@
 Module implementing a base class for all of eric5s XML stream writers.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals
 try:
-    str = unicode
+    str = unicode    # __IGNORE_WARNING__
 except (NameError):
     pass
--- a/Globals/AppInfo.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Globals/AppInfo.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing a function to generate an application info.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from UI.Info import Version
--- a/Globals/__init__.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Globals/__init__.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module defining common data to be used by all modules.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 import sys
 import os
--- a/Graphics/ApplicationDiagramBuilder.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Graphics/ApplicationDiagramBuilder.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing a dialog showing an imports diagram of the application.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 import os
 import glob
--- a/Graphics/AssociationItem.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Graphics/AssociationItem.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing a graphics item for an association between two items.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.QtCore import QPointF, QRectF, QLineF
 from PyQt4.QtGui import QGraphicsItem
--- a/Graphics/ClassItem.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Graphics/ClassItem.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing an UML like class item.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.QtGui import QFont, QGraphicsSimpleTextItem, QStyle
--- a/Graphics/GraphicsUtilities.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Graphics/GraphicsUtilities.py	Sat Dec 14 23:44:25 2013 +0100
@@ -8,7 +8,7 @@
 """


-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals


 class RecursionError(OverflowError, ValueError):
--- a/Graphics/ImportsDiagramBuilder.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Graphics/ImportsDiagramBuilder.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing a dialog showing an imports diagram of a package.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 import glob
 import os
--- a/Graphics/ModuleItem.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Graphics/ModuleItem.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing a module item.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.QtGui import QFont, QGraphicsSimpleTextItem, QStyle
--- a/Graphics/PackageDiagramBuilder.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Graphics/PackageDiagramBuilder.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,14 +7,14 @@
 Module implementing a dialog showing a UML like class diagram of a package.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 import glob
 import os.path
 try:  # Py3
     from itertools import zip_longest
 except ImportError:
-    from itertools import izip_longest as zip_longest
+    from itertools import izip_longest as zip_longest    #__IGNORE_WARNING__

 from PyQt4.QtGui import QApplication, QGraphicsTextItem
--- a/Graphics/PackageItem.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Graphics/PackageItem.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing a package item.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.QtGui import QFont, QGraphicsSimpleTextItem, QStyle
--- a/Graphics/PixmapDiagram.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Graphics/PixmapDiagram.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing a dialog showing a pixmap.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.QtCore import Qt, QSize, QEvent
 from PyQt4.QtGui import QLabel, QPalette, QSizePolicy, QScrollArea, QAction, \
--- a/Graphics/SvgDiagram.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Graphics/SvgDiagram.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing a dialog showing a SVG graphic.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.QtCore import Qt, QSize, QEvent
 from PyQt4.QtGui import QPalette, QSizePolicy, QScrollArea, QAction, QMenu, \
--- a/Graphics/UMLClassDiagramBuilder.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Graphics/UMLClassDiagramBuilder.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,11 +7,11 @@
 Module implementing a dialog showing a UML like class diagram.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals
 try:  # Py3
     from itertools import zip_longest
 except ImportError:
-    from itertools import izip_longest as zip_longest
+    from itertools import izip_longest as zip_longest    #__IGNORE_WARNING__

 from PyQt4.QtGui import QGraphicsTextItem
--- a/Graphics/UMLDiagramBuilder.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Graphics/UMLDiagramBuilder.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing the UML diagram builder base class.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.QtCore import QObject
--- a/Graphics/UMLDialog.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Graphics/UMLDialog.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing a dialog showing UML like diagrams.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.QtCore import Qt, QFileInfo
 from PyQt4.QtGui import QAction, QToolBar, QGraphicsScene
--- a/Graphics/UMLGraphicsView.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Graphics/UMLGraphicsView.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing a subclass of E5GraphicsView for our diagrams.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.QtCore import pyqtSignal, Qt, QSignalMapper, QFileInfo, QEvent, \
     QRectF
--- a/Graphics/UMLItem.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Graphics/UMLItem.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing the UMLItem base class.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.QtCore import Qt, QSizeF
 from PyQt4.QtGui import QGraphicsItem, QGraphicsRectItem, QStyle
--- a/Graphics/UMLSceneSizeDialog.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Graphics/UMLSceneSizeDialog.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing a dialog to set the scene sizes.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.QtGui import QDialog
--- a/Helpviewer/AdBlock/AdBlockAccessHandler.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Helpviewer/AdBlock/AdBlockAccessHandler.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing a scheme access handler for AdBlock URLs.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.QtCore import QUrl
 from PyQt4.QtNetwork import QNetworkAccessManager
--- a/Helpviewer/AdBlock/AdBlockBlockedNetworkReply.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Helpviewer/AdBlock/AdBlockBlockedNetworkReply.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing a QNetworkReply subclass reporting a blocked request.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.QtCore import QTimer
 from PyQt4.QtNetwork import QNetworkReply, QNetworkAccessManager
--- a/Helpviewer/AdBlock/AdBlockDialog.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Helpviewer/AdBlock/AdBlockDialog.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing the AdBlock configuration dialog.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.QtCore import pyqtSlot, QTimer, QCoreApplication
 from PyQt4.QtGui import QDialog, QMenu, QToolButton
--- a/Helpviewer/AdBlock/AdBlockExceptionsDialog.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Helpviewer/AdBlock/AdBlockExceptionsDialog.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing a dialog to configure the AdBlock exceptions.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.QtCore import pyqtSlot
 from PyQt4.QtGui import QDialog
--- a/Helpviewer/AdBlock/AdBlockIcon.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Helpviewer/AdBlock/AdBlockIcon.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing the AdBlock icon for the main window status bar.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.QtCore import Qt
 from PyQt4.QtGui import QAction, QMenu
--- a/Helpviewer/AdBlock/AdBlockManager.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Helpviewer/AdBlock/AdBlockManager.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing the AdBlock manager.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 import os
--- a/Helpviewer/AdBlock/AdBlockNetwork.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Helpviewer/AdBlock/AdBlockNetwork.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing the network block class.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.QtCore import QObject, QUrl
 from PyQt4.QtNetwork import QNetworkRequest
--- a/Helpviewer/AdBlock/AdBlockPage.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Helpviewer/AdBlock/AdBlockPage.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing a class to apply AdBlock rules to a web page.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.QtCore import QObject, QUrl
--- a/Helpviewer/AdBlock/AdBlockRule.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Helpviewer/AdBlock/AdBlockRule.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing the AdBlock rule class.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 import re
--- a/Helpviewer/AdBlock/AdBlockSubscription.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Helpviewer/AdBlock/AdBlockSubscription.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing the AdBlock subscription class.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 import os
 import re
--- a/Helpviewer/AdBlock/AdBlockTreeWidget.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Helpviewer/AdBlock/AdBlockTreeWidget.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing a tree widget for the AdBlock configuration dialog.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.QtCore import Qt
 from PyQt4.QtGui import QAbstractItemView, QFont, QTreeWidgetItem, \
--- a/Helpviewer/Bookmarks/AddBookmarkDialog.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Helpviewer/Bookmarks/AddBookmarkDialog.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing a dialog to add a bookmark or a bookmark folder.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.QtCore import QModelIndex
 from PyQt4.QtGui import QSortFilterProxyModel, QDialog, QTreeView
--- a/Helpviewer/Bookmarks/BookmarkNode.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Helpviewer/Bookmarks/BookmarkNode.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing the bookmark node.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.QtCore import QDateTime
--- a/Helpviewer/Bookmarks/BookmarkPropertiesDialog.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Helpviewer/Bookmarks/BookmarkPropertiesDialog.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing a dialog to show and edit bookmark properties.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.QtGui import QDialog
--- a/Helpviewer/Bookmarks/BookmarksDialog.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Helpviewer/Bookmarks/BookmarksDialog.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing a dialog to manage bookmarks.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.QtCore import pyqtSignal, Qt, QUrl, QModelIndex
 from PyQt4.QtGui import QDialog, QFontMetrics, QMenu, QCursor, QApplication
--- a/Helpviewer/Bookmarks/BookmarksImportDialog.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Helpviewer/Bookmarks/BookmarksImportDialog.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing a dialog for importing bookmarks from other sources.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 import os
--- a/Helpviewer/Bookmarks/BookmarksImporters/BookmarksImporter.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Helpviewer/Bookmarks/BookmarksImporters/BookmarksImporter.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing a base class for the bookmarks importers.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.QtCore import QObject
--- a/Helpviewer/Bookmarks/BookmarksImporters/ChromeImporter.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Helpviewer/Bookmarks/BookmarksImporters/ChromeImporter.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing an importer for Chrome bookmarks.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 import os
 import json
--- a/Helpviewer/Bookmarks/BookmarksImporters/FirefoxImporter.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Helpviewer/Bookmarks/BookmarksImporters/FirefoxImporter.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing an importer for Firefox bookmarks.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 import os
 import sqlite3
--- a/Helpviewer/Bookmarks/BookmarksImporters/HtmlImporter.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Helpviewer/Bookmarks/BookmarksImporters/HtmlImporter.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing an importer for HTML bookmark files.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 import os
--- a/Helpviewer/Bookmarks/BookmarksImporters/IExplorerImporter.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Helpviewer/Bookmarks/BookmarksImporters/IExplorerImporter.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing an importer for Internet Explorer bookmarks.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 import os
--- a/Helpviewer/Bookmarks/BookmarksImporters/OperaImporter.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Helpviewer/Bookmarks/BookmarksImporters/OperaImporter.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing an importer for Opera bookmarks.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 import os
--- a/Helpviewer/Bookmarks/BookmarksImporters/SafariImporter.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Helpviewer/Bookmarks/BookmarksImporters/SafariImporter.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing an importer for Apple Safari bookmarks.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 import os
--- a/Helpviewer/Bookmarks/BookmarksImporters/XbelImporter.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Helpviewer/Bookmarks/BookmarksImporters/XbelImporter.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing an importer for XBEL files.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 import os
--- a/Helpviewer/Bookmarks/BookmarksImporters/__init__.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Helpviewer/Bookmarks/BookmarksImporters/__init__.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Package implementing bookmarks importers for various sources.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.QtCore import QCoreApplication
--- a/Helpviewer/Bookmarks/BookmarksManager.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Helpviewer/Bookmarks/BookmarksManager.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing the bookmarks manager.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 import os
--- a/Helpviewer/Bookmarks/BookmarksMenu.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Helpviewer/Bookmarks/BookmarksMenu.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing the bookmarks menu.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.QtCore import pyqtSignal, Qt, QUrl
 from PyQt4.QtGui import QMenu, QCursor
--- a/Helpviewer/Bookmarks/BookmarksModel.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Helpviewer/Bookmarks/BookmarksModel.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing the bookmark model class.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.QtCore import Qt, QAbstractItemModel, QModelIndex, QUrl, \
     QByteArray, QDataStream, QIODevice, QBuffer, QMimeData
--- a/Helpviewer/Bookmarks/BookmarksToolBar.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Helpviewer/Bookmarks/BookmarksToolBar.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing a tool bar showing bookmarks.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.QtCore import pyqtSignal, Qt, QUrl
 from PyQt4.QtGui import QMenu, QApplication, QCursor
--- a/Helpviewer/Bookmarks/DefaultBookmarks_rc.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Helpviewer/Bookmarks/DefaultBookmarks_rc.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 #
 # WARNING! All changes made in this file will be lost!

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4 import QtCore
--- a/Helpviewer/Bookmarks/NsHtmlReader.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Helpviewer/Bookmarks/NsHtmlReader.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,9 +7,9 @@
 Module implementing a class to read Netscape HTML bookmark files.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals
 try:
-    str = unicode
+    str = unicode    # __IGNORE_WARNING__
 except (NameError):
     pass
--- a/Helpviewer/Bookmarks/NsHtmlWriter.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Helpviewer/Bookmarks/NsHtmlWriter.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing a class to write Netscape HTML bookmark files.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.QtCore import QObject, QIODevice, QFile
--- a/Helpviewer/Bookmarks/XbelReader.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Helpviewer/Bookmarks/XbelReader.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing a class to read XBEL bookmark files.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.QtCore import QXmlStreamReader, QXmlStreamEntityResolver, \
     QIODevice, QFile, QCoreApplication, QXmlStreamNamespaceDeclaration, \
--- a/Helpviewer/Bookmarks/XbelWriter.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Helpviewer/Bookmarks/XbelWriter.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing a class to write XBEL bookmark files.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.QtCore import QXmlStreamWriter, QIODevice, QFile, Qt
--- a/Helpviewer/ClosedTabsManager.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Helpviewer/ClosedTabsManager.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing a class to manage closed tabs.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.QtCore import pyqtSignal, QUrl, QObject
 from PyQt4.QtWebKit import QWebSettings
--- a/Helpviewer/CookieJar/CookieDetailsDialog.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Helpviewer/CookieJar/CookieDetailsDialog.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing a dialog showing the cookie data.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.QtGui import QDialog
--- a/Helpviewer/CookieJar/CookieExceptionsModel.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Helpviewer/CookieJar/CookieExceptionsModel.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing the cookie exceptions model.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.QtCore import Qt, QAbstractTableModel, QSize, QModelIndex
 from PyQt4.QtGui import QFont, QFontMetrics
--- a/Helpviewer/CookieJar/CookieJar.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Helpviewer/CookieJar/CookieJar.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing a QNetworkCookieJar subclass with various accept policies.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 import os
--- a/Helpviewer/CookieJar/CookieModel.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Helpviewer/CookieJar/CookieModel.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing the cookie model.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.QtCore import Qt, QAbstractTableModel, QSize, QModelIndex
 from PyQt4.QtGui import QFont, QFontMetrics
--- a/Helpviewer/CookieJar/CookiesConfigurationDialog.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Helpviewer/CookieJar/CookiesConfigurationDialog.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing the cookies configuration dialog.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.QtCore import pyqtSlot
 from PyQt4.QtGui import QDialog
--- a/Helpviewer/CookieJar/CookiesDialog.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Helpviewer/CookieJar/CookiesDialog.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing a dialog to show all cookies.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.QtCore import pyqtSlot, Qt, QDateTime, QByteArray
 from PyQt4.QtGui import QDialog, QFont, QFontMetrics, QSortFilterProxyModel
--- a/Helpviewer/CookieJar/CookiesExceptionsDialog.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Helpviewer/CookieJar/CookiesExceptionsDialog.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing a dialog for the configuration of cookie exceptions.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.QtCore import pyqtSlot
 from PyQt4.QtGui import QDialog, QSortFilterProxyModel, QCompleter, QFont, \
--- a/Helpviewer/Download/DownloadAskActionDialog.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Helpviewer/Download/DownloadAskActionDialog.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing a dialog to ask for a download action.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.QtGui import QDialog
--- a/Helpviewer/Download/DownloadItem.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Helpviewer/Download/DownloadItem.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,9 +7,9 @@
 Module implementing a widget controlling a download.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals
 try:
-    str = unicode
+    str = unicode    # __IGNORE_WARNING__
 except (NameError):
     pass
--- a/Helpviewer/Download/DownloadManager.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Helpviewer/Download/DownloadManager.py	Sat Dec 14 23:44:25 2013 +0100
@@ -4,7 +4,7 @@
 Module implementing the download manager class.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.QtCore import pyqtSlot, Qt, QModelIndex, QFileInfo
 from PyQt4.QtGui import QDialog, QStyle, QFileIconProvider, QMenu, QCursor, \
--- a/Helpviewer/Download/DownloadModel.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Helpviewer/Download/DownloadModel.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing the download model.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.QtCore import Qt, QAbstractListModel, QModelIndex, QMimeData, QUrl
--- a/Helpviewer/Download/DownloadUtilities.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Helpviewer/Download/DownloadUtilities.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing some utility functions for the Download package.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.QtCore import QCoreApplication
--- a/Helpviewer/Feeds/FeedEditDialog.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Helpviewer/Feeds/FeedEditDialog.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing a dialog to edit feed data.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.QtCore import pyqtSlot, QUrl
 from PyQt4.QtGui import QDialog, QDialogButtonBox
--- a/Helpviewer/Feeds/FeedsDialog.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Helpviewer/Feeds/FeedsDialog.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing a dialog to add RSS feeds.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.QtCore import QUrl
 from PyQt4.QtGui import QDialog, QPushButton, QLabel
--- a/Helpviewer/Feeds/FeedsManager.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Helpviewer/Feeds/FeedsManager.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,9 +7,9 @@
 Module implementing a RSS feeds manager dialog.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals
 try:
-    str = unicode
+    str = unicode    # __IGNORE_WARNING__
 except (NameError):
     pass
--- a/Helpviewer/GreaseMonkey/GreaseMonkeyAddScriptDialog.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Helpviewer/GreaseMonkey/GreaseMonkeyAddScriptDialog.py	Sat Dec 14 23:44:25 2013 +0100
@@ -8,7 +8,7 @@
 Module implementing a dialog for adding GreaseMonkey scripts..
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 import os
--- a/Helpviewer/GreaseMonkey/GreaseMonkeyConfiguration/GreaseMonkeyConfigurationDialog.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Helpviewer/GreaseMonkey/GreaseMonkeyConfiguration/GreaseMonkeyConfigurationDialog.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing the GreaseMonkey scripts configuration dialog.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.QtCore import pyqtSlot, Qt, QUrl
 from PyQt4.QtGui import QDialog, QListWidgetItem, QDesktopServices
--- a/Helpviewer/GreaseMonkey/GreaseMonkeyConfiguration/GreaseMonkeyConfigurationListDelegate.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Helpviewer/GreaseMonkey/GreaseMonkeyConfiguration/GreaseMonkeyConfigurationListDelegate.py	Sat Dec 14 23:44:25 2013 +0100
@@ -8,7 +8,7 @@
 scripts.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.QtCore import Qt, QSize, QRect
 from PyQt4.QtGui import QStyle, QStyledItemDelegate, QApplication, \
--- a/Helpviewer/GreaseMonkey/GreaseMonkeyConfiguration/GreaseMonkeyConfigurationListWidget.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Helpviewer/GreaseMonkey/GreaseMonkeyConfiguration/GreaseMonkeyConfigurationListWidget.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing a special list widget for GreaseMonkey scripts.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.QtCore import pyqtSignal, QRect
 from PyQt4.QtGui import QListWidget, QListWidgetItem
--- a/Helpviewer/GreaseMonkey/GreaseMonkeyConfiguration/GreaseMonkeyConfigurationScriptInfoDialog.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Helpviewer/GreaseMonkey/GreaseMonkeyConfiguration/GreaseMonkeyConfigurationScriptInfoDialog.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing a dialog to show GreaseMonkey script information.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.QtCore import pyqtSlot
 from PyQt4.QtGui import QDialog
--- a/Helpviewer/GreaseMonkey/GreaseMonkeyDownloader.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Helpviewer/GreaseMonkey/GreaseMonkeyDownloader.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing the downloader for GreaseMonkey scripts.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 import os
--- a/Helpviewer/GreaseMonkey/GreaseMonkeyJavaScript.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Helpviewer/GreaseMonkey/GreaseMonkeyJavaScript.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module containing some JavaScript resources.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 bootstrap_js = """
 if(typeof GM_xmlhttpRequest === "undefined") {
--- a/Helpviewer/GreaseMonkey/GreaseMonkeyManager.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Helpviewer/GreaseMonkey/GreaseMonkeyManager.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing the manager for GreaseMonkey scripts.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 import os
--- a/Helpviewer/GreaseMonkey/GreaseMonkeyScript.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Helpviewer/GreaseMonkey/GreaseMonkeyScript.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing the GreaseMonkey script.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.QtCore import QUrl, QRegExp
--- a/Helpviewer/GreaseMonkey/GreaseMonkeyUrlMatcher.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Helpviewer/GreaseMonkey/GreaseMonkeyUrlMatcher.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing the GreaseMonkey URL matcher.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 import re
--- a/Helpviewer/HelpBrowserWV.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Helpviewer/HelpBrowserWV.py	Sat Dec 14 23:44:25 2013 +0100
@@ -8,9 +8,9 @@
 Module implementing the helpbrowser using QWebView.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals
 try:
-    str = unicode
+    str = unicode    # __IGNORE_WARNING__
 except (NameError):
     pass
--- a/Helpviewer/HelpClearPrivateDataDialog.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Helpviewer/HelpClearPrivateDataDialog.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing a dialog to select which private data to clear.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.QtGui import QDialog
--- a/Helpviewer/HelpDocsInstaller.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Helpviewer/HelpDocsInstaller.py	Sat Dec 14 23:44:25 2013 +0100
@@ -8,7 +8,7 @@
 documentation database.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.QtCore import pyqtSignal, QThread, Qt, QMutex, QDateTime, QDir, \
     QLibraryInfo, QFileInfo
--- a/Helpviewer/HelpIndexWidget.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Helpviewer/HelpIndexWidget.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing a window for showing the QtHelp index.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.QtCore import pyqtSignal, Qt, QUrl, QEvent
 from PyQt4.QtGui import QWidget, QVBoxLayout, QLabel, QLineEdit, QMenu, QDialog
--- a/Helpviewer/HelpLanguagesDialog.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Helpviewer/HelpLanguagesDialog.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing a dialog to configure the preferred languages.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.QtCore import pyqtSlot, QByteArray, QLocale
 from PyQt4.QtGui import QDialog, QStringListModel
--- a/Helpviewer/HelpSearchWidget.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Helpviewer/HelpSearchWidget.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing a window for showing the QtHelp index.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.QtCore import pyqtSignal, Qt, QEvent, QUrl
 from PyQt4.QtGui import QWidget, QVBoxLayout, QTextBrowser, QApplication, QMenu
--- a/Helpviewer/HelpSnap.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Helpviewer/HelpSnap.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing functions to generate page previews.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.QtCore import QSize, Qt
 from PyQt4.QtGui import QPixmap, QPainter
--- a/Helpviewer/HelpTabBar.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Helpviewer/HelpTabBar.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing a specialized tab bar for the web browser.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.QtCore import Qt, QPoint, QTimer, QEvent
 from PyQt4.QtGui import QFrame, QLabel
--- a/Helpviewer/HelpTabWidget.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Helpviewer/HelpTabWidget.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing the central widget showing the web pages.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 import os
--- a/Helpviewer/HelpTocWidget.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Helpviewer/HelpTocWidget.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing a window for showing the QtHelp TOC.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.QtCore import pyqtSignal, Qt, QEvent, QUrl
 from PyQt4.QtGui import QWidget, QVBoxLayout, QMenu
--- a/Helpviewer/HelpTopicDialog.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Helpviewer/HelpTopicDialog.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing a dialog to select a help topic to display.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.QtGui import QDialog
 from PyQt4.QtCore import QUrl
--- a/Helpviewer/HelpUtilities.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Helpviewer/HelpUtilities.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing some global helper functions.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 import os
--- a/Helpviewer/HelpWebSearchWidget.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Helpviewer/HelpWebSearchWidget.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing a web search widget for the web browser.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.QtCore import pyqtSignal, QUrl, QModelIndex, QTimer, Qt
 from PyQt4.QtGui import QMenu, QStandardItem, QStandardItemModel, \
--- a/Helpviewer/HelpWindow.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Helpviewer/HelpWindow.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,9 +7,9 @@
 Module implementing the helpviewer main window.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals
 try:
-    str = unicode
+    str = unicode    # __IGNORE_WARNING__
 except (NameError):
     pass
--- a/Helpviewer/History/HistoryCompleter.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Helpviewer/History/HistoryCompleter.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing a special completer for the history.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.QtCore import Qt, QRegExp, QTimer
 from PyQt4.QtGui import QTableView, QAbstractItemView, QSortFilterProxyModel, \
--- a/Helpviewer/History/HistoryDialog.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Helpviewer/History/HistoryDialog.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing a dialog to manage history.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.QtCore import pyqtSignal, Qt, QUrl
 from PyQt4.QtGui import QDialog, QFontMetrics, QMenu, QCursor, QApplication
--- a/Helpviewer/History/HistoryFilterModel.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Helpviewer/History/HistoryFilterModel.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing the history filter model.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.QtCore import Qt, QDateTime, QModelIndex
 from PyQt4.QtGui import QAbstractProxyModel
--- a/Helpviewer/History/HistoryManager.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Helpviewer/History/HistoryManager.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing the history manager.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 import os
--- a/Helpviewer/History/HistoryMenu.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Helpviewer/History/HistoryMenu.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing the history menu.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 import sys
--- a/Helpviewer/History/HistoryModel.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Helpviewer/History/HistoryModel.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing the history model.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.QtCore import Qt, QAbstractTableModel, QModelIndex, QUrl
--- a/Helpviewer/History/HistoryTreeModel.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Helpviewer/History/HistoryTreeModel.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing the history tree model.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 import bisect
--- a/Helpviewer/JavaScriptResources.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Helpviewer/JavaScriptResources.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module containing some HTML resources.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 parseForms_js = """
 (function (){
--- a/Helpviewer/Network/AboutAccessHandler.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Helpviewer/Network/AboutAccessHandler.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing a scheme access handler for about schemes.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from .SchemeAccessHandler import SchemeAccessHandler
--- a/Helpviewer/Network/EmptyNetworkReply.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Helpviewer/Network/EmptyNetworkReply.py	Sat Dec 14 23:44:25 2013 +0100
@@ -8,7 +8,7 @@
 (i.e. request was handle other way).
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.QtCore import QTimer
 from PyQt4.QtNetwork import QNetworkReply, QNetworkAccessManager
--- a/Helpviewer/Network/EricAccessHandler.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Helpviewer/Network/EricAccessHandler.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing a scheme access handler for Python resources.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.QtCore import QFile, QByteArray
--- a/Helpviewer/Network/FileAccessHandler.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Helpviewer/Network/FileAccessHandler.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing a scheme access handler for file.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.QtCore import QFileInfo
 from PyQt4.QtNetwork import QNetworkAccessManager
--- a/Helpviewer/Network/FileReply.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Helpviewer/Network/FileReply.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,9 +7,9 @@
 Module implementing a network reply class for directory resources.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals
 try:
-    str = unicode
+    str = unicode    # __IGNORE_WARNING__
 except (NameError):
     pass
--- a/Helpviewer/Network/FollowRedirectReply.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Helpviewer/Network/FollowRedirectReply.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing a network reply delegate allowing to check redirects.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.QtCore import pyqtSignal, QObject
 from PyQt4.QtNetwork import QNetworkRequest
--- a/Helpviewer/Network/FtpAccessHandler.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Helpviewer/Network/FtpAccessHandler.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing a scheme access handler for FTP.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.QtNetwork import QNetworkAccessManager
--- a/Helpviewer/Network/FtpReply.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Helpviewer/Network/FtpReply.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,9 +7,9 @@
 Module implementing a network reply class for FTP resources.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals
 try:
-    str = unicode
+    str = unicode    # __IGNORE_WARNING__
 except (NameError):
     pass
--- a/Helpviewer/Network/NetworkAccessManager.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Helpviewer/Network/NetworkAccessManager.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing a QNetworkAccessManager subclass.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 import os
--- a/Helpviewer/Network/NetworkAccessManagerProxy.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Helpviewer/Network/NetworkAccessManagerProxy.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing a network access manager proxy for web pages.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.QtNetwork import QNetworkAccessManager, QNetworkRequest
 try:
--- a/Helpviewer/Network/NetworkDiskCache.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Helpviewer/Network/NetworkDiskCache.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing a disk cache respecting privacy.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.QtWebKit import QWebSettings
 from PyQt4.QtNetwork import QNetworkDiskCache
--- a/Helpviewer/Network/NetworkProtocolUnknownErrorReply.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Helpviewer/Network/NetworkProtocolUnknownErrorReply.py	Sat Dec 14 23:44:25 2013 +0100
@@ -8,7 +8,7 @@
 error.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.QtCore import QTimer
 from PyQt4.QtNetwork import QNetworkReply
--- a/Helpviewer/Network/NetworkReply.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Helpviewer/Network/NetworkReply.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing a network reply object for special data.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.QtCore import QTimer, QIODevice, QByteArray
 from PyQt4.QtNetwork import QNetworkReply, QNetworkRequest
--- a/Helpviewer/Network/NoCacheHostsDialog.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Helpviewer/Network/NoCacheHostsDialog.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing a dialog to manage the list of hosts not to be cached.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.QtCore import pyqtSlot, Qt
 from PyQt4.QtGui import QDialog, QStringListModel, QSortFilterProxyModel, \
--- a/Helpviewer/Network/QtHelpAccessHandler.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Helpviewer/Network/QtHelpAccessHandler.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing a scheme access handler for QtHelp.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 import mimetypes
 import os
--- a/Helpviewer/Network/SchemeAccessHandler.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Helpviewer/Network/SchemeAccessHandler.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing the base class for specific scheme access handlers.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.QtCore import QObject
--- a/Helpviewer/Network/SendRefererWhitelistDialog.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Helpviewer/Network/SendRefererWhitelistDialog.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing a dialog to manage the Send Referer whitelist.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.QtCore import pyqtSlot, Qt
 from PyQt4.QtGui import QDialog, QStringListModel, QSortFilterProxyModel, \
--- a/Helpviewer/OfflineStorage/OfflineStorageConfigDialog.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Helpviewer/OfflineStorage/OfflineStorageConfigDialog.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing a dialog to configure the offline storage.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.QtCore import pyqtSlot
 from PyQt4.QtGui import QDialog
--- a/Helpviewer/OfflineStorage/WebDatabasesDialog.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Helpviewer/OfflineStorage/WebDatabasesDialog.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing a dialog to show all web databases.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.QtCore import Qt
 from PyQt4.QtGui import QDialog, QFontMetrics
--- a/Helpviewer/OfflineStorage/WebDatabasesModel.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Helpviewer/OfflineStorage/WebDatabasesModel.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing the web databases model.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 import sys
--- a/Helpviewer/OpenSearch/DefaultSearchEngines/DefaultSearchEngines_rc.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Helpviewer/OpenSearch/DefaultSearchEngines/DefaultSearchEngines_rc.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 #
 # WARNING! All changes made in this file will be lost!

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4 import QtCore
--- a/Helpviewer/OpenSearch/OpenSearchDialog.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Helpviewer/OpenSearch/OpenSearchDialog.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing a dialog for the configuration of search engines.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.QtGui import QDialog
 from PyQt4.QtCore import pyqtSlot
--- a/Helpviewer/OpenSearch/OpenSearchEditDialog.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Helpviewer/OpenSearch/OpenSearchEditDialog.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing a dialog to edit the data of a search engine.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.QtGui import QDialog
--- a/Helpviewer/OpenSearch/OpenSearchEngine.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Helpviewer/OpenSearch/OpenSearchEngine.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing the open search engine.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 import re
 import json
--- a/Helpviewer/OpenSearch/OpenSearchEngineAction.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Helpviewer/OpenSearch/OpenSearchEngineAction.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing a QAction subclass for open search.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.QtCore import QUrl
 from PyQt4.QtGui import QPixmap, QIcon, QAction
--- a/Helpviewer/OpenSearch/OpenSearchEngineModel.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Helpviewer/OpenSearch/OpenSearchEngineModel.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing a model for search engines.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 import re
--- a/Helpviewer/OpenSearch/OpenSearchManager.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Helpviewer/OpenSearch/OpenSearchManager.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing a manager for open search engines.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 import os
--- a/Helpviewer/OpenSearch/OpenSearchReader.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Helpviewer/OpenSearch/OpenSearchReader.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing a reader for open search engine descriptions.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.QtCore import QXmlStreamReader, QIODevice, QCoreApplication
--- a/Helpviewer/OpenSearch/OpenSearchWriter.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Helpviewer/OpenSearch/OpenSearchWriter.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing a writer for open search engine descriptions.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.QtCore import QXmlStreamWriter, QIODevice
--- a/Helpviewer/PageScreenDialog.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Helpviewer/PageScreenDialog.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing a dialog to save a screenshot of a web page.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.QtCore import pyqtSlot, QFile, QFileInfo
 from PyQt4.QtGui import QDialog, QDialogButtonBox, QAbstractButton, QImage, \
--- a/Helpviewer/Passwords/LoginForm.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Helpviewer/Passwords/LoginForm.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing a data structure for login forms.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.QtCore import QUrl
--- a/Helpviewer/Passwords/PasswordManager.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Helpviewer/Passwords/PasswordManager.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing the password manager.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 import os
--- a/Helpviewer/Passwords/PasswordModel.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Helpviewer/Passwords/PasswordModel.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing a model for password management.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.QtCore import Qt, QModelIndex, QAbstractTableModel
--- a/Helpviewer/Passwords/PasswordReader.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Helpviewer/Passwords/PasswordReader.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing a class to read login data files.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.QtCore import QXmlStreamReader, QIODevice, QFile, \
     QCoreApplication, QUrl
--- a/Helpviewer/Passwords/PasswordWriter.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Helpviewer/Passwords/PasswordWriter.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing a class to write login data files.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.QtCore import QXmlStreamWriter, QIODevice, QFile
--- a/Helpviewer/Passwords/PasswordsDialog.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Helpviewer/Passwords/PasswordsDialog.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing a dialog to show all saved logins.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.QtCore import pyqtSlot
 from PyQt4.QtGui import QDialog, QFont, QFontMetrics, QSortFilterProxyModel
--- a/Helpviewer/PersonalInformationManager/PersonalDataDialog.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Helpviewer/PersonalInformationManager/PersonalDataDialog.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing a dialog to enter personal data.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.QtGui import QDialog
--- a/Helpviewer/PersonalInformationManager/PersonalInformationManager.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Helpviewer/PersonalInformationManager/PersonalInformationManager.py	Sat Dec 14 23:44:25 2013 +0100
@@ -8,7 +8,7 @@
 fields.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.QtCore import Qt, QObject
 from PyQt4.QtGui import QDialog, QMenu
--- a/Helpviewer/QtHelpDocumentationDialog.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Helpviewer/QtHelpDocumentationDialog.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing a dialog to manage the QtHelp documentation database.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.QtCore import pyqtSlot, Qt
 from PyQt4.QtGui import QDialog, QItemSelectionModel
--- a/Helpviewer/QtHelpFiltersDialog.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Helpviewer/QtHelpFiltersDialog.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing a dialog to manage the QtHelp filters.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 import sqlite3
--- a/Helpviewer/SearchWidget.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Helpviewer/SearchWidget.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing the search bar for the web browser.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.QtCore import pyqtSlot, Qt
 from PyQt4.QtGui import QWidget, QPalette, QBrush, QColor
--- a/Helpviewer/SiteInfo/SiteInfoDialog.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Helpviewer/SiteInfo/SiteInfoDialog.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing a dialog to show some information about a site.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 import os
--- a/Helpviewer/SpeedDial/Page.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Helpviewer/SpeedDial/Page.py	Sat Dec 14 23:44:25 2013 +0100
@@ -8,7 +8,7 @@
 """


-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals


 class Page(object):
--- a/Helpviewer/SpeedDial/PageThumbnailer.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Helpviewer/SpeedDial/PageThumbnailer.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing an object to create a thumbnail image of a web site.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.QtCore import pyqtSignal, QObject, QSize, Qt, QUrl
 from PyQt4.QtGui import QPixmap, QImage, QPainter
--- a/Helpviewer/SpeedDial/SpeedDial.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Helpviewer/SpeedDial/SpeedDial.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,9 +7,9 @@
 Module implementing the speed dial.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals
 try:
-    str = unicode
+    str = unicode    # __IGNORE_WARNING__
 except (NameError):
     pass
--- a/Helpviewer/SpeedDial/SpeedDialReader.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Helpviewer/SpeedDial/SpeedDialReader.py	Sat Dec 14 23:44:25 2013 +0100
@@ -8,7 +8,7 @@
 Module implementing a class to read speed dial data files.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.QtCore import QXmlStreamReader, QIODevice, QFile, QCoreApplication
--- a/Helpviewer/SpeedDial/SpeedDialWriter.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Helpviewer/SpeedDial/SpeedDialWriter.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing a class to write speed dial data files.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.QtCore import QXmlStreamWriter, QIODevice, QFile
--- a/Helpviewer/Sync/DirectorySyncHandler.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Helpviewer/Sync/DirectorySyncHandler.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing a synchronization handler using a shared directory.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 import os
--- a/Helpviewer/Sync/FtpSyncHandler.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Helpviewer/Sync/FtpSyncHandler.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing a synchronization handler using FTP.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 import ftplib
 import io
--- a/Helpviewer/Sync/SyncAssistantDialog.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Helpviewer/Sync/SyncAssistantDialog.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing a wizard dialog to enter the synchronization data.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.QtGui import QWizard
--- a/Helpviewer/Sync/SyncCheckPage.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Helpviewer/Sync/SyncCheckPage.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing the synchronization status wizard page.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 import os
--- a/Helpviewer/Sync/SyncDataPage.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Helpviewer/Sync/SyncDataPage.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing the synchronization data wizard page.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.QtGui import QWizardPage
--- a/Helpviewer/Sync/SyncDirectorySettingsPage.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Helpviewer/Sync/SyncDirectorySettingsPage.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing the synchronization shared directory settings wizard page.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.QtCore import pyqtSlot
 from PyQt4.QtGui import QWizardPage
--- a/Helpviewer/Sync/SyncEncryptionPage.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Helpviewer/Sync/SyncEncryptionPage.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing encryption settings wizard page.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.QtCore import pyqtSlot
 from PyQt4.QtGui import QWizardPage
--- a/Helpviewer/Sync/SyncFtpSettingsPage.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Helpviewer/Sync/SyncFtpSettingsPage.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing the synchronization FTP host settings wizard page.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.QtGui import QWizardPage
--- a/Helpviewer/Sync/SyncHandler.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Helpviewer/Sync/SyncHandler.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module containing a base class for synchronization handlers.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 import os
--- a/Helpviewer/Sync/SyncHostTypePage.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Helpviewer/Sync/SyncHostTypePage.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing the synchronization host type wizard page.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.QtGui import QWizardPage
--- a/Helpviewer/Sync/SyncManager.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Helpviewer/Sync/SyncManager.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing the synchronization manager class.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.QtCore import QObject, pyqtSignal
--- a/Helpviewer/UrlBar/BookmarkActionSelectionDialog.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Helpviewer/UrlBar/BookmarkActionSelectionDialog.py	Sat Dec 14 23:44:25 2013 +0100
@@ -8,7 +8,7 @@
 bookmark.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.QtCore import pyqtSlot
 from PyQt4.QtGui import QDialog
--- a/Helpviewer/UrlBar/BookmarkInfoDialog.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Helpviewer/UrlBar/BookmarkInfoDialog.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing a dialog to show some bookmark info.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.QtCore import pyqtSlot
 from PyQt4.QtGui import QDialog, QFont
--- a/Helpviewer/UrlBar/FavIconLabel.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Helpviewer/UrlBar/FavIconLabel.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,9 +7,9 @@
 Module implementing the label to show the web site icon.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals
 try:
-    str = unicode
+    str = unicode    # __IGNORE_WARNING__
 except (NameError):
     pass
--- a/Helpviewer/UrlBar/SslLabel.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Helpviewer/UrlBar/SslLabel.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing the label to show some SSL info.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.QtCore import Qt, pyqtSignal, QPoint
 from PyQt4.QtGui import QLabel
--- a/Helpviewer/UrlBar/StackedUrlBar.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Helpviewer/UrlBar/StackedUrlBar.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing a widget to stack url bars.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.QtGui import QStackedWidget, QSizePolicy
--- a/Helpviewer/UrlBar/UrlBar.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Helpviewer/UrlBar/UrlBar.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,9 +7,9 @@
 Module implementing the URL bar widget.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals
 try:
-    str = unicode
+    str = unicode    # __IGNORE_WARNING__
 except (NameError):
     pass
--- a/Helpviewer/UserAgent/UserAgentDefaults_rc.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Helpviewer/UserAgent/UserAgentDefaults_rc.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 #
 # WARNING! All changes made in this file will be lost!

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4 import QtCore
--- a/Helpviewer/UserAgent/UserAgentManager.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Helpviewer/UserAgent/UserAgentManager.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing a user agent manager.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 import os
--- a/Helpviewer/UserAgent/UserAgentMenu.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Helpviewer/UserAgent/UserAgentMenu.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing a menu to select the user agent string.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.QtCore import QXmlStreamReader, QFile, QIODevice
 from PyQt4.QtGui import QMenu, QAction, QActionGroup, QInputDialog, QLineEdit
--- a/Helpviewer/UserAgent/UserAgentModel.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Helpviewer/UserAgent/UserAgentModel.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing a model for user agent management.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.QtCore import Qt, QModelIndex, QAbstractTableModel
--- a/Helpviewer/UserAgent/UserAgentReader.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Helpviewer/UserAgent/UserAgentReader.py	Sat Dec 14 23:44:25 2013 +0100
@@ -8,7 +8,7 @@
 Module implementing a class to read user agent data files.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.QtCore import QXmlStreamReader, QIODevice, QFile, QCoreApplication
--- a/Helpviewer/UserAgent/UserAgentWriter.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Helpviewer/UserAgent/UserAgentWriter.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing a class to write user agent data files.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.QtCore import QXmlStreamWriter, QIODevice, QFile
--- a/Helpviewer/UserAgent/UserAgentsDialog.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Helpviewer/UserAgent/UserAgentsDialog.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing a dialog to show all saved user agent settings.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.QtGui import QDialog, QFont, QFontMetrics, QSortFilterProxyModel
--- a/Helpviewer/VirusTotalApi.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Helpviewer/VirusTotalApi.py	Sat Dec 14 23:44:25 2013 +0100
@@ -8,9 +8,9 @@
 API class.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals
 try:
-    str = unicode
+    str = unicode    # __IGNORE_WARNING__
 except (NameError):
     pass
--- a/Helpviewer/WebPlugins/ClickToFlash/ClickToFlash.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Helpviewer/WebPlugins/ClickToFlash/ClickToFlash.py	Sat Dec 14 23:44:25 2013 +0100
@@ -8,7 +8,7 @@
 """


-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.QtCore import pyqtSlot, QUrl, Qt, QByteArray,  QTimer
 from PyQt4.QtGui import QWidget, QMenu, QCursor, QDialog, QLabel, QFormLayout
--- a/Helpviewer/WebPlugins/ClickToFlash/ClickToFlashPlugin.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Helpviewer/WebPlugins/ClickToFlash/ClickToFlashPlugin.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing the Flash blocker plug-in.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.QtGui import QDialog
 from PyQt4.QtWebKit import QWebPluginFactory
--- a/Helpviewer/WebPlugins/ClickToFlash/ClickToFlashWhitelistDialog.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Helpviewer/WebPlugins/ClickToFlash/ClickToFlashWhitelistDialog.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing a dialog to manage the ClickToFlash whitelist.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.QtCore import pyqtSlot, Qt
 from PyQt4.QtGui import QDialog, QStringListModel, QSortFilterProxyModel, \
--- a/Helpviewer/WebPlugins/WebPluginFactory.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Helpviewer/WebPlugins/WebPluginFactory.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing the web plug-in factory.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.QtWebKit import QWebPluginFactory
--- a/Helpviewer/WebPlugins/WebPluginInterface.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Helpviewer/WebPlugins/WebPluginInterface.py	Sat Dec 14 23:44:25 2013 +0100
@@ -8,7 +8,7 @@
 """


-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals


 class WebPluginInterface(object):
--- a/Helpviewer/data/html_rc.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Helpviewer/data/html_rc.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 #
 # WARNING! All changes made in this file will be lost!

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4 import QtCore
--- a/Helpviewer/data/icons_rc.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Helpviewer/data/icons_rc.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 #
 # WARNING! All changes made in this file will be lost!

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4 import QtCore
--- a/Helpviewer/data/javascript_rc.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Helpviewer/data/javascript_rc.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 #
 # WARNING! All changes made in this file will be lost!

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4 import QtCore
--- a/IconEditor/IconEditorGrid.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/IconEditor/IconEditorGrid.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing the icon editor grid.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.QtCore import pyqtSignal, Qt, QPoint, QRect, QSize
 from PyQt4.QtGui import QUndoCommand, QImage, QWidget, QColor, QPixmap, \
--- a/IconEditor/IconEditorPalette.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/IconEditor/IconEditorPalette.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing a palette widget for the icon editor.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.QtCore import pyqtSignal, Qt
 from PyQt4.QtGui import QWidget, QColor, QPainter, QBoxLayout, QLabel, \
--- a/IconEditor/IconEditorWindow.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/IconEditor/IconEditorWindow.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing the icon editor main window.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 import os
--- a/IconEditor/IconSizeDialog.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/IconEditor/IconSizeDialog.py	Sat Dec 14 23:44:25 2013 +0100
@@ -4,7 +4,7 @@
 Module implementing a dialog to enter the icon size.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.QtGui import QDialog
--- a/IconEditor/cursors/cursors_rc.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/IconEditor/cursors/cursors_rc.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 #
 # WARNING! All changes made in this file will be lost!

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4 import QtCore
--- a/MultiProject/AddProjectDialog.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/MultiProject/AddProjectDialog.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing the add project dialog.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.QtCore import pyqtSlot
 from PyQt4.QtGui import QDialog, QDialogButtonBox
--- a/MultiProject/MultiProject.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/MultiProject/MultiProject.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing the multi project management functionality.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 import os
--- a/MultiProject/MultiProjectBrowser.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/MultiProject/MultiProjectBrowser.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing the multi project browser.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.QtCore import Qt
 from PyQt4.QtGui import QListWidget, QListWidgetItem, QDialog, QMenu
--- a/MultiProject/PropertiesDialog.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/MultiProject/PropertiesDialog.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing the multi project properties dialog.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.QtGui import QDialog
--- a/Network/IRC/IrcChannelEditDialog.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Network/IRC/IrcChannelEditDialog.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing a dialog to edit channel data.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.QtCore import pyqtSlot
 from PyQt4.QtGui import QDialog, QDialogButtonBox
--- a/Network/IRC/IrcChannelWidget.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Network/IRC/IrcChannelWidget.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing the IRC channel widget.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 import re
--- a/Network/IRC/IrcIdentitiesEditDialog.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Network/IRC/IrcIdentitiesEditDialog.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing the identities management dialog.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 import copy
--- a/Network/IRC/IrcMessageEdit.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Network/IRC/IrcMessageEdit.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing a specialized line edit for entering IRC messages.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.QtCore import Qt
--- a/Network/IRC/IrcNetworkEditDialog.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Network/IRC/IrcNetworkEditDialog.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing a dialog for editing IRC network definitions.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 import copy
--- a/Network/IRC/IrcNetworkListDialog.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Network/IRC/IrcNetworkListDialog.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing a dialog to list the configured IRC networks.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.QtCore import pyqtSlot
 from PyQt4.QtGui import QDialog, QTreeWidgetItem
--- a/Network/IRC/IrcNetworkManager.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Network/IRC/IrcNetworkManager.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing the IRC data structures and their manager.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 import copy
--- a/Network/IRC/IrcNetworkWidget.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Network/IRC/IrcNetworkWidget.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing the network part of the IRC widget.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.QtCore import pyqtSlot, pyqtSignal, QPoint, QFileInfo, QUrl
 from PyQt4.QtGui import QWidget, QApplication, QMenu, QDesktopServices
--- a/Network/IRC/IrcServerEditDialog.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Network/IRC/IrcServerEditDialog.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing a dialog for editing the IRC server configuration.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.QtCore import pyqtSlot
 from PyQt4.QtGui import QDialog, QDialogButtonBox
--- a/Network/IRC/IrcUtilities.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Network/IRC/IrcUtilities.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing functions used by several IRC objects.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 import re
--- a/Network/IRC/IrcWidget.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Network/IRC/IrcWidget.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,9 +7,9 @@
 Module implementing the IRC window.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals
 try:
-    str = unicode
+    str = unicode    # __IGNORE_WARNING__
 except (NameError):
     pass
--- a/PluginManager/PluginDetailsDialog.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/PluginManager/PluginDetailsDialog.py	Sat Dec 14 23:44:25 2013 +0100
@@ -8,7 +8,7 @@
 Module implementing the Plugin Details Dialog.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.QtGui import QDialog
 from PyQt4.QtCore import pyqtSlot
--- a/PluginManager/PluginExceptions.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/PluginManager/PluginExceptions.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing the exceptions raised by the plugin system.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.QtGui import QApplication
--- a/PluginManager/PluginInfoDialog.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/PluginManager/PluginInfoDialog.py	Sat Dec 14 23:44:25 2013 +0100
@@ -8,7 +8,7 @@
 Module implementing the Plugin Info Dialog.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.QtCore import pyqtSlot, Qt
 from PyQt4.QtGui import QDialog, QTreeWidgetItem, QHeaderView, QMenu, QBrush
--- a/PluginManager/PluginInstallDialog.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/PluginManager/PluginInstallDialog.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing the Plugin installation dialog.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 import os
 import sys
@@ -18,7 +18,7 @@
 try:  # Py3
     import urllib.parse as parse
 except (ImportError):
-    import urlparse as parse
+    import urlparse as parse    # __IGNORE_WARNING__

 from PyQt4.QtCore import pyqtSlot, Qt, QDir, QFileInfo
 from PyQt4.QtGui import QWidget, QDialogButtonBox, QAbstractButton, \
--- a/PluginManager/PluginManager.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/PluginManager/PluginManager.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing the Plugin Manager.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 import os
 import sys
--- a/PluginManager/PluginRepositoryDialog.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/PluginManager/PluginRepositoryDialog.py	Sat Dec 14 23:44:25 2013 +0100
@@ -8,7 +8,7 @@
 Module implementing a dialog showing the available plugins.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 import sys
 import os
--- a/PluginManager/PluginUninstallDialog.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/PluginManager/PluginUninstallDialog.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing a dialog for plugin deinstallation.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 import sys
 import os
--- a/Plugins/AboutPlugin/AboutDialog.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Plugins/AboutPlugin/AboutDialog.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing an 'About Eric' dialog.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.QtGui import QApplication, QDialog
--- a/Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleChecker.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleChecker.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,10 +7,10 @@
 Module implementing the code style checker.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 try:
-    str = unicode
+    str = unicode    # __IGNORE_WARNING__
 except (NameError):
     pass
--- a/Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing a dialog to show the results of the code style check.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 import os
 import fnmatch
--- a/Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCodeSelectionDialog.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCodeSelectionDialog.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing a dialog to select code style message codes.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.QtCore import QCoreApplication
 from PyQt4.QtGui import QDialog, QTreeWidgetItem
--- a/Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleFixer.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleFixer.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing a class to fix certain code style issues.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 import os
 import re
--- a/Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleStatisticsDialog.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleStatisticsDialog.py	Sat Dec 14 23:44:25 2013 +0100
@@ -8,7 +8,7 @@
 style checker run.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.QtCore import Qt, QCoreApplication
 from PyQt4.QtGui import QDialog, QTreeWidgetItem
--- a/Plugins/CheckerPlugins/CodeStyleChecker/DocStyleChecker.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Plugins/CheckerPlugins/CodeStyleChecker/DocStyleChecker.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing a checker for documentation string conventions.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 #
 # The routines of the checker class are modeled after the ones found in
--- a/Plugins/CheckerPlugins/CodeStyleChecker/NamingStyleChecker.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Plugins/CheckerPlugins/CodeStyleChecker/NamingStyleChecker.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing a checker for naming conventions.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 import collections
 import ast
--- a/Plugins/CheckerPlugins/CodeStyleChecker/pep8.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Plugins/CheckerPlugins/CodeStyleChecker/pep8.py	Sat Dec 14 23:44:25 2013 +0100
@@ -48,7 +48,7 @@
 900 syntax error
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 #
 # This is a modified version to make the original pep8.py better suitable
--- a/Plugins/CheckerPlugins/SyntaxChecker/SyntaxCheckerDialog.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Plugins/CheckerPlugins/SyntaxChecker/SyntaxCheckerDialog.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing a simple Python syntax checker.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 import os
 import fnmatch
--- a/Plugins/CheckerPlugins/Tabnanny/Tabnanny.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Plugins/CheckerPlugins/Tabnanny/Tabnanny.py	Sat Dec 14 23:44:25 2013 +0100
@@ -18,7 +18,7 @@
 @exception ValueError The tokenize module is too old.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 # Released to the public domain, by Tim Peters, 15 April 1998.
--- a/Plugins/CheckerPlugins/Tabnanny/TabnannyDialog.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Plugins/CheckerPlugins/Tabnanny/TabnannyDialog.py	Sat Dec 14 23:44:25 2013 +0100
@@ -8,7 +8,7 @@
 process.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals
 try:
     str = unicode   # __IGNORE_WARNING__
 except (NameError):
--- a/Plugins/DocumentationPlugins/Ericapi/EricapiConfigDialog.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Plugins/DocumentationPlugins/Ericapi/EricapiConfigDialog.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing a dialog to enter the parameters for eric5_api.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 import sys
 import os
--- a/Plugins/DocumentationPlugins/Ericapi/EricapiExecDialog.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Plugins/DocumentationPlugins/Ericapi/EricapiExecDialog.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,9 +7,9 @@
 Module implementing a dialog to show the output of the ericapi process.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals
 try:
-    str = unicode
+    str = unicode    # __IGNORE_WARNING__
 except (NameError):
     pass
--- a/Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing a dialog to enter the parameters for eric5_doc.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 import sys
 import os
--- a/Plugins/DocumentationPlugins/Ericdoc/EricdocExecDialog.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Plugins/DocumentationPlugins/Ericdoc/EricdocExecDialog.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,9 +7,9 @@
 Module implementing a dialog to show the output of the ericdoc process.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals
 try:
-    str = unicode
+    str = unicode    # __IGNORE_WARNING__
 except (NameError):
     pass
--- a/Plugins/PluginAbout.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Plugins/PluginAbout.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing the About plugin.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.QtCore import QObject
 from PyQt4.QtGui import QAction
--- a/Plugins/PluginCodeStyleChecker.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Plugins/PluginCodeStyleChecker.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing the code style checker plug-in.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 import os
--- a/Plugins/PluginEricapi.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Plugins/PluginEricapi.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing the Ericapi plugin.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 import os
--- a/Plugins/PluginEricdoc.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Plugins/PluginEricdoc.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing the Ericdoc plugin.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 import os
--- a/Plugins/PluginSyntaxChecker.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Plugins/PluginSyntaxChecker.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing the Syntax Checker plugin.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 import os
--- a/Plugins/PluginTabnanny.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Plugins/PluginTabnanny.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing the Tabnanny plugin.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 import os
--- a/Plugins/PluginVcsMercurial.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Plugins/PluginVcsMercurial.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing the Mercurial version control plugin.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 import os
--- a/Plugins/PluginVcsPySvn.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Plugins/PluginVcsPySvn.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing the PySvn version control plugin.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 import os
--- a/Plugins/PluginVcsSubversion.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Plugins/PluginVcsSubversion.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing the Subversion version control plugin.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 import os
--- a/Plugins/PluginVmListspace.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Plugins/PluginVmListspace.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing the Tabview view manager plugin.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 import os
--- a/Plugins/PluginVmTabview.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Plugins/PluginVmTabview.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing the Tabview view manager plugin.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 import os
--- a/Plugins/PluginWizardE5MessageBox.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Plugins/PluginWizardE5MessageBox.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing the E5MessageBox wizard plugin.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.QtCore import QObject
 from PyQt4.QtGui import QDialog
--- a/Plugins/PluginWizardPyRegExp.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Plugins/PluginWizardPyRegExp.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing the Python re wizard plugin.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.QtCore import QObject
 from PyQt4.QtGui import QDialog
--- a/Plugins/PluginWizardQColorDialog.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Plugins/PluginWizardQColorDialog.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing the QColorDialog wizard plugin.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.QtCore import QObject
 from PyQt4.QtGui import QDialog
--- a/Plugins/PluginWizardQFileDialog.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Plugins/PluginWizardQFileDialog.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing the QFileDialog wizard plugin.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 import re
--- a/Plugins/PluginWizardQFontDialog.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Plugins/PluginWizardQFontDialog.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing the QFontDialog wizard plugin.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.QtCore import QObject
 from PyQt4.QtGui import QDialog
--- a/Plugins/PluginWizardQInputDialog.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Plugins/PluginWizardQInputDialog.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing the QInputDialog wizard plugin.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.QtCore import QObject
 from PyQt4.QtGui import QDialog
--- a/Plugins/PluginWizardQMessageBox.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Plugins/PluginWizardQMessageBox.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing the QMessageBox wizard plugin.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.QtCore import QObject
 from PyQt4.QtGui import QDialog
--- a/Plugins/PluginWizardQRegExp.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Plugins/PluginWizardQRegExp.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing the QRegExp wizard plugin.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.QtCore import QObject
 from PyQt4.QtGui import QDialog
--- a/Plugins/PluginWizardQRegularExpression.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Plugins/PluginWizardQRegularExpression.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing the QRegularExpression wizard plugin.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.QtCore import QObject
 from PyQt4.QtGui import QDialog
--- a/Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkDialog.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkDialog.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing the bookmark dialog.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.QtCore import pyqtSlot
 from PyQt4.QtGui import QDialog, QDialogButtonBox
--- a/Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkRenameDialog.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkRenameDialog.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing a dialog to get the data to rename a bookmark.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.QtCore import pyqtSlot
 from PyQt4.QtGui import QDialog, QDialogButtonBox
--- a/Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarksInOutDialog.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarksInOutDialog.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,9 +7,9 @@
 Module implementing a dialog to show a list of incoming or outgoing bookmarks.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals
 try:
-    str = unicode
+    str = unicode    # __IGNORE_WARNING__
 except (NameError):
     pass
--- a/Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarksListDialog.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarksListDialog.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,9 +7,9 @@
 Module implementing a dialog to show a list of bookmarks.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals
 try:
-    str = unicode
+    str = unicode    # __IGNORE_WARNING__
 except (NameError):
     pass
--- a/Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/ProjectHelper.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/ProjectHelper.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing the bookmarks extension project helper.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.QtGui import QMenu
--- a/Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,9 +7,9 @@
 Module implementing the bookmarks extension interface.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals
 try:
-    str = unicode
+    str = unicode    # __IGNORE_WARNING__
 except (NameError):
     pass
--- a/Plugins/VcsPlugins/vcsMercurial/Config.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Plugins/VcsPlugins/vcsMercurial/Config.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module defining configuration variables for the Mercurial package.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 # Available protocols fpr the repository URL
 ConfigHgProtocols = [
--- a/Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing the Mercurial configuration page.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 import os
--- a/Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialUserDataDialog.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialUserDataDialog.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing a dialog to enter the user data for a minimal hgrc file.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.QtGui import QDialog
--- a/Plugins/VcsPlugins/vcsMercurial/FetchExtension/HgFetchDialog.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Plugins/VcsPlugins/vcsMercurial/FetchExtension/HgFetchDialog.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing a dialog to enter data to be used for a fetch operation.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.QtCore import pyqtSlot
 from PyQt4.QtGui import QDialog
--- a/Plugins/VcsPlugins/vcsMercurial/FetchExtension/ProjectHelper.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Plugins/VcsPlugins/vcsMercurial/FetchExtension/ProjectHelper.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing the fetch extension project helper.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.QtGui import QMenu
--- a/Plugins/VcsPlugins/vcsMercurial/FetchExtension/fetch.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Plugins/VcsPlugins/vcsMercurial/FetchExtension/fetch.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing the fetch extension interface.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 import os
--- a/Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing a dialog to enter data for signing a revision.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.QtCore import pyqtSlot
 from PyQt4.QtGui import QDialog, QDialogButtonBox
--- a/Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,9 +7,9 @@
 Module implementing a dialog showing signed changesets.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals
 try:
-    str = unicode
+    str = unicode    # __IGNORE_WARNING__
 except (NameError):
     pass
--- a/Plugins/VcsPlugins/vcsMercurial/GpgExtension/ProjectHelper.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Plugins/VcsPlugins/vcsMercurial/GpgExtension/ProjectHelper.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing the gpg extension project helper.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.QtGui import QMenu
--- a/Plugins/VcsPlugins/vcsMercurial/GpgExtension/gpg.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Plugins/VcsPlugins/vcsMercurial/GpgExtension/gpg.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing the gpg extension interface.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 import os
--- a/Plugins/VcsPlugins/vcsMercurial/HgAddSubrepositoryDialog.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Plugins/VcsPlugins/vcsMercurial/HgAddSubrepositoryDialog.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing a dialog to add a sub-repository.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 import os
--- a/Plugins/VcsPlugins/vcsMercurial/HgAnnotateDialog.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Plugins/VcsPlugins/vcsMercurial/HgAnnotateDialog.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,9 +7,9 @@
 Module implementing a dialog to show the output of the hg annotate command.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals
 try:
-    str = unicode
+    str = unicode    # __IGNORE_WARNING__
 except (NameError):
     pass
--- a/Plugins/VcsPlugins/vcsMercurial/HgArchiveDialog.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Plugins/VcsPlugins/vcsMercurial/HgArchiveDialog.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing a dialog to enter the archive data.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.QtCore import pyqtSlot, QFileInfo
 from PyQt4.QtGui import QDialog, QDialogButtonBox
--- a/Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing a dialog to enter the data for a backout operation.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.QtCore import pyqtSlot, QDateTime
 from PyQt4.QtGui import QDialog, QDialogButtonBox
--- a/Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing a dialog to enter the data for a bundle operation.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.QtCore import pyqtSlot
 from PyQt4.QtGui import QDialog, QDialogButtonBox
--- a/Plugins/VcsPlugins/vcsMercurial/HgClient.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Plugins/VcsPlugins/vcsMercurial/HgClient.py	Sat Dec 14 23:44:25 2013 +0100
@@ -8,7 +8,7 @@
 """

 try:
-    str = unicode
+    str = unicode    # __IGNORE_WARNING__
 except (NameError):
     pass
--- a/Plugins/VcsPlugins/vcsMercurial/HgClientPromptDialog.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Plugins/VcsPlugins/vcsMercurial/HgClientPromptDialog.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing a prompt dialog for the Mercurial command server.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.QtCore import pyqtSlot
 from PyQt4.QtGui import QDialog, QDialogButtonBox, QTextCursor
--- a/Plugins/VcsPlugins/vcsMercurial/HgCommandDialog.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Plugins/VcsPlugins/vcsMercurial/HgCommandDialog.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing the Mercurial command dialog.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.QtGui import QDialog, QDialogButtonBox
--- a/Plugins/VcsPlugins/vcsMercurial/HgCommitDialog.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Plugins/VcsPlugins/vcsMercurial/HgCommitDialog.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing a dialog to enter the commit message.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.QtCore import pyqtSlot, pyqtSignal, Qt
 from PyQt4.QtGui import QWidget, QDialogButtonBox
--- a/Plugins/VcsPlugins/vcsMercurial/HgCopyDialog.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Plugins/VcsPlugins/vcsMercurial/HgCopyDialog.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing a dialog to enter the data for a copy or rename operation.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 import os.path
--- a/Plugins/VcsPlugins/vcsMercurial/HgDialog.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Plugins/VcsPlugins/vcsMercurial/HgDialog.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,9 +7,9 @@
 Module implementing a dialog starting a process and showing its output.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals
 try:
-    str = unicode
+    str = unicode    # __IGNORE_WARNING__
 except (NameError):
     pass
--- a/Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,9 +7,9 @@
 Module implementing a dialog to show the output of the hg diff command process.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals
 try:
-    str = unicode
+    str = unicode    # __IGNORE_WARNING__
 except (NameError):
     pass
--- a/Plugins/VcsPlugins/vcsMercurial/HgExportDialog.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Plugins/VcsPlugins/vcsMercurial/HgExportDialog.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing a dialog to enter data for the Mercurial export command.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 import os
--- a/Plugins/VcsPlugins/vcsMercurial/HgExtension.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Plugins/VcsPlugins/vcsMercurial/HgExtension.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing the base class for Mercurial extension interfaces.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.QtCore import QObject
--- a/Plugins/VcsPlugins/vcsMercurial/HgExtensionProjectHelper.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Plugins/VcsPlugins/vcsMercurial/HgExtensionProjectHelper.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing the project helper base for Mercurial extension interfaces.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.QtCore import QObject
--- a/Plugins/VcsPlugins/vcsMercurial/HgGraftDialog.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Plugins/VcsPlugins/vcsMercurial/HgGraftDialog.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing a dialog to enter the data for a graft session.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.QtCore import pyqtSlot, QDateTime
 from PyQt4.QtGui import QDialog, QDialogButtonBox
--- a/Plugins/VcsPlugins/vcsMercurial/HgImportDialog.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Plugins/VcsPlugins/vcsMercurial/HgImportDialog.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing a dialog to enter data for the Mercurial import command.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.QtCore import pyqtSlot, QDateTime
 from PyQt4.QtGui import QDialog, QDialogButtonBox
--- a/Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,9 +7,9 @@
 Module implementing a dialog to browse the log history.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals
 try:
-    str = unicode
+    str = unicode    # __IGNORE_WARNING__
 except (NameError):
     pass
--- a/Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,9 +7,9 @@
 Module implementing a dialog to show the output of the hg log command process.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals
 try:
-    str = unicode
+    str = unicode    # __IGNORE_WARNING__
 except (NameError):
     pass
--- a/Plugins/VcsPlugins/vcsMercurial/HgMergeDialog.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Plugins/VcsPlugins/vcsMercurial/HgMergeDialog.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing a dialog to enter the data for a merge operation.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.QtCore import pyqtSlot
 from PyQt4.QtGui import QDialog, QDialogButtonBox
--- a/Plugins/VcsPlugins/vcsMercurial/HgMultiRevisionSelectionDialog.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Plugins/VcsPlugins/vcsMercurial/HgMultiRevisionSelectionDialog.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing a dialog to select revisions.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.QtCore import pyqtSlot
 from PyQt4.QtGui import QDialog, QDialogButtonBox
--- a/Plugins/VcsPlugins/vcsMercurial/HgNewProjectOptionsDialog.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Plugins/VcsPlugins/vcsMercurial/HgNewProjectOptionsDialog.py	Sat Dec 14 23:44:25 2013 +0100
@@ -8,7 +8,7 @@
 repository.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 import os
--- a/Plugins/VcsPlugins/vcsMercurial/HgOptionsDialog.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Plugins/VcsPlugins/vcsMercurial/HgOptionsDialog.py	Sat Dec 14 23:44:25 2013 +0100
@@ -8,7 +8,7 @@
 the VCS.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.QtGui import QDialog
--- a/Plugins/VcsPlugins/vcsMercurial/HgPhaseDialog.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Plugins/VcsPlugins/vcsMercurial/HgPhaseDialog.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing a dialog to enter data for the Mercurial Phase operation.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.QtCore import pyqtSlot
 from PyQt4.QtGui import QDialog, QDialogButtonBox
--- a/Plugins/VcsPlugins/vcsMercurial/HgRemoveSubrepositoriesDialog.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Plugins/VcsPlugins/vcsMercurial/HgRemoveSubrepositoriesDialog.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing a dialog to remove sub-repositories.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.QtCore import pyqtSlot
 from PyQt4.QtGui import QDialog
--- a/Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing a dialog to select a revision.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.QtCore import pyqtSlot
 from PyQt4.QtGui import QDialog, QDialogButtonBox
--- a/Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing a dialog to enter the revisions for the hg diff command.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.QtCore import pyqtSlot
 from PyQt4.QtGui import QDialog, QDialogButtonBox
--- a/Plugins/VcsPlugins/vcsMercurial/HgServeDialog.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Plugins/VcsPlugins/vcsMercurial/HgServeDialog.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,9 +7,9 @@
 Module implementing a dialog for the Mercurial server.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals
 try:
-    str = unicode
+    str = unicode    # __IGNORE_WARNING__
 except (NameError):
     pass
--- a/Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py	Sat Dec 14 23:44:25 2013 +0100
@@ -8,9 +8,9 @@
 process.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals
 try:
-    str = unicode
+    str = unicode    # __IGNORE_WARNING__
 except (NameError):
     pass
--- a/Plugins/VcsPlugins/vcsMercurial/HgStatusMonitorThread.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Plugins/VcsPlugins/vcsMercurial/HgStatusMonitorThread.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,9 +7,9 @@
 Module implementing the VCS status monitor thread class for Mercurial.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals
 try:
-    str = unicode
+    str = unicode    # __IGNORE_WARNING__
 except (NameError):
     pass
--- a/Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py	Sat Dec 14 23:44:25 2013 +0100
@@ -8,9 +8,9 @@
 directory state.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals
 try:
-    str = unicode
+    str = unicode    # __IGNORE_WARNING__
 except (NameError):
     pass
--- a/Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,9 +7,9 @@
 Module implementing a dialog to show a list of tags or branches.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals
 try:
-    str = unicode
+    str = unicode    # __IGNORE_WARNING__
 except (NameError):
     pass
--- a/Plugins/VcsPlugins/vcsMercurial/HgTagDialog.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Plugins/VcsPlugins/vcsMercurial/HgTagDialog.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing a dialog to enter the data for a tagging operation.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.QtCore import pyqtSlot
 from PyQt4.QtGui import QDialog, QDialogButtonBox
--- a/Plugins/VcsPlugins/vcsMercurial/HgUtilities.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Plugins/VcsPlugins/vcsMercurial/HgUtilities.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing some common utility functions for the Mercurial package.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 import os
--- a/Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing the VCS project browser helper for Mercurial.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 import os
--- a/Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing the VCS project helper for Mercurial.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 import os
--- a/Plugins/VcsPlugins/vcsMercurial/PurgeExtension/HgPurgeListDialog.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Plugins/VcsPlugins/vcsMercurial/PurgeExtension/HgPurgeListDialog.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing a dialog to list all files not tracked by Mercurial.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.QtGui import QDialog
--- a/Plugins/VcsPlugins/vcsMercurial/PurgeExtension/ProjectHelper.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Plugins/VcsPlugins/vcsMercurial/PurgeExtension/ProjectHelper.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing the purge extension project helper.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.QtGui import QMenu
--- a/Plugins/VcsPlugins/vcsMercurial/PurgeExtension/purge.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Plugins/VcsPlugins/vcsMercurial/PurgeExtension/purge.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,9 +7,9 @@
 Module implementing the purge extension interface.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals
 try:
-    str = unicode
+    str = unicode    # __IGNORE_WARNING__
 except (NameError):
     pass
--- a/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,9 +7,9 @@
 Module implementing a dialog to define guards for patches.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals
 try:
-    str = unicode
+    str = unicode    # __IGNORE_WARNING__
 except (NameError):
     pass
--- a/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesFoldDialog.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesFoldDialog.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing a dialog to enter data to fold patches.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.QtCore import pyqtSlot, Qt
 from PyQt4.QtGui import QDialog, QDialogButtonBox, QTreeWidgetItem
--- a/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesGuardsSelectionDialog.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesGuardsSelectionDialog.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing a dialog to select a list of guards.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.QtGui import QDialog, QDialogButtonBox, QListWidgetItem, \
     QAbstractItemView
--- a/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesHeaderDialog.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesHeaderDialog.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,9 +7,9 @@
 Module implementing a dialog to show the commit message of the current patch.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals
 try:
-    str = unicode
+    str = unicode    # __IGNORE_WARNING__
 except (NameError):
     pass
--- a/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListAllGuardsDialog.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListAllGuardsDialog.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,9 +7,9 @@
 Module implementing a dialog to show all guards for all patches.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals
 try:
-    str = unicode
+    str = unicode    # __IGNORE_WARNING__
 except (NameError):
     pass
--- a/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,9 +7,9 @@
 Module implementing a dialog to show a list of applied and unapplied patches.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals
 try:
-    str = unicode
+    str = unicode    # __IGNORE_WARNING__
 except (NameError):
     pass
--- a/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListGuardsDialog.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListGuardsDialog.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,9 +7,9 @@
 Module implementing a dialog to show the guards of a selected patch.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals
 try:
-    str = unicode
+    str = unicode    # __IGNORE_WARNING__
 except (NameError):
     pass
--- a/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesNewPatchDialog.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesNewPatchDialog.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing a dialog to get the data for a new patch.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.QtCore import pyqtSlot, QDateTime
 from PyQt4.QtGui import QDialog, QDialogButtonBox
--- a/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesQueueManagementDialog.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesQueueManagementDialog.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,9 +7,9 @@
 Module implementing a dialog used by the queue management functions.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals
 try:
-    str = unicode
+    str = unicode    # __IGNORE_WARNING__
 except (NameError):
     pass
--- a/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesRenamePatchDialog.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesRenamePatchDialog.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing a dialog to enter the data to rename a patch.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.QtCore import pyqtSlot
 from PyQt4.QtGui import QDialog, QDialogButtonBox
--- a/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing the queues extension project helper.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.QtGui import QMenu
--- a/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,9 +7,9 @@
 Module implementing the queues extension interface.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals
 try:
-    str = unicode
+    str = unicode    # __IGNORE_WARNING__
 except (NameError):
     pass
--- a/Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing a dialog to enter the data for a rebase session.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.QtCore import pyqtSlot
 from PyQt4.QtGui import QDialog, QDialogButtonBox
--- a/Plugins/VcsPlugins/vcsMercurial/RebaseExtension/ProjectHelper.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Plugins/VcsPlugins/vcsMercurial/RebaseExtension/ProjectHelper.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing the rebase extension project helper.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.QtGui import QMenu
--- a/Plugins/VcsPlugins/vcsMercurial/RebaseExtension/rebase.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Plugins/VcsPlugins/vcsMercurial/RebaseExtension/rebase.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing the rebase extension interface.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 import os
--- a/Plugins/VcsPlugins/vcsMercurial/TransplantExtension/ProjectHelper.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Plugins/VcsPlugins/vcsMercurial/TransplantExtension/ProjectHelper.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing the transplant extension project helper.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.QtGui import QMenu
--- a/Plugins/VcsPlugins/vcsMercurial/TransplantExtension/TransplantDialog.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Plugins/VcsPlugins/vcsMercurial/TransplantExtension/TransplantDialog.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing a dialog to enter the data for a transplant session.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.QtCore import pyqtSlot
 from PyQt4.QtGui import QDialog, QDialogButtonBox, QValidator
--- a/Plugins/VcsPlugins/vcsMercurial/TransplantExtension/transplant.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Plugins/VcsPlugins/vcsMercurial/TransplantExtension/transplant.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing the transplant extension interface.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 import os
--- a/Plugins/VcsPlugins/vcsMercurial/hg.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Plugins/VcsPlugins/vcsMercurial/hg.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,9 +7,9 @@
 Module implementing the version control systems interface to Mercurial.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals
 try:
-    str = unicode
+    str = unicode    # __IGNORE_WARNING__
 except (NameError):
     pass
--- a/Plugins/VcsPlugins/vcsPySvn/Config.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Plugins/VcsPlugins/vcsPySvn/Config.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module defining configuration variables for the subversion package.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 # Available protocols for the repository URL
 ConfigSvnProtocols = [
--- a/Plugins/VcsPlugins/vcsPySvn/ConfigurationPage/SubversionPage.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Plugins/VcsPlugins/vcsPySvn/ConfigurationPage/SubversionPage.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing the Subversion configuration page.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.QtCore import pyqtSlot
--- a/Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py	Sat Dec 14 23:44:25 2013 +0100
@@ -6,7 +6,7 @@
 """
 Module implementing the VCS project browser helper for subversion.
 """
-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 import os
--- a/Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing the VCS project helper for Subversion.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 import os
--- a/Plugins/VcsPlugins/vcsPySvn/SvnBlameDialog.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Plugins/VcsPlugins/vcsPySvn/SvnBlameDialog.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing a dialog to show the output of the svn blame command.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 import os
 import sys
--- a/Plugins/VcsPlugins/vcsPySvn/SvnChangeListsDialog.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Plugins/VcsPlugins/vcsPySvn/SvnChangeListsDialog.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing a dialog to browse the change lists.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 import os
 import sys
--- a/Plugins/VcsPlugins/vcsPySvn/SvnCommandDialog.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Plugins/VcsPlugins/vcsPySvn/SvnCommandDialog.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing the Subversion command dialog.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.QtCore import pyqtSlot
 from PyQt4.QtGui import QDialog, QDialogButtonBox
--- a/Plugins/VcsPlugins/vcsPySvn/SvnCommitDialog.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Plugins/VcsPlugins/vcsPySvn/SvnCommitDialog.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing a dialog to enter the commit message.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 import pysvn
--- a/Plugins/VcsPlugins/vcsPySvn/SvnConst.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Plugins/VcsPlugins/vcsPySvn/SvnConst.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing some constants for the pysvn package.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.QtCore import QT_TRANSLATE_NOOP
--- a/Plugins/VcsPlugins/vcsPySvn/SvnCopyDialog.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Plugins/VcsPlugins/vcsPySvn/SvnCopyDialog.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing a dialog to enter the data for a copy operation.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 import os.path
--- a/Plugins/VcsPlugins/vcsPySvn/SvnDialog.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Plugins/VcsPlugins/vcsPySvn/SvnDialog.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing a dialog to show the output of a pysvn action.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 import pysvn
--- a/Plugins/VcsPlugins/vcsPySvn/SvnDialogMixin.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Plugins/VcsPlugins/vcsPySvn/SvnDialogMixin.py	Sat Dec 14 23:44:25 2013 +0100
@@ -8,7 +8,7 @@
 the pysvn client.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.QtGui import QApplication, QDialog, QWidget, QCursor
--- a/Plugins/VcsPlugins/vcsPySvn/SvnDiffDialog.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Plugins/VcsPlugins/vcsPySvn/SvnDiffDialog.py	Sat Dec 14 23:44:25 2013 +0100
@@ -8,7 +8,7 @@
 process.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 import os
 import sys
--- a/Plugins/VcsPlugins/vcsPySvn/SvnInfoDialog.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Plugins/VcsPlugins/vcsPySvn/SvnInfoDialog.py	Sat Dec 14 23:44:25 2013 +0100
@@ -8,7 +8,7 @@
 file/directory.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 import os
 import sys
--- a/Plugins/VcsPlugins/vcsPySvn/SvnLogBrowserDialog.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Plugins/VcsPlugins/vcsPySvn/SvnLogBrowserDialog.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing a dialog to browse the log history.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 import os
 import sys
--- a/Plugins/VcsPlugins/vcsPySvn/SvnLogDialog.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Plugins/VcsPlugins/vcsPySvn/SvnLogDialog.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing a dialog to show the output of the svn log command process.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 import os
 import sys
--- a/Plugins/VcsPlugins/vcsPySvn/SvnLoginDialog.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Plugins/VcsPlugins/vcsPySvn/SvnLoginDialog.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing the login dialog for pysvn.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.QtGui import QDialog
--- a/Plugins/VcsPlugins/vcsPySvn/SvnMergeDialog.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Plugins/VcsPlugins/vcsPySvn/SvnMergeDialog.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing a dialog to enter the data for a merge operation.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.QtCore import QRegExp
 from PyQt4.QtGui import QDialog, QDialogButtonBox
--- a/Plugins/VcsPlugins/vcsPySvn/SvnNewProjectOptionsDialog.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Plugins/VcsPlugins/vcsPySvn/SvnNewProjectOptionsDialog.py	Sat Dec 14 23:44:25 2013 +0100
@@ -8,7 +8,7 @@
 repository.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 import os
--- a/Plugins/VcsPlugins/vcsPySvn/SvnOptionsDialog.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Plugins/VcsPlugins/vcsPySvn/SvnOptionsDialog.py	Sat Dec 14 23:44:25 2013 +0100
@@ -8,7 +8,7 @@
 VCS.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 import os
--- a/Plugins/VcsPlugins/vcsPySvn/SvnPropDelDialog.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Plugins/VcsPlugins/vcsPySvn/SvnPropDelDialog.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing a dialog to enter the data for a new property.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.QtGui import QDialog, QDialogButtonBox
--- a/Plugins/VcsPlugins/vcsPySvn/SvnPropListDialog.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Plugins/VcsPlugins/vcsPySvn/SvnPropListDialog.py	Sat Dec 14 23:44:25 2013 +0100
@@ -8,7 +8,7 @@
 process.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 import os
 import sys
--- a/Plugins/VcsPlugins/vcsPySvn/SvnPropSetDialog.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Plugins/VcsPlugins/vcsPySvn/SvnPropSetDialog.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing a dialog to enter the data for a new property.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.QtGui import QDialog
--- a/Plugins/VcsPlugins/vcsPySvn/SvnRelocateDialog.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Plugins/VcsPlugins/vcsPySvn/SvnRelocateDialog.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing a dialog to enter the data to relocate the workspace.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.QtGui import QDialog
--- a/Plugins/VcsPlugins/vcsPySvn/SvnRepoBrowserDialog.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Plugins/VcsPlugins/vcsPySvn/SvnRepoBrowserDialog.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing the subversion repository browser dialog.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 import pysvn
--- a/Plugins/VcsPlugins/vcsPySvn/SvnRevisionSelectionDialog.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Plugins/VcsPlugins/vcsPySvn/SvnRevisionSelectionDialog.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing a dialog to enter the revisions for the svn diff command.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.QtCore import QDate, QDateTime, Qt
 from PyQt4.QtGui import QDialog
--- a/Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py	Sat Dec 14 23:44:25 2013 +0100
@@ -8,7 +8,7 @@
 process.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 import os
 import sys
--- a/Plugins/VcsPlugins/vcsPySvn/SvnStatusMonitorThread.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Plugins/VcsPlugins/vcsPySvn/SvnStatusMonitorThread.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing the VCS status monitor thread class for Subversion.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 import os
--- a/Plugins/VcsPlugins/vcsPySvn/SvnSwitchDialog.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Plugins/VcsPlugins/vcsPySvn/SvnSwitchDialog.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing a dialog to enter the data for a switch operation.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.QtGui import QDialog
--- a/Plugins/VcsPlugins/vcsPySvn/SvnTagBranchListDialog.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Plugins/VcsPlugins/vcsPySvn/SvnTagBranchListDialog.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing a dialog to show a list of tags or branches.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 import os
--- a/Plugins/VcsPlugins/vcsPySvn/SvnTagDialog.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Plugins/VcsPlugins/vcsPySvn/SvnTagDialog.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing a dialog to enter the data for a tagging operation.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.QtCore import pyqtSlot
 from PyQt4.QtGui import QDialog, QDialogButtonBox
--- a/Plugins/VcsPlugins/vcsPySvn/SvnUrlSelectionDialog.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Plugins/VcsPlugins/vcsPySvn/SvnUrlSelectionDialog.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing a dialog to enter the URLs for the svn diff command.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.QtCore import QRegExp, pyqtSlot
 from PyQt4.QtGui import QDialog
--- a/Plugins/VcsPlugins/vcsPySvn/SvnUtilities.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Plugins/VcsPlugins/vcsPySvn/SvnUtilities.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing some common utility functions for the pysvn package.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 import os
--- a/Plugins/VcsPlugins/vcsPySvn/subversion.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Plugins/VcsPlugins/vcsPySvn/subversion.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing the version control systems interface to Subversion.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 import os
 import sys
--- a/Plugins/VcsPlugins/vcsSubversion/Config.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Plugins/VcsPlugins/vcsSubversion/Config.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module defining configuration variables for the subversion package.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 # Available protocols for the repository URL
 ConfigSvnProtocols = [
--- a/Plugins/VcsPlugins/vcsSubversion/ConfigurationPage/SubversionPage.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Plugins/VcsPlugins/vcsSubversion/ConfigurationPage/SubversionPage.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing the Subversion configuration page.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.QtCore import pyqtSlot
--- a/Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing the VCS project browser helper for subversion.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 import os
 from PyQt4.QtGui import QMenu
--- a/Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing the VCS project helper for Subversion.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 import os
--- a/Plugins/VcsPlugins/vcsSubversion/SvnBlameDialog.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Plugins/VcsPlugins/vcsSubversion/SvnBlameDialog.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,9 +7,9 @@
 Module implementing a dialog to show the output of the svn blame command.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals
 try:
-    str = unicode
+    str = unicode    # __IGNORE_WARNING__
 except (NameError):
     pass
--- a/Plugins/VcsPlugins/vcsSubversion/SvnChangeListsDialog.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Plugins/VcsPlugins/vcsSubversion/SvnChangeListsDialog.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,9 +7,9 @@
 Module implementing a dialog to browse the change lists.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals
 try:
-    str = unicode
+    str = unicode    # __IGNORE_WARNING__
 except (NameError):
     pass
--- a/Plugins/VcsPlugins/vcsSubversion/SvnCommandDialog.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Plugins/VcsPlugins/vcsSubversion/SvnCommandDialog.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing the Subversion command dialog.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.QtCore import pyqtSlot
 from PyQt4.QtGui import QDialog, QDialogButtonBox
--- a/Plugins/VcsPlugins/vcsSubversion/SvnCommitDialog.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Plugins/VcsPlugins/vcsSubversion/SvnCommitDialog.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing a dialog to enter the commit message.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.QtCore import pyqtSignal, Qt, pyqtSlot
 from PyQt4.QtGui import QWidget, QDialogButtonBox
--- a/Plugins/VcsPlugins/vcsSubversion/SvnCopyDialog.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Plugins/VcsPlugins/vcsSubversion/SvnCopyDialog.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing a dialog to enter the data for a copy operation.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 import os.path
--- a/Plugins/VcsPlugins/vcsSubversion/SvnDialog.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Plugins/VcsPlugins/vcsSubversion/SvnDialog.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,9 +7,9 @@
 Module implementing a dialog starting a process and showing its output.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals
 try:
-    str = unicode
+    str = unicode    # __IGNORE_WARNING__
 except (NameError):
     pass
--- a/Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py	Sat Dec 14 23:44:25 2013 +0100
@@ -8,9 +8,9 @@
 process.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals
 try:
-    str = unicode
+    str = unicode    # __IGNORE_WARNING__
 except (NameError):
     pass
--- a/Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,9 +7,9 @@
 Module implementing a dialog to browse the log history.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals
 try:
-    str = unicode
+    str = unicode    # __IGNORE_WARNING__
 except (NameError):
     pass
--- a/Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,9 +7,9 @@
 Module implementing a dialog to show the output of the svn log command process.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals
 try:
-    str = unicode
+    str = unicode    # __IGNORE_WARNING__
 except (NameError):
     pass
--- a/Plugins/VcsPlugins/vcsSubversion/SvnMergeDialog.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Plugins/VcsPlugins/vcsSubversion/SvnMergeDialog.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing a dialog to enter the data for a merge operation.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.QtCore import QRegExp
 from PyQt4.QtGui import QDialog, QDialogButtonBox
--- a/Plugins/VcsPlugins/vcsSubversion/SvnNewProjectOptionsDialog.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Plugins/VcsPlugins/vcsSubversion/SvnNewProjectOptionsDialog.py	Sat Dec 14 23:44:25 2013 +0100
@@ -8,7 +8,7 @@
 repository.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 import os
--- a/Plugins/VcsPlugins/vcsSubversion/SvnOptionsDialog.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Plugins/VcsPlugins/vcsSubversion/SvnOptionsDialog.py	Sat Dec 14 23:44:25 2013 +0100
@@ -8,7 +8,7 @@
 the VCS.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 import os
--- a/Plugins/VcsPlugins/vcsSubversion/SvnPropListDialog.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Plugins/VcsPlugins/vcsSubversion/SvnPropListDialog.py	Sat Dec 14 23:44:25 2013 +0100
@@ -8,9 +8,9 @@
 process.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals
 try:
-    str = unicode
+    str = unicode    # __IGNORE_WARNING__
 except (NameError):
     pass
--- a/Plugins/VcsPlugins/vcsSubversion/SvnPropSetDialog.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Plugins/VcsPlugins/vcsSubversion/SvnPropSetDialog.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing a dialog to enter the data for a new property.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.QtCore import pyqtSlot
 from PyQt4.QtGui import QDialog
--- a/Plugins/VcsPlugins/vcsSubversion/SvnRelocateDialog.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Plugins/VcsPlugins/vcsSubversion/SvnRelocateDialog.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing a dialog to enter the data to relocate the workspace.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.QtGui import QDialog
--- a/Plugins/VcsPlugins/vcsSubversion/SvnRepoBrowserDialog.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Plugins/VcsPlugins/vcsSubversion/SvnRepoBrowserDialog.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,9 +7,9 @@
 Module implementing the subversion repository browser dialog.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals
 try:
-    str = unicode
+    str = unicode    # __IGNORE_WARNING__
 except (NameError):
     pass
--- a/Plugins/VcsPlugins/vcsSubversion/SvnRevisionSelectionDialog.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Plugins/VcsPlugins/vcsSubversion/SvnRevisionSelectionDialog.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing a dialog to enter the revisions for the svn diff command.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.QtCore import QDate, QDateTime, Qt
 from PyQt4.QtGui import QDialog
--- a/Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py	Sat Dec 14 23:44:25 2013 +0100
@@ -8,9 +8,9 @@
 process.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals
 try:
-    str = unicode
+    str = unicode    # __IGNORE_WARNING__
 except (NameError):
     pass
--- a/Plugins/VcsPlugins/vcsSubversion/SvnStatusMonitorThread.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Plugins/VcsPlugins/vcsSubversion/SvnStatusMonitorThread.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,9 +7,9 @@
 Module implementing the VCS status monitor thread class for Subversion.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals
 try:
-    str = unicode
+    str = unicode    # __IGNORE_WARNING__
 except (NameError):
     pass
--- a/Plugins/VcsPlugins/vcsSubversion/SvnSwitchDialog.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Plugins/VcsPlugins/vcsSubversion/SvnSwitchDialog.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing a dialog to enter the data for a switch operation.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.QtGui import QDialog
--- a/Plugins/VcsPlugins/vcsSubversion/SvnTagBranchListDialog.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Plugins/VcsPlugins/vcsSubversion/SvnTagBranchListDialog.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,9 +7,9 @@
 Module implementing a dialog to show a list of tags or branches.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals
 try:
-    str = unicode
+    str = unicode    # __IGNORE_WARNING__
 except (NameError):
     pass
--- a/Plugins/VcsPlugins/vcsSubversion/SvnTagDialog.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Plugins/VcsPlugins/vcsSubversion/SvnTagDialog.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing a dialog to enter the data for a tagging operation.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.QtGui import QDialog, QDialogButtonBox
--- a/Plugins/VcsPlugins/vcsSubversion/SvnUrlSelectionDialog.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Plugins/VcsPlugins/vcsSubversion/SvnUrlSelectionDialog.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing a dialog to enter the URLs for the svn diff command.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.QtCore import QRegExp, pyqtSlot
 from PyQt4.QtGui import QDialog
--- a/Plugins/VcsPlugins/vcsSubversion/SvnUtilities.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Plugins/VcsPlugins/vcsSubversion/SvnUtilities.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing some common utility functions for the subversion package.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 import os
--- a/Plugins/VcsPlugins/vcsSubversion/subversion.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Plugins/VcsPlugins/vcsSubversion/subversion.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,9 +7,9 @@
 Module implementing the version control systems interface to Subversion.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals
 try:
-    str = unicode
+    str = unicode    # __IGNORE_WARNING__
 except (NameError):
     pass
--- a/Plugins/ViewManagerPlugins/Listspace/Listspace.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Plugins/ViewManagerPlugins/Listspace/Listspace.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing the listspace viewmanager class.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 import os
--- a/Plugins/ViewManagerPlugins/Tabview/Tabview.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Plugins/ViewManagerPlugins/Tabview/Tabview.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing a tabbed viewmanager class.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 import os
--- a/Plugins/WizardPlugins/ColorDialogWizard/ColorDialogWizardDialog.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Plugins/WizardPlugins/ColorDialogWizard/ColorDialogWizardDialog.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing the color dialog wizard dialog.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 import os
--- a/Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py	Sat Dec 14 23:44:25 2013 +0100
@@ -4,7 +4,7 @@
 Module implementing the eric5 message box wizard dialog.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 import os
--- a/Plugins/WizardPlugins/FileDialogWizard/FileDialogWizardDialog.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Plugins/WizardPlugins/FileDialogWizard/FileDialogWizardDialog.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing the file dialog wizard dialog.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 import os
--- a/Plugins/WizardPlugins/FontDialogWizard/FontDialogWizardDialog.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Plugins/WizardPlugins/FontDialogWizard/FontDialogWizardDialog.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing the font dialog wizard dialog.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 import os
--- a/Plugins/WizardPlugins/InputDialogWizard/InputDialogWizardDialog.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Plugins/WizardPlugins/InputDialogWizard/InputDialogWizardDialog.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing the input dialog wizard dialog.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 import os
--- a/Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing the message box wizard dialog.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 import os
--- a/Plugins/WizardPlugins/PyRegExpWizard/PyRegExpWizardCharactersDialog.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Plugins/WizardPlugins/PyRegExpWizard/PyRegExpWizardCharactersDialog.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing a dialog for entering character classes.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.QtCore import QRegExp
 from PyQt4.QtGui import QSizePolicy, QSpacerItem, QWidget, QHBoxLayout, \
--- a/Plugins/WizardPlugins/PyRegExpWizard/PyRegExpWizardDialog.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Plugins/WizardPlugins/PyRegExpWizard/PyRegExpWizardDialog.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing the Python re wizard dialog.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 import os
 import re
--- a/Plugins/WizardPlugins/PyRegExpWizard/PyRegExpWizardRepeatDialog.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Plugins/WizardPlugins/PyRegExpWizard/PyRegExpWizardRepeatDialog.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing a dialog for entering repeat counts.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.QtCore import pyqtSlot
 from PyQt4.QtGui import QDialog
--- a/Plugins/WizardPlugins/QRegExpWizard/QRegExpWizardCharactersDialog.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Plugins/WizardPlugins/QRegExpWizard/QRegExpWizardCharactersDialog.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing a dialog for entering character classes.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.QtCore import QRegExp
 from PyQt4.QtGui import QSizePolicy, QSpacerItem, QWidget, QHBoxLayout, \
--- a/Plugins/WizardPlugins/QRegExpWizard/QRegExpWizardDialog.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Plugins/WizardPlugins/QRegExpWizard/QRegExpWizardDialog.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing the QRegExp wizard dialog.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 import os
--- a/Plugins/WizardPlugins/QRegExpWizard/QRegExpWizardRepeatDialog.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Plugins/WizardPlugins/QRegExpWizard/QRegExpWizardRepeatDialog.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing a dialog for entering repeat counts.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.QtCore import pyqtSlot
 from PyQt4.QtGui import QDialog
--- a/Plugins/WizardPlugins/QRegularExpressionWizard/QRegularExpressionWizardCharactersDialog.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Plugins/WizardPlugins/QRegularExpressionWizard/QRegularExpressionWizardCharactersDialog.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing a dialog for entering character classes.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.QtCore import QRegExp
 from PyQt4.QtGui import QWidget, QDialog, QVBoxLayout, QHBoxLayout, \
--- a/Plugins/WizardPlugins/QRegularExpressionWizard/QRegularExpressionWizardDialog.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Plugins/WizardPlugins/QRegularExpressionWizard/QRegularExpressionWizardDialog.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing the QRegularExpression wizard dialog.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 import os
 import re
--- a/Plugins/WizardPlugins/QRegularExpressionWizard/QRegularExpressionWizardRepeatDialog.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Plugins/WizardPlugins/QRegularExpressionWizard/QRegularExpressionWizardRepeatDialog.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing a dialog for entering repeat counts.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.QtCore import pyqtSlot
 from PyQt4.QtGui import QDialog
--- a/Plugins/WizardPlugins/QRegularExpressionWizard/QRegularExpressionWizardServer.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Plugins/WizardPlugins/QRegularExpressionWizard/QRegularExpressionWizardServer.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing the PyQt5 server part of the QRegularExpression wizzard.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 import json
 import sys
--- a/Preferences/ConfigurationDialog.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Preferences/ConfigurationDialog.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing a dialog for the configuration of eric5.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 import os
 import types
--- a/Preferences/ConfigurationPages/ApplicationPage.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Preferences/ConfigurationPages/ApplicationPage.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing the Application configuration page.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from .ConfigurationPageBase import ConfigurationPageBase
 from .Ui_ApplicationPage import Ui_ApplicationPage
--- a/Preferences/ConfigurationPages/ConfigurationPageBase.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Preferences/ConfigurationPages/ConfigurationPageBase.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing the base class for all configuration pages.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.QtCore import pyqtSlot
 from PyQt4.QtGui import QWidget, QIcon, QPixmap, QColor, QColorDialog, \
--- a/Preferences/ConfigurationPages/CooperationPage.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Preferences/ConfigurationPages/CooperationPage.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing the Cooperation configuration page.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.QtCore import pyqtSlot, QRegExp
 from PyQt4.QtGui import QRegExpValidator, QValidator
--- a/Preferences/ConfigurationPages/CorbaPage.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Preferences/ConfigurationPages/CorbaPage.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing the Corba configuration page.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.QtCore import pyqtSlot
--- a/Preferences/ConfigurationPages/DebuggerGeneralPage.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Preferences/ConfigurationPages/DebuggerGeneralPage.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing the Debugger General configuration page.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 import socket
--- a/Preferences/ConfigurationPages/DebuggerPython3Page.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Preferences/ConfigurationPages/DebuggerPython3Page.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing the Debugger Python3 configuration page.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.QtCore import pyqtSlot
--- a/Preferences/ConfigurationPages/DebuggerPythonPage.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Preferences/ConfigurationPages/DebuggerPythonPage.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing the Debugger Python configuration page.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.QtCore import pyqtSlot
--- a/Preferences/ConfigurationPages/DebuggerRubyPage.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Preferences/ConfigurationPages/DebuggerRubyPage.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing the Debugger Ruby configuration page.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.QtCore import pyqtSlot
--- a/Preferences/ConfigurationPages/EditorAPIsPage.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Preferences/ConfigurationPages/EditorAPIsPage.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing the Editor APIs configuration page.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.QtCore import QDir, pyqtSlot, QFileInfo
 from PyQt4.QtGui import QInputDialog
--- a/Preferences/ConfigurationPages/EditorAutocompletionPage.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Preferences/ConfigurationPages/EditorAutocompletionPage.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing the Editor Autocompletion configuration page.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from .ConfigurationPageBase import ConfigurationPageBase
 from .Ui_EditorAutocompletionPage import Ui_EditorAutocompletionPage
--- a/Preferences/ConfigurationPages/EditorAutocompletionQScintillaPage.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Preferences/ConfigurationPages/EditorAutocompletionQScintillaPage.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing the QScintilla Autocompletion configuration page.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.Qsci import QsciScintilla
--- a/Preferences/ConfigurationPages/EditorCalltipsPage.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Preferences/ConfigurationPages/EditorCalltipsPage.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing the Editor Calltips configuration page.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.Qsci import QsciScintilla
--- a/Preferences/ConfigurationPages/EditorCalltipsQScintillaPage.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Preferences/ConfigurationPages/EditorCalltipsQScintillaPage.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing the QScintilla Calltips configuration page.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.Qsci import QsciScintilla
--- a/Preferences/ConfigurationPages/EditorExportersPage.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Preferences/ConfigurationPages/EditorExportersPage.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing the Editor Exporters configuration page.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.QtCore import pyqtSlot
 from PyQt4.QtGui import QFontDialog
--- a/Preferences/ConfigurationPages/EditorFilePage.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Preferences/ConfigurationPages/EditorFilePage.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing the Editor File Handling configuration page.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.QtCore import pyqtSlot
 from PyQt4.QtGui import QListWidgetItem, QInputDialog, QLineEdit
--- a/Preferences/ConfigurationPages/EditorGeneralPage.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Preferences/ConfigurationPages/EditorGeneralPage.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing the Editor General configuration page.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.Qsci import QsciScintillaBase
--- a/Preferences/ConfigurationPages/EditorHighlightersPage.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Preferences/ConfigurationPages/EditorHighlightersPage.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing the Editor Highlighter Associations configuration page.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 import os
--- a/Preferences/ConfigurationPages/EditorHighlightingStylesPage.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Preferences/ConfigurationPages/EditorHighlightingStylesPage.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing the Editor Highlighting Styles configuration page.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.QtCore import pyqtSlot, Qt, QFileInfo, QFile, QIODevice
 from PyQt4.QtGui import QPalette, QColorDialog, QFontDialog, \
--- a/Preferences/ConfigurationPages/EditorKeywordsPage.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Preferences/ConfigurationPages/EditorKeywordsPage.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing the editor highlighter keywords configuration page.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.QtCore import pyqtSlot
--- a/Preferences/ConfigurationPages/EditorPropertiesPage.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Preferences/ConfigurationPages/EditorPropertiesPage.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing the Editor Properties configuration page.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from QScintilla.QsciScintillaCompat import QSCINTILLA_VERSION
--- a/Preferences/ConfigurationPages/EditorSearchPage.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Preferences/ConfigurationPages/EditorSearchPage.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing the Editor Search configuration page.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from .ConfigurationPageBase import ConfigurationPageBase
 from .Ui_EditorSearchPage import Ui_EditorSearchPage
--- a/Preferences/ConfigurationPages/EditorSpellCheckingPage.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Preferences/ConfigurationPages/EditorSpellCheckingPage.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing the Editor Spellchecking configuration page.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.QtCore import pyqtSlot
--- a/Preferences/ConfigurationPages/EditorStylesPage.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Preferences/ConfigurationPages/EditorStylesPage.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing the Editor Styles configuration page.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.QtCore import pyqtSlot
 from PyQt4.QtGui import QColor, QPalette, QColorDialog
--- a/Preferences/ConfigurationPages/EditorSyntaxPage.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Preferences/ConfigurationPages/EditorSyntaxPage.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing the Editor Syntax Checker configuration page.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from .ConfigurationPageBase import ConfigurationPageBase
 from .Ui_EditorSyntaxPage import Ui_EditorSyntaxPage
--- a/Preferences/ConfigurationPages/EditorTypingPage.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Preferences/ConfigurationPages/EditorTypingPage.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing the Editor Typing configuration page.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.QtCore import pyqtSlot
--- a/Preferences/ConfigurationPages/EmailPage.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Preferences/ConfigurationPages/EmailPage.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing the Email configuration page.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 import smtplib
 import socket
--- a/Preferences/ConfigurationPages/GraphicsPage.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Preferences/ConfigurationPages/GraphicsPage.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing the Printer configuration page.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.QtCore import pyqtSlot
--- a/Preferences/ConfigurationPages/HelpAppearancePage.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Preferences/ConfigurationPages/HelpAppearancePage.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing the Help Viewers configuration page.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.QtCore import pyqtSlot
--- a/Preferences/ConfigurationPages/HelpDocumentationPage.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Preferences/ConfigurationPages/HelpDocumentationPage.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing the Help Documentation configuration page.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.QtCore import pyqtSlot, QUrl
--- a/Preferences/ConfigurationPages/HelpInterfacePage.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Preferences/ConfigurationPages/HelpInterfacePage.py	Sat Dec 14 23:44:25 2013 +0100
@@ -4,7 +4,7 @@
 Module implementing the Interface configuration page (variant for web browser).
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.QtCore import pyqtSlot
 from PyQt4.QtGui import QStyleFactory
--- a/Preferences/ConfigurationPages/HelpViewersPage.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Preferences/ConfigurationPages/HelpViewersPage.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing the Help Viewers configuration page.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.QtCore import pyqtSlot
 from PyQt4.QtGui import QButtonGroup
--- a/Preferences/ConfigurationPages/HelpVirusTotalPage.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Preferences/ConfigurationPages/HelpVirusTotalPage.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing HelpVirusTotalPage.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.QtCore import pyqtSlot
--- a/Preferences/ConfigurationPages/HelpWebBrowserPage.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Preferences/ConfigurationPages/HelpWebBrowserPage.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing the Help web browser configuration page.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.QtCore import pyqtSlot, QLocale
 from PyQt4.QtNetwork import QNetworkRequest
--- a/Preferences/ConfigurationPages/IconsPage.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Preferences/ConfigurationPages/IconsPage.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing the Icons configuration page.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.QtCore import pyqtSlot
 from PyQt4.QtGui import QListWidgetItem
--- a/Preferences/ConfigurationPages/IconsPreviewDialog.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Preferences/ConfigurationPages/IconsPreviewDialog.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing a dialog to preview the contents of an icon directory.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 import os.path
--- a/Preferences/ConfigurationPages/InterfacePage.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Preferences/ConfigurationPages/InterfacePage.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing the Interface configuration page.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 import glob
 import os
--- a/Preferences/ConfigurationPages/IrcPage.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Preferences/ConfigurationPages/IrcPage.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing the IRC configuration page.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from .ConfigurationPageBase import ConfigurationPageBase
 from .Ui_IrcPage import Ui_IrcPage
--- a/Preferences/ConfigurationPages/MasterPasswordEntryDialog.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Preferences/ConfigurationPages/MasterPasswordEntryDialog.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing a dialog to enter or change the master password.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.QtCore import pyqtSlot
 from PyQt4.QtGui import QDialog, QDialogButtonBox
--- a/Preferences/ConfigurationPages/MultiProjectPage.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Preferences/ConfigurationPages/MultiProjectPage.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing the Multi Project configuration page.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.QtCore import pyqtSlot
--- a/Preferences/ConfigurationPages/NetworkPage.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Preferences/ConfigurationPages/NetworkPage.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing the Network configuration page.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 import os
--- a/Preferences/ConfigurationPages/NotificationsPage.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Preferences/ConfigurationPages/NotificationsPage.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing the Notifications configuration page.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.QtCore import pyqtSlot, QPoint
 from PyQt4.QtGui import QApplication
--- a/Preferences/ConfigurationPages/PluginManagerPage.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Preferences/ConfigurationPages/PluginManagerPage.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing the Plugin Manager configuration page.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 import os
--- a/Preferences/ConfigurationPages/PrinterPage.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Preferences/ConfigurationPages/PrinterPage.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing the Printer configuration page.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.QtCore import pyqtSlot
--- a/Preferences/ConfigurationPages/ProjectBrowserPage.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Preferences/ConfigurationPages/ProjectBrowserPage.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing the Project Browser configuration page.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.QtCore import pyqtSlot
--- a/Preferences/ConfigurationPages/ProjectPage.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Preferences/ConfigurationPages/ProjectPage.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing the Project configuration page.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from .ConfigurationPageBase import ConfigurationPageBase
 from .Ui_ProjectPage import Ui_ProjectPage
--- a/Preferences/ConfigurationPages/PythonPage.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Preferences/ConfigurationPages/PythonPage.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing the Python configuration page.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from .ConfigurationPageBase import ConfigurationPageBase
 from .Ui_PythonPage import Ui_PythonPage
--- a/Preferences/ConfigurationPages/QtPage.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Preferences/ConfigurationPages/QtPage.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing the Qt configuration page.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.QtCore import pyqtSlot
--- a/Preferences/ConfigurationPages/SecurityPage.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Preferences/ConfigurationPages/SecurityPage.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing the Security configuration page.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.QtCore import pyqtSlot
 from PyQt4.QtGui import QDialog
--- a/Preferences/ConfigurationPages/ShellPage.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Preferences/ConfigurationPages/ShellPage.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing the Shell configuration page.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.QtCore import pyqtSlot
--- a/Preferences/ConfigurationPages/TasksPage.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Preferences/ConfigurationPages/TasksPage.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing the Tasks configuration page.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from .ConfigurationPageBase import ConfigurationPageBase
 from .Ui_TasksPage import Ui_TasksPage
--- a/Preferences/ConfigurationPages/TemplatesPage.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Preferences/ConfigurationPages/TemplatesPage.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing the Templates configuration page.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from .ConfigurationPageBase import ConfigurationPageBase
 from .Ui_TemplatesPage import Ui_TemplatesPage
--- a/Preferences/ConfigurationPages/TrayStarterPage.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Preferences/ConfigurationPages/TrayStarterPage.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing the tray starter configuration page.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from .ConfigurationPageBase import ConfigurationPageBase
 from .Ui_TrayStarterPage import Ui_TrayStarterPage
--- a/Preferences/ConfigurationPages/VcsPage.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Preferences/ConfigurationPages/VcsPage.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing the VCS configuration page.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from .ConfigurationPageBase import ConfigurationPageBase
 from .Ui_VcsPage import Ui_VcsPage
--- a/Preferences/ConfigurationPages/ViewmanagerPage.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Preferences/ConfigurationPages/ViewmanagerPage.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing the Viewmanager configuration page.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.QtCore import pyqtSlot
--- a/Preferences/PreferencesLexer.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Preferences/PreferencesLexer.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing a special QextScintilla lexer to handle the preferences.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.QtGui import QColor, QFont, QApplication
 from PyQt4.Qsci import QsciLexer
--- a/Preferences/ProgramsDialog.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Preferences/ProgramsDialog.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,9 +7,9 @@
 Module implementing the Programs page.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals
 try:
-    str = unicode
+    str = unicode    # __IGNORE_WARNING__
 except (NameError):
     pass
--- a/Preferences/ShortcutDialog.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Preferences/ShortcutDialog.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing a dialog for the configuration of a keyboard shortcut.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.QtCore import pyqtSignal, QEvent, Qt
 from PyQt4.QtGui import QKeySequence, QDialog, QDialogButtonBox
--- a/Preferences/Shortcuts.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Preferences/Shortcuts.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing functions dealing with keyboard shortcuts.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.QtCore import QFile, QIODevice
 from PyQt4.QtGui import QKeySequence, QApplication
--- a/Preferences/ShortcutsDialog.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Preferences/ShortcutsDialog.py	Sat Dec 14 23:44:25 2013 +0100
@@ -8,7 +8,7 @@
 shortcuts.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.QtCore import pyqtSignal, QRegExp, Qt, pyqtSlot
 from PyQt4.QtGui import QKeySequence, QHeaderView, QDialog, QTreeWidgetItem
--- a/Preferences/ToolConfigurationDialog.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Preferences/ToolConfigurationDialog.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing a configuration dialog for the tools menu.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 import copy
--- a/Preferences/ToolGroupConfigurationDialog.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Preferences/ToolGroupConfigurationDialog.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing a configuration dialog for the tools menu.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 import copy
--- a/Preferences/ViewProfileDialog.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Preferences/ViewProfileDialog.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing a dialog to configure the various view profiles.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.QtGui import QDialog
--- a/Preferences/__init__.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Preferences/__init__.py	Sat Dec 14 23:44:25 2013 +0100
@@ -16,7 +16,7 @@
 'from Preferences import *' to import it.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 import os
 import fnmatch
--- a/Project/AddDirectoryDialog.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Project/AddDirectoryDialog.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing a dialog to add files of a directory to the project.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.QtCore import pyqtSlot
 from PyQt4.QtGui import QDialog
--- a/Project/AddFileDialog.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Project/AddFileDialog.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing a dialog to add a file to the project.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 import os
--- a/Project/AddFoundFilesDialog.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Project/AddFoundFilesDialog.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing a dialog to show the found files to the user.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.QtCore import pyqtSlot
 from PyQt4.QtGui import QDialog, QDialogButtonBox
--- a/Project/AddLanguageDialog.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Project/AddLanguageDialog.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing a dialog to add a new language to the project.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.QtGui import QDialog
--- a/Project/CreateDialogCodeDialog.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Project/CreateDialogCodeDialog.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing a dialog to generate code for a Qt4/Qt5 dialog.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 import os
--- a/Project/DebuggerPropertiesDialog.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Project/DebuggerPropertiesDialog.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing a dialog for entering project specific debugger settings.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 import os
 import sys
--- a/Project/FiletypeAssociationDialog.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Project/FiletypeAssociationDialog.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing a dialog to enter filetype associations for the project.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.QtCore import Qt, pyqtSlot
 from PyQt4.QtGui import QHeaderView, QDialog, QTreeWidgetItem
--- a/Project/LexerAssociationDialog.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Project/LexerAssociationDialog.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing a dialog to enter lexer associations for the project.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 import os
--- a/Project/NewDialogClassDialog.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Project/NewDialogClassDialog.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing a dialog to enter the data for a new dialog class file.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 import os
--- a/Project/NewPythonPackageDialog.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Project/NewPythonPackageDialog.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing a dialog to add a new Python package.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.QtGui import QDialog, QDialogButtonBox
 from PyQt4.QtCore import pyqtSlot
--- a/Project/Project.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Project/Project.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,9 +7,9 @@
 Module implementing the project management functionality.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals
 try:
-    str = unicode
+    str = unicode    # __IGNORE_WARNING__
 except (NameError):
     pass
--- a/Project/ProjectBaseBrowser.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Project/ProjectBaseBrowser.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing the baseclass for the various project browsers.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 import os
--- a/Project/ProjectBrowser.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Project/ProjectBrowser.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing the project browser part of the eric5 UI.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.QtCore import Qt
 from PyQt4.QtGui import QColor, QApplication
--- a/Project/ProjectBrowserModel.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Project/ProjectBrowserModel.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing the browser model.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 import os
 import re
--- a/Project/ProjectBrowserSortFilterProxyModel.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Project/ProjectBrowserSortFilterProxyModel.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing the browser sort filter proxy model.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from UI.BrowserSortFilterProxyModel import BrowserSortFilterProxyModel
 from .ProjectBrowserModel import ProjectBrowserSourceType
--- a/Project/ProjectFormsBrowser.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Project/ProjectFormsBrowser.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,9 +7,9 @@
 Module implementing a class used to display the forms part of the project.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals
 try:
-    str = unicode
+    str = unicode    # __IGNORE_WARNING__
 except (NameError):
     pass
--- a/Project/ProjectInterfacesBrowser.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Project/ProjectInterfacesBrowser.py	Sat Dec 14 23:44:25 2013 +0100
@@ -8,9 +8,9 @@
 of the project.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals
 try:
-    str = unicode
+    str = unicode    # __IGNORE_WARNING__
 except (NameError):
     pass
--- a/Project/ProjectOthersBrowser.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Project/ProjectOthersBrowser.py	Sat Dec 14 23:44:25 2013 +0100
@@ -8,7 +8,7 @@
 don't fit the other categories.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 import mimetypes
--- a/Project/ProjectResourcesBrowser.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Project/ProjectResourcesBrowser.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,9 +7,9 @@
 Module implementing a class used to display the resources part of the project.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals
 try:
-    str = unicode
+    str = unicode    # __IGNORE_WARNING__
 except (NameError):
     pass
--- a/Project/ProjectSourcesBrowser.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Project/ProjectSourcesBrowser.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing a class used to display the Sources part of the project.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 import os
--- a/Project/ProjectTranslationsBrowser.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Project/ProjectTranslationsBrowser.py	Sat Dec 14 23:44:25 2013 +0100
@@ -8,9 +8,9 @@
 project.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals
 try:
-    str = unicode
+    str = unicode    # __IGNORE_WARNING__
 except (NameError):
     pass
--- a/Project/PropertiesDialog.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Project/PropertiesDialog.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing the project properties dialog.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 import os
--- a/Project/SpellingPropertiesDialog.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Project/SpellingPropertiesDialog.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing the Spelling Properties dialog.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 import os
--- a/Project/TranslationPropertiesDialog.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Project/TranslationPropertiesDialog.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing the Translations Properties dialog.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 import os
--- a/Project/UserPropertiesDialog.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Project/UserPropertiesDialog.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing the user specific project properties dialog.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.QtGui import QDialog
--- a/PyUnit/UnittestDialog.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/PyUnit/UnittestDialog.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing the UI to the pyunit package.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 import unittest
 import sys
--- a/QScintilla/APIsManager.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/QScintilla/APIsManager.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing the APIsManager.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 import os
--- a/QScintilla/Editor.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/QScintilla/Editor.py	Sat Dec 14 23:44:25 2013 +0100
@@ -6,7 +6,7 @@
 """
 Module implementing the editor component of the eric5 IDE.
 """
-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals
 try:
     str = unicode   # __IGNORE_WARNING__
     chr = unichr   # __IGNORE_WARNING__
--- a/QScintilla/EditorAssembly.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/QScintilla/EditorAssembly.py	Sat Dec 14 23:44:25 2013 +0100
@@ -8,7 +8,7 @@
 combos and the editor widget.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.QtCore import QTimer
 from PyQt4.QtGui import QWidget, QGridLayout, QComboBox
--- a/QScintilla/Exporters/ExporterBase.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/QScintilla/Exporters/ExporterBase.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing the exporter base class.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.QtCore import QFileInfo, QObject
 from PyQt4.QtGui import QApplication
--- a/QScintilla/Exporters/ExporterHTML.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/QScintilla/Exporters/ExporterHTML.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing an exporter for HTML.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 # This code is a port of the C++ code found in SciTE 1.74
 # Original code: Copyright 1998-2006 by Neil Hodgson <neilh@scintilla.org>
--- a/QScintilla/Exporters/ExporterODT.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/QScintilla/Exporters/ExporterODT.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing an exporter for ODT.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.QtCore import Qt
 from PyQt4.QtGui import QApplication, QCursor, QTextDocument, \
--- a/QScintilla/Exporters/ExporterPDF.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/QScintilla/Exporters/ExporterPDF.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing an exporter for PDF.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 # This code is a port of the C++ code found in SciTE 1.74
 # Original code: Copyright 1998-2006 by Neil Hodgson <neilh@scintilla.org>
--- a/QScintilla/Exporters/ExporterRTF.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/QScintilla/Exporters/ExporterRTF.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing an exporter for RTF.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 # This code is a port of the C++ code found in SciTE 1.74
 # Original code: Copyright 1998-2006 by Neil Hodgson <neilh@scintilla.org>
--- a/QScintilla/Exporters/ExporterTEX.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/QScintilla/Exporters/ExporterTEX.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing an exporter for TeX.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 # This code is a port of the C++ code found in SciTE 1.74
 # Original code: Copyright 1998-2006 by Neil Hodgson <neilh@scintilla.org>
--- a/QScintilla/Exporters/__init__.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/QScintilla/Exporters/__init__.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Package implementing exporters for various file formats.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.QtGui import QApplication
--- a/QScintilla/GotoDialog.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/QScintilla/GotoDialog.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing the Goto dialog.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.QtGui import QDialog
--- a/QScintilla/Lexers/Lexer.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/QScintilla/Lexers/Lexer.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing the lexer mixin class.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 import Preferences
--- a/QScintilla/Lexers/LexerBash.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/QScintilla/Lexers/LexerBash.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing a Bash lexer with some additional methods.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.Qsci import QsciLexerBash
--- a/QScintilla/Lexers/LexerBatch.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/QScintilla/Lexers/LexerBatch.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing a Batch file lexer with some additional methods.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.Qsci import QsciLexerBatch
--- a/QScintilla/Lexers/LexerCMake.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/QScintilla/Lexers/LexerCMake.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing a CMake lexer with some additional methods.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.Qsci import QsciLexerCMake
--- a/QScintilla/Lexers/LexerCPP.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/QScintilla/Lexers/LexerCPP.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing a CPP lexer with some additional methods.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.Qsci import QsciLexerCPP,  QsciScintilla
--- a/QScintilla/Lexers/LexerCSS.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/QScintilla/Lexers/LexerCSS.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing a CSS lexer with some additional methods.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.Qsci import QsciLexerCSS
--- a/QScintilla/Lexers/LexerCSharp.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/QScintilla/Lexers/LexerCSharp.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing a C# lexer with some additional methods.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.Qsci import QsciLexerCSharp,  QsciScintilla
--- a/QScintilla/Lexers/LexerContainer.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/QScintilla/Lexers/LexerContainer.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing a base class for custom lexers.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.Qsci import QsciLexer
--- a/QScintilla/Lexers/LexerD.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/QScintilla/Lexers/LexerD.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing a D lexer with some additional methods.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.Qsci import QsciLexerD, QsciScintilla
--- a/QScintilla/Lexers/LexerDiff.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/QScintilla/Lexers/LexerDiff.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing a Diff lexer with some additional methods.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.Qsci import QsciLexerDiff
--- a/QScintilla/Lexers/LexerFortran.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/QScintilla/Lexers/LexerFortran.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing a Fortran lexer with some additional methods.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.Qsci import QsciLexerFortran
--- a/QScintilla/Lexers/LexerFortran77.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/QScintilla/Lexers/LexerFortran77.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing a Fortran lexer with some additional methods.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.Qsci import QsciLexerFortran77
--- a/QScintilla/Lexers/LexerHTML.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/QScintilla/Lexers/LexerHTML.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing a HTML lexer with some additional methods.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.Qsci import QsciLexerHTML
--- a/QScintilla/Lexers/LexerIDL.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/QScintilla/Lexers/LexerIDL.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing an IDL lexer with some additional methods.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.Qsci import QsciLexerIDL,  QsciScintilla
--- a/QScintilla/Lexers/LexerJava.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/QScintilla/Lexers/LexerJava.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing a Java lexer with some additional methods.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.Qsci import QsciLexerJava,  QsciScintilla
--- a/QScintilla/Lexers/LexerJavaScript.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/QScintilla/Lexers/LexerJavaScript.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing a JavaScript lexer with some additional methods.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.Qsci import QsciLexerJavaScript,  QsciScintilla
--- a/QScintilla/Lexers/LexerLua.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/QScintilla/Lexers/LexerLua.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing a Lua lexer with some additional methods.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.Qsci import QsciLexerLua
--- a/QScintilla/Lexers/LexerMakefile.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/QScintilla/Lexers/LexerMakefile.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing a Makefile lexer with some additional methods.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.Qsci import QsciLexerMakefile
--- a/QScintilla/Lexers/LexerMatlab.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/QScintilla/Lexers/LexerMatlab.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing a Matlab lexer with some additional methods.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.Qsci import QsciLexerMatlab
--- a/QScintilla/Lexers/LexerOctave.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/QScintilla/Lexers/LexerOctave.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing a Octave lexer with some additional methods.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.Qsci import QsciLexerOctave
--- a/QScintilla/Lexers/LexerPOV.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/QScintilla/Lexers/LexerPOV.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing a Povray lexer with some additional methods.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.Qsci import QsciLexerPOV
--- a/QScintilla/Lexers/LexerPascal.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/QScintilla/Lexers/LexerPascal.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing a Pascal lexer with some additional methods.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.Qsci import QsciLexerPascal
--- a/QScintilla/Lexers/LexerPerl.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/QScintilla/Lexers/LexerPerl.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing a Perl lexer with some additional methods.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.Qsci import QsciLexerPerl
--- a/QScintilla/Lexers/LexerPostScript.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/QScintilla/Lexers/LexerPostScript.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing a PostScript lexer with some additional methods.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.Qsci import QsciLexerPostScript
--- a/QScintilla/Lexers/LexerProperties.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/QScintilla/Lexers/LexerProperties.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing a Properties lexer with some additional methods.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.Qsci import QsciLexerProperties
--- a/QScintilla/Lexers/LexerPygments.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/QScintilla/Lexers/LexerPygments.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing a custom lexer using pygments.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from pygments.token import Token
 from pygments.lexers import guess_lexer_for_filename, guess_lexer, \
--- a/QScintilla/Lexers/LexerPython.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/QScintilla/Lexers/LexerPython.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing a Python lexer with some additional methods.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 import re
--- a/QScintilla/Lexers/LexerRuby.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/QScintilla/Lexers/LexerRuby.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing a Ruby lexer with some additional methods.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.Qsci import QsciLexerRuby
--- a/QScintilla/Lexers/LexerSQL.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/QScintilla/Lexers/LexerSQL.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing a SQL lexer with some additional methods.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.Qsci import QsciLexerSQL
--- a/QScintilla/Lexers/LexerTCL.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/QScintilla/Lexers/LexerTCL.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing a TCL/Tk lexer with some additional methods.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.Qsci import QsciLexerTCL
--- a/QScintilla/Lexers/LexerTeX.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/QScintilla/Lexers/LexerTeX.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing a Tex lexer with some additional methods.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.Qsci import QsciLexerTeX
--- a/QScintilla/Lexers/LexerVHDL.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/QScintilla/Lexers/LexerVHDL.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing a VHDL lexer with some additional methods.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.Qsci import QsciLexerVHDL
--- a/QScintilla/Lexers/LexerXML.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/QScintilla/Lexers/LexerXML.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing a XML lexer with some additional methods.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.Qsci import QsciLexerXML
--- a/QScintilla/Lexers/LexerYAML.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/QScintilla/Lexers/LexerYAML.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing a YAML lexer with some additional methods.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.Qsci import QsciLexerYAML
--- a/QScintilla/Lexers/__init__.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/QScintilla/Lexers/__init__.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Package implementing lexers for the various supported programming languages.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.QtGui import QApplication
--- a/QScintilla/MiniEditor.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/QScintilla/MiniEditor.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing a minimalistic editor for simple editing tasks.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 import os
 import re
--- a/QScintilla/Printer.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/QScintilla/Printer.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing the printer functionality.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.QtCore import QTime, QDate, Qt
 from PyQt4.QtGui import QColor, QPrinter, QApplication
--- a/QScintilla/QsciScintillaCompat.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/QScintilla/QsciScintillaCompat.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing a compatability interface class to QsciScintilla.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.QtCore import pyqtSignal, Qt
 from PyQt4.QtGui import QPalette, QColor, QApplication
--- a/QScintilla/SearchReplaceWidget.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/QScintilla/SearchReplaceWidget.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing the search and replace widget.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.QtCore import pyqtSignal, Qt, pyqtSlot
 from PyQt4.QtGui import QWidget, QHBoxLayout, QToolButton, QScrollArea, \
--- a/QScintilla/Shell.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/QScintilla/Shell.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing a graphical Python shell.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 import sys
 import re
--- a/QScintilla/ShellHistoryDialog.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/QScintilla/ShellHistoryDialog.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing the shell history dialog.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 import os
--- a/QScintilla/SortOptionsDialog.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/QScintilla/SortOptionsDialog.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing a dialog to enter the sort options for a line sort.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.QtGui import QDialog
--- a/QScintilla/SpellChecker.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/QScintilla/SpellChecker.py	Sat Dec 14 23:44:25 2013 +0100
@@ -9,7 +9,7 @@
 The spell checker is based on pyenchant.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 import os
--- a/QScintilla/SpellCheckingDialog.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/QScintilla/SpellCheckingDialog.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing the spell checking dialog.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.QtCore import pyqtSlot
 from PyQt4.QtGui import QDialog
--- a/QScintilla/SpellingDictionaryEditDialog.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/QScintilla/SpellingDictionaryEditDialog.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing a dialog to edit the various spell checking dictionaries.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 import os
--- a/QScintilla/TypingCompleters/CompleterBase.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/QScintilla/TypingCompleters/CompleterBase.py	Sat Dec 14 23:44:25 2013 +0100
@@ -11,7 +11,7 @@
 user types '(').
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.QtCore import QObject
--- a/QScintilla/TypingCompleters/CompleterPython.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/QScintilla/TypingCompleters/CompleterPython.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing a typing completer for Python.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 import re
--- a/QScintilla/TypingCompleters/CompleterRuby.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/QScintilla/TypingCompleters/CompleterRuby.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing a typing completer for Ruby.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 import re
--- a/QScintilla/TypingCompleters/__init__.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/QScintilla/TypingCompleters/__init__.py	Sat Dec 14 23:44:25 2013 +0100
@@ -8,7 +8,7 @@
 """


-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals


 def getCompleter(language, editor, parent=None):
--- a/QScintilla/ZoomDialog.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/QScintilla/ZoomDialog.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing a dialog to select the zoom scale.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.QtGui import QDialog
--- a/Snapshot/SnapWidget.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Snapshot/SnapWidget.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing the snapshot widget.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 #
 # SnapWidget and its associated modules are PyQt4 ports of Ksnapshot.
--- a/Snapshot/SnapshotFreehandGrabber.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Snapshot/SnapshotFreehandGrabber.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing a grabber widget for a freehand snapshot region.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.QtCore import pyqtSignal, Qt, QRect, QPoint, QTimer, qVersion
 from PyQt4.QtGui import QWidget, QPixmap, QColor, QRegion, QApplication, \
--- a/Snapshot/SnapshotPreview.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Snapshot/SnapshotPreview.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing the snapshot preview label.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.QtCore import pyqtSignal, QPoint, Qt
 from PyQt4.QtGui import QLabel, QApplication
--- a/Snapshot/SnapshotRegionGrabber.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Snapshot/SnapshotRegionGrabber.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing a grabber widget for a rectangular snapshot region.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.QtCore import pyqtSignal, Qt, QRect, QPoint, QTimer, qVersion
 from PyQt4.QtGui import QWidget, QPixmap, QColor, QRegion, QApplication, \
--- a/Snapshot/SnapshotTimer.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Snapshot/SnapshotTimer.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing the snapshot timer widget.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.QtCore import pyqtSignal, Qt, QTimer, QRect
 from PyQt4.QtGui import QWidget, QApplication, QPainter, QToolTip, QPalette
--- a/SqlBrowser/SqlBrowser.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/SqlBrowser/SqlBrowser.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing the SQL Browser main window.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.QtCore import QTimer, QUrl
 from PyQt4.QtGui import QKeySequence, qApp
--- a/SqlBrowser/SqlBrowserWidget.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/SqlBrowser/SqlBrowserWidget.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing the SQL Browser widget.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.QtCore import pyqtSignal, QVariant, Qt, pyqtSlot
 from PyQt4.QtGui import QWidget, QStandardItemModel, QDialog, QAbstractItemView
--- a/SqlBrowser/SqlConnectionDialog.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/SqlBrowser/SqlConnectionDialog.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing a dialog to enter the connection parameters.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.QtCore import pyqtSlot
 from PyQt4.QtGui import QDialog, QDialogButtonBox
--- a/SqlBrowser/SqlConnectionWidget.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/SqlBrowser/SqlConnectionWidget.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing a widget showing the SQL connections.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.QtCore import pyqtSignal, Qt, qVersion
 from PyQt4.QtGui import QWidget, QHeaderView, QTreeWidget, QVBoxLayout, \
--- a/Tasks/Task.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Tasks/Task.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing a class to store task data.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 import os
 import time
--- a/Tasks/TaskFilter.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Tasks/TaskFilter.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing a class to store task data.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.QtCore import QRegExp
--- a/Tasks/TaskFilterConfigDialog.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Tasks/TaskFilterConfigDialog.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing the task filter configuration dialog.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.QtGui import QDialog
--- a/Tasks/TaskPropertiesDialog.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Tasks/TaskPropertiesDialog.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing the task properties dialog.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 import time
--- a/Tasks/TaskViewer.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Tasks/TaskViewer.py	Sat Dec 14 23:44:25 2013 +0100
@@ -11,7 +11,7 @@
 introductory text. This text is configurable.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 import os
 import fnmatch
--- a/Templates/TemplateMultipleVariablesDialog.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Templates/TemplateMultipleVariablesDialog.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing a dialog for entering multiple template variables.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.QtCore import QSize, Qt
 from PyQt4.QtGui import QSizePolicy, QSpacerItem, QWidget, QHBoxLayout, \
--- a/Templates/TemplatePropertiesDialog.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Templates/TemplatePropertiesDialog.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing the templates properties dialog.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.QtCore import QRegExp, Qt, pyqtSlot
 from PyQt4.QtGui import QDialog, QRegExpValidator
--- a/Templates/TemplateSingleVariableDialog.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Templates/TemplateSingleVariableDialog.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing a dialog for entering a single template variable.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.QtGui import QDialog
--- a/Templates/TemplateViewer.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Templates/TemplateViewer.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing a template viewer and associated classes.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 import datetime
 import os
--- a/ThirdParty/Jasy/jasy/__init__.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/ThirdParty/Jasy/jasy/__init__.py	Sat Dec 14 23:44:25 2013 +0100
@@ -13,7 +13,7 @@
 custom build/deployment scripts.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 __version__ = "1.1.0"
 __author__ = "Sebastian Werner <info@sebastian-werner.net>"
--- a/ThirdParty/Jasy/jasy/core/Console.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/ThirdParty/Jasy/jasy/core/Console.py	Sat Dec 14 23:44:25 2013 +0100
@@ -3,7 +3,7 @@
 # Copyright (c) 2013 Detlev Offenbach <detlev@die-offenbachs.de>
 #

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 import logging
--- a/ThirdParty/Jasy/jasy/js/api/Comment.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/ThirdParty/Jasy/jasy/js/api/Comment.py	Sat Dec 14 23:44:25 2013 +0100
@@ -3,7 +3,7 @@
 # Copyright 2010-2012 Zynga Inc.
 #

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 import re
--- a/ThirdParty/Jasy/jasy/js/parse/Node.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/ThirdParty/Jasy/jasy/js/parse/Node.py	Sat Dec 14 23:44:25 2013 +0100
@@ -10,7 +10,7 @@
 #   - Sebastian Werner <info@sebastian-werner.net> (Refactoring Python) (2010)
 #

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 import copy
--- a/ThirdParty/Jasy/jasy/js/parse/Parser.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/ThirdParty/Jasy/jasy/js/parse/Parser.py	Sat Dec 14 23:44:25 2013 +0100
@@ -10,7 +10,7 @@
 #   - Sebastian Werner <info@sebastian-werner.net> (Python Port) (2010-2012)
 #

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 import jasy.js.tokenize.Tokenizer
 import jasy.js.parse.VanillaBuilder
--- a/ThirdParty/Jasy/jasy/js/parse/VanillaBuilder.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/ThirdParty/Jasy/jasy/js/parse/VanillaBuilder.py	Sat Dec 14 23:44:25 2013 +0100
@@ -10,7 +10,7 @@
 #   - Sebastian Werner <info@sebastian-werner.net> (Python Port) (2010)
 #

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 import jasy.js.parse.Node
--- a/ThirdParty/Jasy/jasy/js/tokenize/Lang.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/ThirdParty/Jasy/jasy/js/tokenize/Lang.py	Sat Dec 14 23:44:25 2013 +0100
@@ -4,7 +4,7 @@
 #

 """JavaScript 1.7 keywords"""
-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 keywords = set([
     "break",
--- a/ThirdParty/Jasy/jasy/js/tokenize/Tokenizer.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/ThirdParty/Jasy/jasy/js/tokenize/Tokenizer.py	Sat Dec 14 23:44:25 2013 +0100
@@ -10,7 +10,7 @@
 #   - Sebastian Werner <info@sebastian-werner.net> (Python Port) (2010)
 #

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 import copy
--- a/ThirdParty/Jasy/jasy/js/util/__init__.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/ThirdParty/Jasy/jasy/js/util/__init__.py	Sat Dec 14 23:44:25 2013 +0100
@@ -8,7 +8,7 @@
 # Copyright (c) 2013 Detlev Offenbach <detlev@die-offenbachs.de>
 #

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 pseudoTypes = set(["any", "var", "undefined", "null", "true", "false", "this",
                    "arguments"])
--- a/ThirdParty/Pygments/pygments/__init__.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/ThirdParty/Pygments/pygments/__init__.py	Sat Dec 14 23:44:25 2013 +0100
@@ -26,7 +26,7 @@
     :license: BSD, see LICENSE for details.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 __version__ = '1.6'
 __docformat__ = 'restructuredtext'
--- a/ThirdParty/Pygments/pygments/cmdline.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/ThirdParty/Pygments/pygments/cmdline.py	Sat Dec 14 23:44:25 2013 +0100
@@ -8,7 +8,7 @@
     :copyright: Copyright 2006-2013 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 import sys
 import getopt
--- a/ThirdParty/Pygments/pygments/console.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/ThirdParty/Pygments/pygments/console.py	Sat Dec 14 23:44:25 2013 +0100
@@ -9,7 +9,7 @@
     :license: BSD, see LICENSE for details.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 esc = "\x1b["
--- a/ThirdParty/Pygments/pygments/filter.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/ThirdParty/Pygments/pygments/filter.py	Sat Dec 14 23:44:25 2013 +0100
@@ -10,7 +10,7 @@
 """


-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 def apply_filters(stream, filters, lexer=None):
     """
--- a/ThirdParty/Pygments/pygments/filters/__init__.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/ThirdParty/Pygments/pygments/filters/__init__.py	Sat Dec 14 23:44:25 2013 +0100
@@ -10,7 +10,7 @@
     :license: BSD, see LICENSE for details.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 import re
--- a/ThirdParty/Pygments/pygments/formatter.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/ThirdParty/Pygments/pygments/formatter.py	Sat Dec 14 23:44:25 2013 +0100
@@ -9,7 +9,7 @@
     :license: BSD, see LICENSE for details.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 try:
     basestring    # __IGNORE_WARNING__
--- a/ThirdParty/Pygments/pygments/formatters/__init__.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/ThirdParty/Pygments/pygments/formatters/__init__.py	Sat Dec 14 23:44:25 2013 +0100
@@ -8,7 +8,7 @@
     :copyright: Copyright 2006-2013 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 import os.path
 import fnmatch
--- a/ThirdParty/Pygments/pygments/formatters/_mapping.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/ThirdParty/Pygments/pygments/formatters/_mapping.py	Sat Dec 14 23:44:25 2013 +0100
@@ -13,7 +13,7 @@
     :license: BSD, see LICENSE for details.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 # start
 from pygments.formatters.bbcode import BBCodeFormatter
--- a/ThirdParty/Pygments/pygments/formatters/bbcode.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/ThirdParty/Pygments/pygments/formatters/bbcode.py	Sat Dec 14 23:44:25 2013 +0100
@@ -10,7 +10,7 @@
 """


-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from pygments.formatter import Formatter
 from pygments.util import get_bool_opt
--- a/ThirdParty/Pygments/pygments/formatters/img.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/ThirdParty/Pygments/pygments/formatters/img.py	Sat Dec 14 23:44:25 2013 +0100
@@ -9,7 +9,7 @@
     :license: BSD, see LICENSE for details.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 import sys
--- a/ThirdParty/Pygments/pygments/formatters/other.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/ThirdParty/Pygments/pygments/formatters/other.py	Sat Dec 14 23:44:25 2013 +0100
@@ -9,7 +9,7 @@
     :license: BSD, see LICENSE for details.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from pygments.formatter import Formatter
 from pygments.util import OptionError, get_choice_opt, b
--- a/ThirdParty/Pygments/pygments/formatters/svg.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/ThirdParty/Pygments/pygments/formatters/svg.py	Sat Dec 14 23:44:25 2013 +0100
@@ -9,7 +9,7 @@
     :license: BSD, see LICENSE for details.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from pygments.formatter import Formatter
 from pygments.util import get_bool_opt, get_int_opt
--- a/ThirdParty/Pygments/pygments/formatters/terminal.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/ThirdParty/Pygments/pygments/formatters/terminal.py	Sat Dec 14 23:44:25 2013 +0100
@@ -9,7 +9,7 @@
     :license: BSD, see LICENSE for details.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 import sys
--- a/ThirdParty/Pygments/pygments/formatters/terminal256.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/ThirdParty/Pygments/pygments/formatters/terminal256.py	Sat Dec 14 23:44:25 2013 +0100
@@ -15,7 +15,7 @@
     :license: BSD, see LICENSE for details.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 # TODO:
 #  - Options to map style's bold/underline/italic/border attributes
--- a/ThirdParty/Pygments/pygments/lexers/_asybuiltins.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/ThirdParty/Pygments/pygments/lexers/_asybuiltins.py	Sat Dec 14 23:44:25 2013 +0100
@@ -14,7 +14,7 @@
     :license: BSD, see LICENSE for details.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 ASYFUNCNAME = set([
     'AND',
--- a/ThirdParty/Pygments/pygments/lexers/_clbuiltins.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/ThirdParty/Pygments/pygments/lexers/_clbuiltins.py	Sat Dec 14 23:44:25 2013 +0100
@@ -9,7 +9,7 @@
     :license: BSD, see LICENSE for details.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 BUILTIN_FUNCTIONS = [ # 638 functions
     '<', '<=', '=', '>', '>=', '-', '/', '/=', '*', '+', '1-', '1+',
--- a/ThirdParty/Pygments/pygments/lexers/_lassobuiltins.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/ThirdParty/Pygments/pygments/lexers/_lassobuiltins.py	Sat Dec 14 23:44:25 2013 +0100
@@ -9,7 +9,7 @@
     :license: BSD, see LICENSE for details.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 BUILTINS = {
     'Types': [
--- a/ThirdParty/Pygments/pygments/lexers/_luabuiltins.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/ThirdParty/Pygments/pygments/lexers/_luabuiltins.py	Sat Dec 14 23:44:25 2013 +0100
@@ -13,7 +13,7 @@
     :license: BSD, see LICENSE for details.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 MODULES = {'basic': ['_G',
            '_VERSION',
--- a/ThirdParty/Pygments/pygments/lexers/_mapping.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/ThirdParty/Pygments/pygments/lexers/_mapping.py	Sat Dec 14 23:44:25 2013 +0100
@@ -13,7 +13,7 @@
     :license: BSD, see LICENSE for details.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 LEXERS = {
     'ABAPLexer': ('pygments.lexers.other', 'ABAP', ('abap',), ('*.abap',), ('text/x-abap',)),
--- a/ThirdParty/Pygments/pygments/lexers/_openedgebuiltins.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/ThirdParty/Pygments/pygments/lexers/_openedgebuiltins.py	Sat Dec 14 23:44:25 2013 +0100
@@ -9,7 +9,7 @@
     :license: BSD, see LICENSE for details.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 OPENEDGEKEYWORDS = [
     'ABSOLUTE', 'ABS', 'ABSO', 'ABSOL', 'ABSOLU', 'ABSOLUT', 'ACCELERATOR',
--- a/ThirdParty/Pygments/pygments/lexers/_phpbuiltins.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/ThirdParty/Pygments/pygments/lexers/_phpbuiltins.py	Sat Dec 14 23:44:25 2013 +0100
@@ -17,7 +17,7 @@
 """


-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 MODULES = {'.NET': ['dotnet_load'],
  'APC': ['apc_add',
--- a/ThirdParty/Pygments/pygments/lexers/_postgres_builtins.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/ThirdParty/Pygments/pygments/lexers/_postgres_builtins.py	Sat Dec 14 23:44:25 2013 +0100
@@ -9,7 +9,7 @@
     :license: BSD, see LICENSE for details.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals
 try:
     str = unicode   # __IGNORE_WARNING__
     import urllib2 as request
--- a/ThirdParty/Pygments/pygments/lexers/_robotframeworklexer.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/ThirdParty/Pygments/pygments/lexers/_robotframeworklexer.py	Sat Dec 14 23:44:25 2013 +0100
@@ -9,7 +9,7 @@
     :license: BSD, see LICENSE for details.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 #  Copyright 2012 Nokia Siemens Networks Oyj
 #
--- a/ThirdParty/Pygments/pygments/lexers/_scilab_builtins.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/ThirdParty/Pygments/pygments/lexers/_scilab_builtins.py	Sat Dec 14 23:44:25 2013 +0100
@@ -9,7 +9,7 @@
     :license: BSD, see LICENSE for details.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 # These lists are generated automatically.
 # Run the following in a Scilab script:
--- a/ThirdParty/Pygments/pygments/lexers/_sourcemodbuiltins.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/ThirdParty/Pygments/pygments/lexers/_sourcemodbuiltins.py	Sat Dec 14 23:44:25 2013 +0100
@@ -12,7 +12,7 @@
     :license: BSD, see LICENSE for details.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 FUNCTIONS = ['TopMenuHandler',
  'CreateTopMenu',
--- a/ThirdParty/Pygments/pygments/lexers/_stan_builtins.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/ThirdParty/Pygments/pygments/lexers/_stan_builtins.py	Sat Dec 14 23:44:25 2013 +0100
@@ -10,7 +10,7 @@
     :license: BSD, see LICENSE for details.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 CONSTANTS=[   'e',
     'epsilon',
--- a/ThirdParty/Pygments/pygments/lexers/_vimbuiltins.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/ThirdParty/Pygments/pygments/lexers/_vimbuiltins.py	Sat Dec 14 23:44:25 2013 +0100
@@ -1,7 +1,7 @@
 # Split up in multiple functions so it's importable by jython, which has a
 # per-method size limit.

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 def _getauto():
     return [('BufAdd','BufAdd'),('BufCreate','BufCreate'),('BufDelete','BufDelete'),('BufEnter','BufEnter'),('BufFilePost','BufFilePost'),('BufFilePre','BufFilePre'),('BufHidden','BufHidden'),('BufLeave','BufLeave'),('BufNew','BufNew'),('BufNewFile','BufNewFile'),('BufRead','BufRead'),('BufReadCmd','BufReadCmd'),('BufReadPost','BufReadPost'),('BufReadPre','BufReadPre'),('BufUnload','BufUnload'),('BufWinEnter','BufWinEnter'),('BufWinLeave','BufWinLeave'),('BufWipeout','BufWipeout'),('BufWrite','BufWrite'),('BufWriteCmd','BufWriteCmd'),('BufWritePost','BufWritePost'),('BufWritePre','BufWritePre'),('Cmd','Cmd'),('CmdwinEnter','CmdwinEnter'),('CmdwinLeave','CmdwinLeave'),('ColorScheme','ColorScheme'),('CursorHold','CursorHold'),('CursorHoldI','CursorHoldI'),('CursorMoved','CursorMoved'),('CursorMovedI','CursorMovedI'),('EncodingChanged','EncodingChanged'),('FileAppendCmd','FileAppendCmd'),('FileAppendPost','FileAppendPost'),('FileAppendPre','FileAppendPre'),('FileChangedRO','FileChangedRO'),('FileChangedShell','FileChangedShell'),('FileChangedShellPost','FileChangedShellPost'),('FileEncoding','FileEncoding'),('FileReadCmd','FileReadCmd'),('FileReadPost','FileReadPost'),('FileReadPre','FileReadPre'),('FileType','FileType'),('FileWriteCmd','FileWriteCmd'),('FileWritePost','FileWritePost'),('FileWritePre','FileWritePre'),('FilterReadPost','FilterReadPost'),('FilterReadPre','FilterReadPre'),('FilterWritePost','FilterWritePost'),('FilterWritePre','FilterWritePre'),('FocusGained','FocusGained'),('FocusLost','FocusLost'),('FuncUndefined','FuncUndefined'),('GUIEnter','GUIEnter'),('GUIFailed','GUIFailed'),('InsertChange','InsertChange'),('InsertCharPre','InsertCharPre'),('InsertEnter','InsertEnter'),('InsertLeave','InsertLeave'),('MenuPopup','MenuPopup'),('QuickFixCmdPost','QuickFixCmdPost'),('QuickFixCmdPre','QuickFixCmdPre'),('RemoteReply','RemoteReply'),('SessionLoadPost','SessionLoadPost'),('ShellCmdPost','ShellCmdPost'),('ShellFilterPost','ShellFilterPost'),('SourceCmd','SourceCmd'),('SourcePre','SourcePre'),('SpellFileMissing','SpellFileMissing'),('StdinReadPost','StdinReadPost'),('StdinReadPre','StdinReadPre'),('SwapExists','SwapExists'),('Syntax','Syntax'),('TabEnter','TabEnter'),('TabLeave','TabLeave'),('TermChanged','TermChanged'),('TermResponse','TermResponse'),('User','User'),('UserGettingBored','UserGettingBored'),('VimEnter','VimEnter'),('VimLeave','VimLeave'),('VimLeavePre','VimLeavePre'),('VimResized','VimResized'),('WinEnter','WinEnter'),('WinLeave','WinLeave'),('event','event')]
--- a/ThirdParty/Pygments/pygments/lexers/agile.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/ThirdParty/Pygments/pygments/lexers/agile.py	Sat Dec 14 23:44:25 2013 +0100
@@ -9,7 +9,7 @@
     :license: BSD, see LICENSE for details.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 import re
--- a/ThirdParty/Pygments/pygments/lexers/asm.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/ThirdParty/Pygments/pygments/lexers/asm.py	Sat Dec 14 23:44:25 2013 +0100
@@ -9,7 +9,7 @@
     :license: BSD, see LICENSE for details.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 import re
--- a/ThirdParty/Pygments/pygments/lexers/compiled.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/ThirdParty/Pygments/pygments/lexers/compiled.py	Sat Dec 14 23:44:25 2013 +0100
@@ -9,7 +9,7 @@
     :license: BSD, see LICENSE for details.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 import re
 from string import Template
--- a/ThirdParty/Pygments/pygments/lexers/dalvik.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/ThirdParty/Pygments/pygments/lexers/dalvik.py	Sat Dec 14 23:44:25 2013 +0100
@@ -9,7 +9,7 @@
     :license: BSD, see LICENSE for details.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from pygments.lexer import RegexLexer, include, bygroups
 from pygments.token import Keyword, Text, Comment, Name, String, Number, \
--- a/ThirdParty/Pygments/pygments/lexers/dotnet.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/ThirdParty/Pygments/pygments/lexers/dotnet.py	Sat Dec 14 23:44:25 2013 +0100
@@ -8,7 +8,7 @@
     :copyright: Copyright 2006-2013 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 import re
--- a/ThirdParty/Pygments/pygments/lexers/foxpro.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/ThirdParty/Pygments/pygments/lexers/foxpro.py	Sat Dec 14 23:44:25 2013 +0100
@@ -9,7 +9,7 @@
     :license: BSD, see LICENSE for details.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 import re
--- a/ThirdParty/Pygments/pygments/lexers/functional.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/ThirdParty/Pygments/pygments/lexers/functional.py	Sat Dec 14 23:44:25 2013 +0100
@@ -9,7 +9,7 @@
     :license: BSD, see LICENSE for details.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 import re
--- a/ThirdParty/Pygments/pygments/lexers/hdl.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/ThirdParty/Pygments/pygments/lexers/hdl.py	Sat Dec 14 23:44:25 2013 +0100
@@ -9,7 +9,7 @@
     :license: BSD, see LICENSE for details.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 import re
 from pygments.lexer import RegexLexer, bygroups, include, using, this
--- a/ThirdParty/Pygments/pygments/lexers/jvm.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/ThirdParty/Pygments/pygments/lexers/jvm.py	Sat Dec 14 23:44:25 2013 +0100
@@ -9,7 +9,7 @@
     :license: BSD, see LICENSE for details.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 import re
--- a/ThirdParty/Pygments/pygments/lexers/math.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/ThirdParty/Pygments/pygments/lexers/math.py	Sat Dec 14 23:44:25 2013 +0100
@@ -9,7 +9,7 @@
     :license: BSD, see LICENSE for details.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 import re
--- a/ThirdParty/Pygments/pygments/lexers/other.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/ThirdParty/Pygments/pygments/lexers/other.py	Sat Dec 14 23:44:25 2013 +0100
@@ -9,7 +9,7 @@
     :license: BSD, see LICENSE for details.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 import re
--- a/ThirdParty/Pygments/pygments/lexers/parsers.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/ThirdParty/Pygments/pygments/lexers/parsers.py	Sat Dec 14 23:44:25 2013 +0100
@@ -9,7 +9,7 @@
     :license: BSD, see LICENSE for details.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 import re
--- a/ThirdParty/Pygments/pygments/lexers/shell.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/ThirdParty/Pygments/pygments/lexers/shell.py	Sat Dec 14 23:44:25 2013 +0100
@@ -9,7 +9,7 @@
     :license: BSD, see LICENSE for details.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 import re
--- a/ThirdParty/Pygments/pygments/lexers/special.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/ThirdParty/Pygments/pygments/lexers/special.py	Sat Dec 14 23:44:25 2013 +0100
@@ -9,7 +9,7 @@
     :license: BSD, see LICENSE for details.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 import re
 import io
--- a/ThirdParty/Pygments/pygments/lexers/sql.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/ThirdParty/Pygments/pygments/lexers/sql.py	Sat Dec 14 23:44:25 2013 +0100
@@ -38,7 +38,7 @@
     :license: BSD, see LICENSE for details.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 import re
--- a/ThirdParty/Pygments/pygments/lexers/templates.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/ThirdParty/Pygments/pygments/lexers/templates.py	Sat Dec 14 23:44:25 2013 +0100
@@ -9,7 +9,7 @@
     :license: BSD, see LICENSE for details.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 import re
--- a/ThirdParty/Pygments/pygments/lexers/text.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/ThirdParty/Pygments/pygments/lexers/text.py	Sat Dec 14 23:44:25 2013 +0100
@@ -9,7 +9,7 @@
     :license: BSD, see LICENSE for details.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 import re
 from bisect import bisect
--- a/ThirdParty/Pygments/pygments/lexers/web.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/ThirdParty/Pygments/pygments/lexers/web.py	Sat Dec 14 23:44:25 2013 +0100
@@ -9,7 +9,7 @@
     :license: BSD, see LICENSE for details.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 import re
 import copy
--- a/ThirdParty/Pygments/pygments/plugin.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/ThirdParty/Pygments/pygments/plugin.py	Sat Dec 14 23:44:25 2013 +0100
@@ -35,7 +35,7 @@
     :copyright: Copyright 2006-2013 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 try:
     import pkg_resources
--- a/ThirdParty/Pygments/pygments/scanner.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/ThirdParty/Pygments/pygments/scanner.py	Sat Dec 14 23:44:25 2013 +0100
@@ -15,7 +15,7 @@
     :copyright: Copyright 2006-2013 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 import re
--- a/ThirdParty/Pygments/pygments/styles/__init__.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/ThirdParty/Pygments/pygments/styles/__init__.py	Sat Dec 14 23:44:25 2013 +0100
@@ -9,7 +9,7 @@
     :license: BSD, see LICENSE for details.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from pygments.plugin import find_plugin_styles
 from pygments.util import ClassNotFound
--- a/ThirdParty/Pygments/pygments/styles/autumn.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/ThirdParty/Pygments/pygments/styles/autumn.py	Sat Dec 14 23:44:25 2013 +0100
@@ -9,7 +9,7 @@
     :license: BSD, see LICENSE for details.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from pygments.style import Style
 from pygments.token import Keyword, Name, Comment, String, Error, \
--- a/ThirdParty/Pygments/pygments/styles/borland.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/ThirdParty/Pygments/pygments/styles/borland.py	Sat Dec 14 23:44:25 2013 +0100
@@ -9,7 +9,7 @@
     :license: BSD, see LICENSE for details.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from pygments.style import Style
 from pygments.token import Keyword, Name, Comment, String, Error, \
--- a/ThirdParty/Pygments/pygments/styles/bw.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/ThirdParty/Pygments/pygments/styles/bw.py	Sat Dec 14 23:44:25 2013 +0100
@@ -9,7 +9,7 @@
     :license: BSD, see LICENSE for details.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from pygments.style import Style
 from pygments.token import Keyword, Name, Comment, String, Error, \
--- a/ThirdParty/Pygments/pygments/styles/colorful.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/ThirdParty/Pygments/pygments/styles/colorful.py	Sat Dec 14 23:44:25 2013 +0100
@@ -9,7 +9,7 @@
     :license: BSD, see LICENSE for details.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from pygments.style import Style
 from pygments.token import Keyword, Name, Comment, String, Error, \
--- a/ThirdParty/Pygments/pygments/styles/default.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/ThirdParty/Pygments/pygments/styles/default.py	Sat Dec 14 23:44:25 2013 +0100
@@ -9,7 +9,7 @@
     :license: BSD, see LICENSE for details.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from pygments.style import Style
 from pygments.token import Keyword, Name, Comment, String, Error, \
--- a/ThirdParty/Pygments/pygments/styles/emacs.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/ThirdParty/Pygments/pygments/styles/emacs.py	Sat Dec 14 23:44:25 2013 +0100
@@ -9,7 +9,7 @@
     :license: BSD, see LICENSE for details.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from pygments.style import Style
 from pygments.token import Keyword, Name, Comment, String, Error, \
--- a/ThirdParty/Pygments/pygments/styles/friendly.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/ThirdParty/Pygments/pygments/styles/friendly.py	Sat Dec 14 23:44:25 2013 +0100
@@ -9,7 +9,7 @@
     :license: BSD, see LICENSE for details.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from pygments.style import Style
 from pygments.token import Keyword, Name, Comment, String, Error, \
--- a/ThirdParty/Pygments/pygments/styles/fruity.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/ThirdParty/Pygments/pygments/styles/fruity.py	Sat Dec 14 23:44:25 2013 +0100
@@ -9,7 +9,7 @@
     :license: BSD, see LICENSE for details.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from pygments.style import Style
 from pygments.token import Token, Comment, Name, Keyword, \
--- a/ThirdParty/Pygments/pygments/styles/manni.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/ThirdParty/Pygments/pygments/styles/manni.py	Sat Dec 14 23:44:25 2013 +0100
@@ -12,7 +12,7 @@
     :license: BSD, see LICENSE for details.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from pygments.style import Style
 from pygments.token import Keyword, Name, Comment, String, Error, \
--- a/ThirdParty/Pygments/pygments/styles/monokai.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/ThirdParty/Pygments/pygments/styles/monokai.py	Sat Dec 14 23:44:25 2013 +0100
@@ -11,7 +11,7 @@
     :license: BSD, see LICENSE for details.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from pygments.style import Style
 from pygments.token import Keyword, Name, Comment, String, Error, Text, \
--- a/ThirdParty/Pygments/pygments/styles/murphy.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/ThirdParty/Pygments/pygments/styles/murphy.py	Sat Dec 14 23:44:25 2013 +0100
@@ -9,7 +9,7 @@
     :license: BSD, see LICENSE for details.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from pygments.style import Style
 from pygments.token import Keyword, Name, Comment, String, Error, \
--- a/ThirdParty/Pygments/pygments/styles/native.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/ThirdParty/Pygments/pygments/styles/native.py	Sat Dec 14 23:44:25 2013 +0100
@@ -9,7 +9,7 @@
     :license: BSD, see LICENSE for details.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from pygments.style import Style
 from pygments.token import Keyword, Name, Comment, String, Error, \
--- a/ThirdParty/Pygments/pygments/styles/pastie.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/ThirdParty/Pygments/pygments/styles/pastie.py	Sat Dec 14 23:44:25 2013 +0100
@@ -11,7 +11,7 @@
     :license: BSD, see LICENSE for details.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from pygments.style import Style
 from pygments.token import Keyword, Name, Comment, String, Error, \
--- a/ThirdParty/Pygments/pygments/styles/perldoc.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/ThirdParty/Pygments/pygments/styles/perldoc.py	Sat Dec 14 23:44:25 2013 +0100
@@ -11,7 +11,7 @@
     :license: BSD, see LICENSE for details.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from pygments.style import Style
 from pygments.token import Keyword, Name, Comment, String, Error, \
--- a/ThirdParty/Pygments/pygments/styles/rrt.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/ThirdParty/Pygments/pygments/styles/rrt.py	Sat Dec 14 23:44:25 2013 +0100
@@ -9,7 +9,7 @@
     :license: BSD, see LICENSE for details.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from pygments.style import Style
 from pygments.token import Comment, Name, Keyword, String
--- a/ThirdParty/Pygments/pygments/styles/tango.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/ThirdParty/Pygments/pygments/styles/tango.py	Sat Dec 14 23:44:25 2013 +0100
@@ -37,7 +37,7 @@
     :license: BSD, see LICENSE for details.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from pygments.style import Style
 from pygments.token import Keyword, Name, Comment, String, Error, \
--- a/ThirdParty/Pygments/pygments/styles/trac.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/ThirdParty/Pygments/pygments/styles/trac.py	Sat Dec 14 23:44:25 2013 +0100
@@ -9,7 +9,7 @@
     :license: BSD, see LICENSE for details.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from pygments.style import Style
 from pygments.token import Keyword, Name, Comment, String, Error, \
--- a/ThirdParty/Pygments/pygments/styles/vim.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/ThirdParty/Pygments/pygments/styles/vim.py	Sat Dec 14 23:44:25 2013 +0100
@@ -9,7 +9,7 @@
     :license: BSD, see LICENSE for details.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from pygments.style import Style
 from pygments.token import Keyword, Name, Comment, String, Error, \
--- a/ThirdParty/Pygments/pygments/styles/vs.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/ThirdParty/Pygments/pygments/styles/vs.py	Sat Dec 14 23:44:25 2013 +0100
@@ -9,7 +9,7 @@
     :license: BSD, see LICENSE for details.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from pygments.style import Style
 from pygments.token import Keyword, Name, Comment, String, Error, \
--- a/ThirdParty/Pygments/pygments/token.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/ThirdParty/Pygments/pygments/token.py	Sat Dec 14 23:44:25 2013 +0100
@@ -9,7 +9,7 @@
     :license: BSD, see LICENSE for details.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 class _TokenType(tuple):
     parent = None
--- a/ThirdParty/Pygments/pygments/unistring.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/ThirdParty/Pygments/pygments/unistring.py	Sat Dec 14 23:44:25 2013 +0100
@@ -11,7 +11,7 @@
     :copyright: Copyright 2006-2013 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals
 try:
     chr = unichr
 except (NameError):
--- a/ThirdParty/Pygments/pygments/util.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/ThirdParty/Pygments/pygments/util.py	Sat Dec 14 23:44:25 2013 +0100
@@ -9,7 +9,7 @@
     :license: BSD, see LICENSE for details.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals
 try:
     chr = unichr
 except (NameError):
--- a/Toolbox/SingleApplication.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Toolbox/SingleApplication.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing the single application server and client.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.QtNetwork import QLocalServer, QLocalSocket
--- a/Toolbox/Startup.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Toolbox/Startup.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing some startup helper funcions.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 import os
 import sys
--- a/Tools/TRPreviewer.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Tools/TRPreviewer.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing the TR Previewer main window.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 import os
--- a/Tools/TRSingleApplication.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Tools/TRSingleApplication.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing the single application server and client.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 import os
--- a/Tools/TrayStarter.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Tools/TrayStarter.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing a starter for the system tray.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 import sys
 import os
--- a/Tools/UIPreviewer.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Tools/UIPreviewer.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing the UI Previewer main window.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.QtCore import qVersion, QDir, QFileInfo, QEvent, QSize, Qt
 from PyQt4.QtGui import QSizePolicy, QSpacerItem, QWidget, QHBoxLayout, \
--- a/UI/AuthenticationDialog.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/UI/AuthenticationDialog.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing the authentication dialog for the help browser.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.QtGui import QDialog, QStyle
--- a/UI/Browser.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/UI/Browser.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing a browser with class browsing capabilities.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 import os
 import mimetypes
--- a/UI/BrowserModel.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/UI/BrowserModel.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing the browser model.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 import sys
 import os
--- a/UI/BrowserSortFilterProxyModel.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/UI/BrowserSortFilterProxyModel.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing the browser sort filter proxy model.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.QtCore import QModelIndex
 from PyQt4.QtGui import QSortFilterProxyModel
--- a/UI/CompareDialog.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/UI/CompareDialog.py	Sat Dec 14 23:44:25 2013 +0100
@@ -8,7 +8,7 @@
 side.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals
 try:
     basestring    # __IGNORE_WARNING__
 except NameError:
--- a/UI/DeleteFilesConfirmationDialog.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/UI/DeleteFilesConfirmationDialog.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing a dialog to confirm deletion of multiple files.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.QtGui import QDialog, QDialogButtonBox
--- a/UI/DiffDialog.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/UI/DiffDialog.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing a dialog to compare two files.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 import os
 import time
--- a/UI/EmailDialog.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/UI/EmailDialog.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing a dialog to send bug reports.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 import os
 import mimetypes
--- a/UI/ErrorLogDialog.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/UI/ErrorLogDialog.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing a dialog to display an error log.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 import os
--- a/UI/FindFileDialog.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/UI/FindFileDialog.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing a dialog to search for text in files.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 import os
 import re
--- a/UI/FindFileNameDialog.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/UI/FindFileNameDialog.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing a dialog to search for files.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 import os
 import sys
--- a/UI/Info.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/UI/Info.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module defining some informational strings.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 Program = 'eric5'
 Version = '@@VERSION@@ (rev @@REVISION@@)'
--- a/UI/LogView.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/UI/LogView.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing the log viewer widget and the log widget.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.QtCore import Qt, pyqtSignal
 from PyQt4.QtGui import QTextEdit, QBrush, QApplication, QMenu, QTextCursor, \
--- a/UI/NotificationWidget.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/UI/NotificationWidget.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing a Notification widget.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.QtCore import Qt, QTimer, QPoint
 from PyQt4.QtGui import QWidget, QPixmap
--- a/UI/NumbersWidget.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/UI/NumbersWidget.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing a widget to show numbers in different formats.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.QtCore import pyqtSlot, pyqtSignal, Qt, QAbstractTableModel, \
     qVersion
--- a/UI/PixmapCache.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/UI/PixmapCache.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing a pixmap cache for icons.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 import os
--- a/UI/Previewer.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/UI/Previewer.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing a previewer widget for HTML, Markdown and ReST files.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 import os
 import threading
--- a/UI/SearchWidget.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/UI/SearchWidget.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing the search box for the shel, terminal and log viewer.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.QtCore import pyqtSlot, pyqtSignal, Qt
 from PyQt4.QtGui import QWidget, QSpacerItem, QSizePolicy
--- a/UI/SplashScreen.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/UI/SplashScreen.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing a splashscreen for eric5.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 import os.path
 import logging
--- a/UI/SymbolsWidget.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/UI/SymbolsWidget.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,14 +7,14 @@
 Module implementing a widget to select a symbol in various formats.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 import sys
 import unicodedata
 try:  # Py3
     import html.entities as html_entities
 except (ImportError):
-    chr = unichr
+    chr = unichr    # __IGNORE_WARNING__
     import htmlentitydefs as html_entities    # __IGNORE_WARNING__

 from PyQt4.QtCore import pyqtSlot, pyqtSignal, QAbstractTableModel, \
--- a/UI/UserInterface.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/UI/UserInterface.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,9 +7,9 @@
 Module implementing the main user interface.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals
 try:
-    str = unicode
+    str = unicode    # __IGNORE_WARNING__
 except (NameError):
     pass
--- a/Utilities/AutoSaver.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Utilities/AutoSaver.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing an auto saver class.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.QtCore import QObject, QBasicTimer, QTime
--- a/Utilities/ClassBrowsers/ClbrBaseClasses.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Utilities/ClassBrowsers/ClbrBaseClasses.py	Sat Dec 14 23:44:25 2013 +0100
@@ -8,7 +8,7 @@
 """


-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals


 class _ClbrBase(object):
--- a/Utilities/ClassBrowsers/__init__.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Utilities/ClassBrowsers/__init__.py	Sat Dec 14 23:44:25 2013 +0100
@@ -16,7 +16,7 @@
 </ul>
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 import os
 import imp
--- a/Utilities/ClassBrowsers/idlclbr.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Utilities/ClassBrowsers/idlclbr.py	Sat Dec 14 23:44:25 2013 +0100
@@ -14,7 +14,7 @@
 It is based on the Python class browser found in this package.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 import re
--- a/Utilities/ClassBrowsers/jsclbr.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Utilities/ClassBrowsers/jsclbr.py	Sat Dec 14 23:44:25 2013 +0100
@@ -9,7 +9,7 @@
 It uses the JavaScript parser contained in the jasy web framework.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 import ThirdParty.Jasy.jasy.js.parse.Parser as jsParser
--- a/Utilities/ClassBrowsers/pyclbr.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Utilities/ClassBrowsers/pyclbr.py	Sat Dec 14 23:44:25 2013 +0100
@@ -13,7 +13,7 @@
 """


-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 import sys
 import imp
--- a/Utilities/ClassBrowsers/rbclbr.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Utilities/ClassBrowsers/rbclbr.py	Sat Dec 14 23:44:25 2013 +0100
@@ -12,7 +12,7 @@
 It is based on the Python class browser found in this package.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 import re
--- a/Utilities/FtpUtilities.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Utilities/FtpUtilities.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing some FTP related utilities.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 import os
--- a/Utilities/ModuleParser.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Utilities/ModuleParser.py	Sat Dec 14 23:44:25 2013 +0100
@@ -16,7 +16,7 @@
 </ul>
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 import sys
 import os
--- a/Utilities/PasswordChecker.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Utilities/PasswordChecker.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing a checker for password strength.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 import re
--- a/Utilities/__init__.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Utilities/__init__.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Package implementing various functions/classes needed everywhere within eric5.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals
 try:
     str = unicode   # __IGNORE_WARNING__
     import urllib
--- a/Utilities/binplistlib.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Utilities/binplistlib.py	Sat Dec 14 23:44:25 2013 +0100
@@ -52,9 +52,9 @@
 </pre>
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals
 try:
-    str = unicode
+    str = unicode    # __IGNORE_WARNING__
 except (NameError):
     pass
--- a/Utilities/compatibility_fixes.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Utilities/compatibility_fixes.py	Sat Dec 14 23:44:25 2013 +0100
@@ -10,7 +10,7 @@
 should throw a NotImplementedError exception.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 import __builtin__
 import codecs
@@ -74,7 +74,7 @@
         else:
             self.__errors = errors

-        file.__init__(self, filein,  mode,  buffering)
+        file.__init__(self, filein,  mode,  buffering)    #__IGNORE_WARNING__

     def read(self,  n=-1):
         """
--- a/Utilities/crypto/__init__.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Utilities/crypto/__init__.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Package implementing cryptography related functionality.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 import random
 import base64
--- a/Utilities/crypto/py3AES.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Utilities/crypto/py3AES.py	Sat Dec 14 23:44:25 2013 +0100
@@ -24,7 +24,7 @@
 Advanced Encryption Standard.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 import os
 import math
--- a/Utilities/crypto/py3PBKDF2.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Utilities/crypto/py3PBKDF2.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing PBKDF2 functions.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 import hashlib
 import hmac
--- a/Utilities/uic.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/Utilities/uic.py	Sat Dec 14 23:44:25 2013 +0100
@@ -8,7 +8,7 @@
 directory or directory tree.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 import os
--- a/VCS/CommandOptionsDialog.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/VCS/CommandOptionsDialog.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing the VCS command options dialog.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.QtGui import QDialog
--- a/VCS/ProjectBrowserHelper.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/VCS/ProjectBrowserHelper.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing the base class of the VCS project browser helper.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 import os
--- a/VCS/ProjectHelper.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/VCS/ProjectHelper.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing the base class of the VCS project helper.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 import os
 import shutil
--- a/VCS/RepositoryInfoDialog.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/VCS/RepositoryInfoDialog.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implemting a dialog to show repository information.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.QtGui import QDialog
--- a/VCS/StatusMonitorLed.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/VCS/StatusMonitorLed.py	Sat Dec 14 23:44:25 2013 +0100
@@ -8,7 +8,7 @@
 thread.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.QtCore import Qt
 from PyQt4.QtGui import QColor, QInputDialog, QMenu
--- a/VCS/StatusMonitorThread.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/VCS/StatusMonitorThread.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing the VCS status monitor thread base class.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.QtCore import QThread, QMutex, QWaitCondition, pyqtSignal
--- a/VCS/VersionControl.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/VCS/VersionControl.py	Sat Dec 14 23:44:25 2013 +0100
@@ -8,7 +8,7 @@
 VCS interfaces.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 import os
--- a/VCS/__init__.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/VCS/__init__.py	Sat Dec 14 23:44:25 2013 +0100
@@ -13,7 +13,7 @@
 interfaces (i.e. CVS) have to be subclasses of this base class.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from E5Gui.E5Application import e5App
--- a/ViewManager/BookmarkedFilesDialog.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/ViewManager/BookmarkedFilesDialog.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing a configuration dialog for the bookmarked files menu.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 from PyQt4.QtCore import QFileInfo, Qt, pyqtSlot
 from PyQt4.QtGui import QListWidgetItem, QColor, QDialog
--- a/ViewManager/ViewManager.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/ViewManager/ViewManager.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing the viewmanager base class.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 import os
--- a/ViewManager/__init__.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/ViewManager/__init__.py	Sat Dec 14 23:44:25 2013 +0100
@@ -15,7 +15,7 @@
 default.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 import Preferences
--- a/compileUiFiles.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/compileUiFiles.py	Sat Dec 14 23:44:25 2013 +0100
@@ -8,7 +8,7 @@
 Script for eric5 to compile all .ui files to Python source.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 import sys
 import os
--- a/eric5.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/eric5.py	Sat Dec 14 23:44:25 2013 +0100
@@ -11,13 +11,13 @@
 of the IDE and starts the Qt event loop.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 try:  # Only for Py2
     import sip
     sip.setapi('QString', 2)
     sip.setapi('QVariant', 2)
-    sip.setapi('QTextStream',  2)
+    sip.setapi('QTextStream', 2)
     import StringIO as io
     import Utilities.compatibility_fixes     # __IGNORE_WARNING__
 except (ImportError):
--- a/eric5_api.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/eric5_api.py	Sat Dec 14 23:44:25 2013 +0100
@@ -12,7 +12,7 @@
 This script can be used via the commandline as well.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals
 try:  # Only for Py2
     import sip
     sip.setapi('QString', 2)
--- a/eric5_compare.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/eric5_compare.py	Sat Dec 14 23:44:25 2013 +0100
@@ -12,7 +12,7 @@
 version of the integrated Compare module.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals
 try:  # Only for Py2
     import sip
     sip.setapi('QString', 2)
--- a/eric5_configure.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/eric5_configure.py	Sat Dec 14 23:44:25 2013 +0100
@@ -10,7 +10,7 @@
 This is the main Python script to configure the eric5 IDE from the outside.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals
 try:  # Only for Py2
     import sip
     sip.setapi('QString', 2)
--- a/eric5_diff.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/eric5_diff.py	Sat Dec 14 23:44:25 2013 +0100
@@ -12,7 +12,7 @@
 version of the integrated Diff module.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals
 try:  # Only for Py2
     import sip
     sip.setapi('QString', 2)
--- a/eric5_doc.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/eric5_doc.py	Sat Dec 14 23:44:25 2013 +0100
@@ -12,7 +12,7 @@
 This script can be used via the commandline as well.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals
 try:  # Only for Py2
     import sip
     sip.setapi('QString', 2)
--- a/eric5_editor.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/eric5_editor.py	Sat Dec 14 23:44:25 2013 +0100
@@ -12,7 +12,7 @@
 version of the integrated MiniEditor module.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals
 try:  # Only for Py2
     import sip
     sip.setapi('QString', 2)
--- a/eric5_iconeditor.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/eric5_iconeditor.py	Sat Dec 14 23:44:25 2013 +0100
@@ -12,7 +12,7 @@
 of the integrated icon editor.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals
 try:  # Only for Py2
     import sip
     sip.setapi('QString', 2)
--- a/eric5_plugininstall.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/eric5_plugininstall.py	Sat Dec 14 23:44:25 2013 +0100
@@ -11,7 +11,7 @@
 IDE.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals
 try:  # Only for Py2
     import sip
     sip.setapi('QString', 2)
--- a/eric5_pluginrepository.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/eric5_pluginrepository.py	Sat Dec 14 23:44:25 2013 +0100
@@ -11,7 +11,7 @@
 IDE.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals
 try:  # Only for Py2
     import sip
     sip.setapi('QString', 2)
--- a/eric5_pluginuninstall.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/eric5_pluginuninstall.py	Sat Dec 14 23:44:25 2013 +0100
@@ -11,7 +11,7 @@
 IDE.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals
 try:  # Only for Py2
     import sip
     sip.setapi('QString', 2)
--- a/eric5_qregexp.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/eric5_qregexp.py	Sat Dec 14 23:44:25 2013 +0100
@@ -12,7 +12,7 @@
 version of the integrated QRegExp wizard.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals
 try:  # Only for Py2
     import sip
     sip.setapi('QString', 2)
--- a/eric5_qregularexpression.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/eric5_qregularexpression.py	Sat Dec 14 23:44:25 2013 +0100
@@ -12,7 +12,7 @@
 a standalone version of the integrated QRegularExpression wizard.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 try:  # Only for Py2
     import sip
--- a/eric5_re.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/eric5_re.py	Sat Dec 14 23:44:25 2013 +0100
@@ -12,7 +12,7 @@
 standalone version of the integrated PyRegExp wizard.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals
 try:  # Only for Py2
     import sip
     sip.setapi('QString', 2)
--- a/eric5_snap.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/eric5_snap.py	Sat Dec 14 23:44:25 2013 +0100
@@ -11,7 +11,7 @@
 of the snapshot module and starts the Qt event loop.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals
 try:  # Only for Py2
     import sip
     sip.setapi('QString', 2)
--- a/eric5_sqlbrowser.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/eric5_sqlbrowser.py	Sat Dec 14 23:44:25 2013 +0100
@@ -11,7 +11,7 @@
 of the SQL browser and starts the Qt event loop.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals
 try:  # Only for Py2
     import sip
     sip.setapi('QString', 2)
--- a/eric5_tray.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/eric5_tray.py	Sat Dec 14 23:44:25 2013 +0100
@@ -12,7 +12,7 @@
 context menu to start the eric5 IDE and the eric5 tools.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals
 try:  # Only for Py2
     import sip
     sip.setapi('QString', 2)
--- a/eric5_trpreviewer.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/eric5_trpreviewer.py	Sat Dec 14 23:44:25 2013 +0100
@@ -12,7 +12,7 @@
 of the integrated tr previewer.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals
 try:  # Only for Py2
     import sip
     sip.setapi('QString', 2)
--- a/eric5_uipreviewer.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/eric5_uipreviewer.py	Sat Dec 14 23:44:25 2013 +0100
@@ -12,7 +12,7 @@
 of the integrated ui previewer.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals
 try:  # Only for Py2
     import sip
     sip.setapi('QString', 2)
--- a/eric5_unittest.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/eric5_unittest.py	Sat Dec 14 23:44:25 2013 +0100
@@ -12,7 +12,7 @@
 version of the integrated unittest module.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals
 try:  # Only for Py2
     import sip
     sip.setapi('QString', 2)
--- a/eric5_webbrowser.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/eric5_webbrowser.py	Sat Dec 14 23:44:25 2013 +0100
@@ -12,7 +12,7 @@
 of the integrated helpviewer.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals
 try:  # Only for Py2
     import sip
     sip.setapi('QString', 2)
--- a/eric5config.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/eric5config.py	Sat Dec 14 23:44:25 2013 +0100
@@ -7,7 +7,7 @@
 Module containing the default configuration of the eric5 installation.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 import sys
 import os
--- a/install-i18n.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/install-i18n.py	Sat Dec 14 23:44:25 2013 +0100
@@ -9,7 +9,7 @@
 Installation script for the eric5 IDE translation files.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 import sys
 import os
--- a/install.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/install.py	Sat Dec 14 23:44:25 2013 +0100
@@ -9,8 +9,8 @@
 Installation script for the eric5 IDE and all eric5 related tools.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
-from __future__ import print_function    # __IGNORE_WARNING__
+from __future__ import unicode_literals
+from __future__ import print_function
 try:
     import cStringIO as io
     import sip
@@ -18,7 +18,7 @@
     sip.setapi('QVariant', 2)
     sip.setapi('QTextStream',  2)
 except (ImportError):
-    import io
+    import io    # __IGNORE_WARNING__

 import sys
 import os
--- a/patch_modpython.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/patch_modpython.py	Sat Dec 14 23:44:25 2013 +0100
@@ -8,7 +8,7 @@
 Script to patch mod_python for usage with the eric5 IDE.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 import sys
 import os
--- a/uninstall.py	Sat Dec 14 23:05:59 2013 +0100
+++ b/uninstall.py	Sat Dec 14 23:44:25 2013 +0100
@@ -9,7 +9,7 @@
 Uninstallation script for the eric5 IDE and all eric5 related tools.
 """

-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals

 import sys
 import os