Merge with default branch after fixed indentation issues and lates changes. Py2 comp.

Sun, 03 Nov 2013 15:58:22 +0100

author
T.Rzepka <Tobias.Rzepka@gmail.com>
date
Sun, 03 Nov 2013 15:58:22 +0100
branch
Py2 comp.
changeset 3060
5883ce99ee12
parent 3058
0a02c433f52d (current diff)
parent 3059
16c93928cfc5 (diff)
child 3061
1c0ea3a87390

Merge with default branch after fixed indentation issues and lates changes.

APIs/Python3/eric5.api file | annotate | diff | comparison | revisions
APIs/Python3/eric5.bas file | annotate | diff | comparison | revisions
Cooperation/ChatWidget.py file | annotate | diff | comparison | revisions
DataViews/PyCoverageDialog.py file | annotate | diff | comparison | revisions
Debugger/BreakPointModel.py file | annotate | diff | comparison | revisions
Debugger/CallStackViewer.py file | annotate | diff | comparison | revisions
Debugger/CallTraceViewer.py file | annotate | diff | comparison | revisions
Debugger/Config.py file | annotate | diff | comparison | revisions
Debugger/DebugServer.py file | annotate | diff | comparison | revisions
Debugger/DebugUI.py file | annotate | diff | comparison | revisions
Debugger/DebuggerInterfacePython.py file | annotate | diff | comparison | revisions
Debugger/DebuggerInterfacePython3.py file | annotate | diff | comparison | revisions
Debugger/DebuggerInterfaceRuby.py file | annotate | diff | comparison | revisions
Debugger/VariablesViewer.py file | annotate | diff | comparison | revisions
Debugger/WatchPointModel.py file | annotate | diff | comparison | revisions
Debugger/WatchPointViewer.py file | annotate | diff | comparison | revisions
Documentation/Help/source.qch file | annotate | diff | comparison | revisions
Documentation/Help/source.qhp file | annotate | diff | comparison | revisions
DocumentationTools/APIGenerator.py file | annotate | diff | comparison | revisions
DocumentationTools/IndexGenerator.py file | annotate | diff | comparison | revisions
DocumentationTools/ModuleDocumentor.py file | annotate | diff | comparison | revisions
DocumentationTools/QtHelpGenerator.py file | annotate | diff | comparison | revisions
DocumentationTools/TemplatesListsStyle.py file | annotate | diff | comparison | revisions
DocumentationTools/TemplatesListsStyleCSS.py file | annotate | diff | comparison | revisions
E5Graphics/E5GraphicsView.py file | annotate | diff | comparison | revisions
E5Gui/E5Action.py file | annotate | diff | comparison | revisions
E5Gui/E5Completers.py file | annotate | diff | comparison | revisions
E5Gui/E5MainWindow.py file | annotate | diff | comparison | revisions
E5Gui/E5ModelMenu.py file | annotate | diff | comparison | revisions
E5Gui/E5ModelToolBar.py file | annotate | diff | comparison | revisions
E5Gui/E5PassivePopup.py file | annotate | diff | comparison | revisions
E5Gui/E5SqueezeLabels.py file | annotate | diff | comparison | revisions
E5Gui/E5ToolBarDialog.py file | annotate | diff | comparison | revisions
E5Gui/E5ToolBarManager.py file | annotate | diff | comparison | revisions
E5Network/E5Ftp.py file | annotate | diff | comparison | revisions
E5Network/E5SslCertificatesDialog.py file | annotate | diff | comparison | revisions
E5Network/E5SslErrorHandler.py file | annotate | diff | comparison | revisions
E5XML/DebuggerPropertiesWriter.py file | annotate | diff | comparison | revisions
E5XML/HighlightingStylesWriter.py file | annotate | diff | comparison | revisions
E5XML/MultiProjectWriter.py file | annotate | diff | comparison | revisions
E5XML/PluginRepositoryReader.py file | annotate | diff | comparison | revisions
E5XML/ProjectWriter.py file | annotate | diff | comparison | revisions
E5XML/TasksReader.py file | annotate | diff | comparison | revisions
E5XML/UserProjectWriter.py file | annotate | diff | comparison | revisions
E5XML/XMLStreamReaderBase.py file | annotate | diff | comparison | revisions
Globals/AppInfo.py file | annotate | diff | comparison | revisions
Globals/__init__.py file | annotate | diff | comparison | revisions
Graphics/ApplicationDiagramBuilder.py file | annotate | diff | comparison | revisions
Graphics/ImportsDiagramBuilder.py file | annotate | diff | comparison | revisions
Graphics/PackageDiagramBuilder.py file | annotate | diff | comparison | revisions
Graphics/PixmapDiagram.py file | annotate | diff | comparison | revisions
Graphics/SvgDiagram.py file | annotate | diff | comparison | revisions
Graphics/UMLClassDiagramBuilder.py file | annotate | diff | comparison | revisions
Graphics/UMLDialog.py file | annotate | diff | comparison | revisions
Graphics/UMLGraphicsView.py file | annotate | diff | comparison | revisions
Helpviewer/AdBlock/AdBlockBlockedNetworkReply.py file | annotate | diff | comparison | revisions
Helpviewer/AdBlock/AdBlockDialog.py file | annotate | diff | comparison | revisions
Helpviewer/AdBlock/AdBlockIcon.py file | annotate | diff | comparison | revisions
Helpviewer/AdBlock/AdBlockNetwork.py file | annotate | diff | comparison | revisions
Helpviewer/AdBlock/AdBlockRule.py file | annotate | diff | comparison | revisions
Helpviewer/AdBlock/AdBlockSubscription.py file | annotate | diff | comparison | revisions
Helpviewer/Bookmarks/BookmarkPropertiesDialog.py file | annotate | diff | comparison | revisions
Helpviewer/Bookmarks/BookmarksManager.py file | annotate | diff | comparison | revisions
Helpviewer/Bookmarks/BookmarksMenu.py file | annotate | diff | comparison | revisions
Helpviewer/Bookmarks/BookmarksModel.py file | annotate | diff | comparison | revisions
Helpviewer/ClosedTabsManager.py file | annotate | diff | comparison | revisions
Helpviewer/CookieJar/CookieExceptionsModel.py file | annotate | diff | comparison | revisions
Helpviewer/CookieJar/CookieJar.py file | annotate | diff | comparison | revisions
Helpviewer/Download/DownloadItem.py file | annotate | diff | comparison | revisions
Helpviewer/Download/DownloadManager.py file | annotate | diff | comparison | revisions
Helpviewer/Feeds/FeedsManager.py file | annotate | diff | comparison | revisions
Helpviewer/GreaseMonkey/GreaseMonkeyAddScriptDialog.py file | annotate | diff | comparison | revisions
Helpviewer/GreaseMonkey/GreaseMonkeyConfiguration/GreaseMonkeyConfigurationDialog.py file | annotate | diff | comparison | revisions
Helpviewer/GreaseMonkey/GreaseMonkeyConfiguration/GreaseMonkeyConfigurationListDelegate.py file | annotate | diff | comparison | revisions
Helpviewer/GreaseMonkey/GreaseMonkeyConfiguration/GreaseMonkeyConfigurationScriptInfoDialog.py file | annotate | diff | comparison | revisions
Helpviewer/GreaseMonkey/GreaseMonkeyDownloader.py file | annotate | diff | comparison | revisions
Helpviewer/GreaseMonkey/GreaseMonkeyManager.py file | annotate | diff | comparison | revisions
Helpviewer/HelpBrowserWV.py file | annotate | diff | comparison | revisions
Helpviewer/HelpDocsInstaller.py file | annotate | diff | comparison | revisions
Helpviewer/HelpIndexWidget.py file | annotate | diff | comparison | revisions
Helpviewer/HelpLanguagesDialog.py file | annotate | diff | comparison | revisions
Helpviewer/HelpTabBar.py file | annotate | diff | comparison | revisions
Helpviewer/HelpTabWidget.py file | annotate | diff | comparison | revisions
Helpviewer/HelpTocWidget.py file | annotate | diff | comparison | revisions
Helpviewer/HelpTopicDialog.py file | annotate | diff | comparison | revisions
Helpviewer/HelpWebSearchWidget.py file | annotate | diff | comparison | revisions
Helpviewer/HelpWindow.py file | annotate | diff | comparison | revisions
Helpviewer/History/HistoryFilterModel.py file | annotate | diff | comparison | revisions
Helpviewer/History/HistoryManager.py file | annotate | diff | comparison | revisions
Helpviewer/History/HistoryMenu.py file | annotate | diff | comparison | revisions
Helpviewer/OpenSearch/DefaultSearchEngines/DefaultSearchEngines_rc.py file | annotate | diff | comparison | revisions
Helpviewer/OpenSearch/OpenSearchEngine.py file | annotate | diff | comparison | revisions
Helpviewer/OpenSearch/OpenSearchEngineModel.py file | annotate | diff | comparison | revisions
Helpviewer/OpenSearch/OpenSearchManager.py file | annotate | diff | comparison | revisions
Helpviewer/OpenSearch/OpenSearchReader.py file | annotate | diff | comparison | revisions
Helpviewer/PageScreenDialog.py file | annotate | diff | comparison | revisions
Helpviewer/Passwords/PasswordManager.py file | annotate | diff | comparison | revisions
Helpviewer/QtHelpDocumentationDialog.py file | annotate | diff | comparison | revisions
Helpviewer/SiteInfo/SiteInfoDialog.py file | annotate | diff | comparison | revisions
Helpviewer/SpeedDial/Page.py file | annotate | diff | comparison | revisions
Helpviewer/Sync/DirectorySyncHandler.py file | annotate | diff | comparison | revisions
Helpviewer/Sync/FtpSyncHandler.py file | annotate | diff | comparison | revisions
Helpviewer/Sync/SyncEncryptionPage.py file | annotate | diff | comparison | revisions
Helpviewer/Sync/SyncHandler.py file | annotate | diff | comparison | revisions
Helpviewer/Sync/SyncManager.py file | annotate | diff | comparison | revisions
Helpviewer/UrlBar/StackedUrlBar.py file | annotate | diff | comparison | revisions
Helpviewer/UrlBar/UrlBar.py file | annotate | diff | comparison | revisions
Helpviewer/UserAgent/UserAgentManager.py file | annotate | diff | comparison | revisions
Helpviewer/UserAgent/UserAgentMenu.py file | annotate | diff | comparison | revisions
Helpviewer/VirusTotalApi.py file | annotate | diff | comparison | revisions
Helpviewer/WebPlugins/ClickToFlash/ClickToFlash.py file | annotate | diff | comparison | revisions
Helpviewer/WebPlugins/ClickToFlash/ClickToFlashPlugin.py file | annotate | diff | comparison | revisions
IconEditor/IconEditorGrid.py file | annotate | diff | comparison | revisions
IconEditor/IconEditorWindow.py file | annotate | diff | comparison | revisions
MultiProject/AddProjectDialog.py file | annotate | diff | comparison | revisions
MultiProject/MultiProject.py file | annotate | diff | comparison | revisions
Network/IRC/IrcChannelWidget.py file | annotate | diff | comparison | revisions
Network/IRC/IrcIdentitiesEditDialog.py file | annotate | diff | comparison | revisions
Network/IRC/IrcNetworkEditDialog.py file | annotate | diff | comparison | revisions
Network/IRC/IrcNetworkListDialog.py file | annotate | diff | comparison | revisions
Network/IRC/IrcNetworkWidget.py file | annotate | diff | comparison | revisions
Network/IRC/IrcUtilities.py file | annotate | diff | comparison | revisions
Network/IRC/IrcWidget.py file | annotate | diff | comparison | revisions
PluginManager/PluginInfoDialog.py file | annotate | diff | comparison | revisions
PluginManager/PluginInstallDialog.py file | annotate | diff | comparison | revisions
PluginManager/PluginManager.py file | annotate | diff | comparison | revisions
PluginManager/PluginRepositoryDialog.py file | annotate | diff | comparison | revisions
PluginManager/PluginUninstallDialog.py file | annotate | diff | comparison | revisions
Plugins/AboutPlugin/AboutDialog.py file | annotate | diff | comparison | revisions
Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleChecker.py file | annotate | diff | comparison | revisions
Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py file | annotate | diff | comparison | revisions
Plugins/CheckerPlugins/CodeStyleChecker/DocStyleChecker.py file | annotate | diff | comparison | revisions
Plugins/CheckerPlugins/SyntaxChecker/SyntaxCheckerDialog.py file | annotate | diff | comparison | revisions
Plugins/CheckerPlugins/Tabnanny/Tabnanny.py file | annotate | diff | comparison | revisions
Plugins/CheckerPlugins/Tabnanny/TabnannyDialog.py file | annotate | diff | comparison | revisions
Plugins/PluginAbout.py file | annotate | diff | comparison | revisions
Plugins/PluginEricapi.py file | annotate | diff | comparison | revisions
Plugins/PluginEricdoc.py file | annotate | diff | comparison | revisions
Plugins/PluginSyntaxChecker.py file | annotate | diff | comparison | revisions
Plugins/PluginTabnanny.py file | annotate | diff | comparison | revisions
Plugins/PluginVcsMercurial.py file | annotate | diff | comparison | revisions
Plugins/PluginVcsPySvn.py file | annotate | diff | comparison | revisions
Plugins/PluginVcsSubversion.py file | annotate | diff | comparison | revisions
Plugins/PluginWizardE5MessageBox.py file | annotate | diff | comparison | revisions
Plugins/PluginWizardPyRegExp.py file | annotate | diff | comparison | revisions
Plugins/PluginWizardQColorDialog.py file | annotate | diff | comparison | revisions
Plugins/PluginWizardQFileDialog.py file | annotate | diff | comparison | revisions
Plugins/PluginWizardQFontDialog.py file | annotate | diff | comparison | revisions
Plugins/PluginWizardQInputDialog.py file | annotate | diff | comparison | revisions
Plugins/PluginWizardQMessageBox.py file | annotate | diff | comparison | revisions
Plugins/PluginWizardQRegExp.py file | annotate | diff | comparison | revisions
Plugins/PluginWizardQRegularExpression.py file | annotate | diff | comparison | revisions
Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkRenameDialog.py file | annotate | diff | comparison | revisions
Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarksInOutDialog.py file | annotate | diff | comparison | revisions
Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarksListDialog.py file | annotate | diff | comparison | revisions
Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py file | annotate | diff | comparison | revisions
Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.py file | annotate | diff | comparison | revisions
Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.py file | annotate | diff | comparison | revisions
Plugins/VcsPlugins/vcsMercurial/HgClient.py file | annotate | diff | comparison | revisions
Plugins/VcsPlugins/vcsMercurial/HgDialog.py file | annotate | diff | comparison | revisions
Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py file | annotate | diff | comparison | revisions
Plugins/VcsPlugins/vcsMercurial/HgGraftDialog.py file | annotate | diff | comparison | revisions
Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py file | annotate | diff | comparison | revisions
Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py file | annotate | diff | comparison | revisions
Plugins/VcsPlugins/vcsMercurial/HgMultiRevisionSelectionDialog.py file | annotate | diff | comparison | revisions
Plugins/VcsPlugins/vcsMercurial/HgNewProjectOptionsDialog.py file | annotate | diff | comparison | revisions
Plugins/VcsPlugins/vcsMercurial/HgServeDialog.py file | annotate | diff | comparison | revisions
Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py file | annotate | diff | comparison | revisions
Plugins/VcsPlugins/vcsMercurial/HgStatusMonitorThread.py file | annotate | diff | comparison | revisions
Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py file | annotate | diff | comparison | revisions
Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py file | annotate | diff | comparison | revisions
Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py file | annotate | diff | comparison | revisions
Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py file | annotate | diff | comparison | revisions
Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py file | annotate | diff | comparison | revisions
Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py file | annotate | diff | comparison | revisions
Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesNewPatchDialog.py file | annotate | diff | comparison | revisions
Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py file | annotate | diff | comparison | revisions
Plugins/VcsPlugins/vcsMercurial/RebaseExtension/ProjectHelper.py file | annotate | diff | comparison | revisions
Plugins/VcsPlugins/vcsMercurial/TransplantExtension/ProjectHelper.py file | annotate | diff | comparison | revisions
Plugins/VcsPlugins/vcsMercurial/TransplantExtension/TransplantDialog.py file | annotate | diff | comparison | revisions
Plugins/VcsPlugins/vcsMercurial/hg.py file | annotate | diff | comparison | revisions
Plugins/VcsPlugins/vcsPySvn/SvnConst.py file | annotate | diff | comparison | revisions
Plugins/VcsPlugins/vcsPySvn/SvnDialog.py file | annotate | diff | comparison | revisions
Plugins/VcsPlugins/vcsPySvn/SvnDialogMixin.py file | annotate | diff | comparison | revisions
Plugins/VcsPlugins/vcsPySvn/SvnDiffDialog.py file | annotate | diff | comparison | revisions
Plugins/VcsPlugins/vcsPySvn/SvnInfoDialog.py file | annotate | diff | comparison | revisions
Plugins/VcsPlugins/vcsPySvn/SvnMergeDialog.py file | annotate | diff | comparison | revisions
Plugins/VcsPlugins/vcsPySvn/SvnNewProjectOptionsDialog.py file | annotate | diff | comparison | revisions
Plugins/VcsPlugins/vcsPySvn/SvnRevisionSelectionDialog.py file | annotate | diff | comparison | revisions
Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py file | annotate | diff | comparison | revisions
Plugins/VcsPlugins/vcsPySvn/SvnStatusMonitorThread.py file | annotate | diff | comparison | revisions
Plugins/VcsPlugins/vcsPySvn/SvnUrlSelectionDialog.py file | annotate | diff | comparison | revisions
Plugins/VcsPlugins/vcsPySvn/subversion.py file | annotate | diff | comparison | revisions
Plugins/VcsPlugins/vcsSubversion/SvnChangeListsDialog.py file | annotate | diff | comparison | revisions
Plugins/VcsPlugins/vcsSubversion/SvnCommitDialog.py file | annotate | diff | comparison | revisions
Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py file | annotate | diff | comparison | revisions
Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py file | annotate | diff | comparison | revisions
Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.py file | annotate | diff | comparison | revisions
Plugins/VcsPlugins/vcsSubversion/SvnMergeDialog.py file | annotate | diff | comparison | revisions
Plugins/VcsPlugins/vcsSubversion/SvnPropListDialog.py file | annotate | diff | comparison | revisions
Plugins/VcsPlugins/vcsSubversion/SvnRevisionSelectionDialog.py file | annotate | diff | comparison | revisions
Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py file | annotate | diff | comparison | revisions
Plugins/VcsPlugins/vcsSubversion/SvnStatusMonitorThread.py file | annotate | diff | comparison | revisions
Plugins/VcsPlugins/vcsSubversion/SvnUrlSelectionDialog.py file | annotate | diff | comparison | revisions
Plugins/VcsPlugins/vcsSubversion/subversion.py file | annotate | diff | comparison | revisions
Plugins/ViewManagerPlugins/Listspace/Listspace.py file | annotate | diff | comparison | revisions
Plugins/ViewManagerPlugins/Tabview/Tabview.py file | annotate | diff | comparison | revisions
Plugins/WizardPlugins/ColorDialogWizard/ColorDialogWizardDialog.py file | annotate | diff | comparison | revisions
Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py file | annotate | diff | comparison | revisions
Plugins/WizardPlugins/PyRegExpWizard/PyRegExpWizardCharactersDialog.py file | annotate | diff | comparison | revisions
Plugins/WizardPlugins/QRegExpWizard/QRegExpWizardCharactersDialog.py file | annotate | diff | comparison | revisions
Plugins/WizardPlugins/QRegularExpressionWizard/QRegularExpressionWizardCharactersDialog.py file | annotate | diff | comparison | revisions
Plugins/WizardPlugins/QRegularExpressionWizard/QRegularExpressionWizardRepeatDialog.py file | annotate | diff | comparison | revisions
Preferences/ConfigurationDialog.py file | annotate | diff | comparison | revisions
Preferences/ConfigurationPages/CooperationPage.py file | annotate | diff | comparison | revisions
Preferences/ConfigurationPages/DebuggerGeneralPage.py file | annotate | diff | comparison | revisions
Preferences/ConfigurationPages/EditorAPIsPage.py file | annotate | diff | comparison | revisions
Preferences/ConfigurationPages/EditorAutocompletionQScintillaPage.py file | annotate | diff | comparison | revisions
Preferences/ConfigurationPages/EditorFilePage.py file | annotate | diff | comparison | revisions
Preferences/ConfigurationPages/EditorHighlightersPage.py file | annotate | diff | comparison | revisions
Preferences/ConfigurationPages/EditorHighlightingStylesPage.py file | annotate | diff | comparison | revisions
Preferences/ConfigurationPages/EmailPage.py file | annotate | diff | comparison | revisions
Preferences/ConfigurationPages/HelpAppearancePage.py file | annotate | diff | comparison | revisions
Preferences/ConfigurationPages/HelpVirusTotalPage.py file | annotate | diff | comparison | revisions
Preferences/ConfigurationPages/IconsPage.py file | annotate | diff | comparison | revisions
Preferences/ConfigurationPages/IrcPage.py file | annotate | diff | comparison | revisions
Preferences/ConfigurationPages/MultiProjectPage.py file | annotate | diff | comparison | revisions
Preferences/ConfigurationPages/QtPage.py file | annotate | diff | comparison | revisions
Preferences/ConfigurationPages/SecurityPage.py file | annotate | diff | comparison | revisions
Preferences/ProgramsDialog.py file | annotate | diff | comparison | revisions
Preferences/ShortcutDialog.py file | annotate | diff | comparison | revisions
Preferences/Shortcuts.py file | annotate | diff | comparison | revisions
Preferences/ShortcutsDialog.py file | annotate | diff | comparison | revisions
Preferences/ToolConfigurationDialog.py file | annotate | diff | comparison | revisions
Preferences/ToolGroupConfigurationDialog.py file | annotate | diff | comparison | revisions
Preferences/__init__.py file | annotate | diff | comparison | revisions
Project/AddFileDialog.py file | annotate | diff | comparison | revisions
Project/CreateDialogCodeDialog.py file | annotate | diff | comparison | revisions
Project/FiletypeAssociationDialog.py file | annotate | diff | comparison | revisions
Project/NewDialogClassDialog.py file | annotate | diff | comparison | revisions
Project/Project.py file | annotate | diff | comparison | revisions
Project/ProjectBaseBrowser.py file | annotate | diff | comparison | revisions
Project/ProjectBrowserModel.py file | annotate | diff | comparison | revisions
Project/ProjectFormsBrowser.py file | annotate | diff | comparison | revisions
Project/ProjectInterfacesBrowser.py file | annotate | diff | comparison | revisions
Project/ProjectResourcesBrowser.py file | annotate | diff | comparison | revisions
Project/ProjectSourcesBrowser.py file | annotate | diff | comparison | revisions
Project/ProjectTranslationsBrowser.py file | annotate | diff | comparison | revisions
Project/UserPropertiesDialog.py file | annotate | diff | comparison | revisions
PyUnit/UnittestDialog.py file | annotate | diff | comparison | revisions
QScintilla/Editor.py file | annotate | diff | comparison | revisions
QScintilla/Exporters/ExporterHTML.py file | annotate | diff | comparison | revisions
QScintilla/Exporters/ExporterPDF.py file | annotate | diff | comparison | revisions
QScintilla/Exporters/ExporterRTF.py file | annotate | diff | comparison | revisions
QScintilla/Exporters/ExporterTEX.py file | annotate | diff | comparison | revisions
QScintilla/Lexers/Lexer.py file | annotate | diff | comparison | revisions
QScintilla/Lexers/LexerPygments.py file | annotate | diff | comparison | revisions
QScintilla/MiniEditor.py file | annotate | diff | comparison | revisions
QScintilla/Printer.py file | annotate | diff | comparison | revisions
QScintilla/QsciScintillaCompat.py file | annotate | diff | comparison | revisions
QScintilla/SearchReplaceWidget.py file | annotate | diff | comparison | revisions
QScintilla/Shell.py file | annotate | diff | comparison | revisions
QScintilla/ShellHistoryDialog.py file | annotate | diff | comparison | revisions
QScintilla/TypingCompleters/CompleterPython.py file | annotate | diff | comparison | revisions
Snapshot/SnapWidget.py file | annotate | diff | comparison | revisions
Snapshot/SnapshotFreehandGrabber.py file | annotate | diff | comparison | revisions
Snapshot/SnapshotRegionGrabber.py file | annotate | diff | comparison | revisions
Snapshot/SnapshotTimer.py file | annotate | diff | comparison | revisions
SqlBrowser/SqlBrowser.py file | annotate | diff | comparison | revisions
SqlBrowser/SqlBrowserWidget.py file | annotate | diff | comparison | revisions
SqlBrowser/SqlConnectionWidget.py file | annotate | diff | comparison | revisions
Tasks/TaskFilter.py file | annotate | diff | comparison | revisions
Tasks/TaskViewer.py file | annotate | diff | comparison | revisions
Templates/TemplateMultipleVariablesDialog.py file | annotate | diff | comparison | revisions
Templates/TemplatePropertiesDialog.py file | annotate | diff | comparison | revisions
Templates/TemplateViewer.py file | annotate | diff | comparison | revisions
Toolbox/Startup.py file | annotate | diff | comparison | revisions
Tools/TRPreviewer.py file | annotate | diff | comparison | revisions
Tools/TrayStarter.py file | annotate | diff | comparison | revisions
Tools/UIPreviewer.py file | annotate | diff | comparison | revisions
UI/AuthenticationDialog.py file | annotate | diff | comparison | revisions
UI/Browser.py file | annotate | diff | comparison | revisions
UI/BrowserModel.py file | annotate | diff | comparison | revisions
UI/BrowserSortFilterProxyModel.py file | annotate | diff | comparison | revisions
UI/CompareDialog.py file | annotate | diff | comparison | revisions
UI/DiffDialog.py file | annotate | diff | comparison | revisions
UI/EmailDialog.py file | annotate | diff | comparison | revisions
UI/FindFileDialog.py file | annotate | diff | comparison | revisions
UI/NotificationWidget.py file | annotate | diff | comparison | revisions
UI/Previewer.py file | annotate | diff | comparison | revisions
UI/UserInterface.py file | annotate | diff | comparison | revisions
Utilities/ClassBrowsers/__init__.py file | annotate | diff | comparison | revisions
Utilities/ClassBrowsers/idlclbr.py file | annotate | diff | comparison | revisions
Utilities/ClassBrowsers/pyclbr.py file | annotate | diff | comparison | revisions
Utilities/ClassBrowsers/rbclbr.py file | annotate | diff | comparison | revisions
Utilities/FtpUtilities.py file | annotate | diff | comparison | revisions
Utilities/ModuleParser.py file | annotate | diff | comparison | revisions
Utilities/PasswordChecker.py file | annotate | diff | comparison | revisions
Utilities/__init__.py file | annotate | diff | comparison | revisions
Utilities/binplistlib.py file | annotate | diff | comparison | revisions
Utilities/crypto/py3AES.py file | annotate | diff | comparison | revisions
Utilities/crypto/py3PBKDF2.py file | annotate | diff | comparison | revisions
VCS/CommandOptionsDialog.py file | annotate | diff | comparison | revisions
VCS/ProjectBrowserHelper.py file | annotate | diff | comparison | revisions
VCS/ProjectHelper.py file | annotate | diff | comparison | revisions
ViewManager/BookmarkedFilesDialog.py file | annotate | diff | comparison | revisions
ViewManager/ViewManager.py file | annotate | diff | comparison | revisions
compileUiFiles.py file | annotate | diff | comparison | revisions
eric5.e4p file | annotate | diff | comparison | revisions
eric5.py file | annotate | diff | comparison | revisions
eric5_api.py file | annotate | diff | comparison | revisions
eric5_compare.py file | annotate | diff | comparison | revisions
eric5_configure.py file | annotate | diff | comparison | revisions
eric5_diff.py file | annotate | diff | comparison | revisions
eric5_doc.py file | annotate | diff | comparison | revisions
eric5_editor.py file | annotate | diff | comparison | revisions
eric5_iconeditor.py file | annotate | diff | comparison | revisions
eric5_plugininstall.py file | annotate | diff | comparison | revisions
eric5_pluginrepository.py file | annotate | diff | comparison | revisions
eric5_pluginuninstall.py file | annotate | diff | comparison | revisions
eric5_qregexp.py file | annotate | diff | comparison | revisions
eric5_qregularexpression.py file | annotate | diff | comparison | revisions
eric5_re.py file | annotate | diff | comparison | revisions
eric5_snap.py file | annotate | diff | comparison | revisions
eric5_sqlbrowser.py file | annotate | diff | comparison | revisions
eric5_tray.py file | annotate | diff | comparison | revisions
eric5_trpreviewer.py file | annotate | diff | comparison | revisions
eric5_uipreviewer.py file | annotate | diff | comparison | revisions
eric5_unittest.py file | annotate | diff | comparison | revisions
eric5_webbrowser.py file | annotate | diff | comparison | revisions
i18n/eric5_cs.ts file | annotate | diff | comparison | revisions
i18n/eric5_de.qm file | annotate | diff | comparison | revisions
i18n/eric5_de.ts file | annotate | diff | comparison | revisions
i18n/eric5_en.ts file | annotate | diff | comparison | revisions
i18n/eric5_es.ts file | annotate | diff | comparison | revisions
i18n/eric5_fr.ts file | annotate | diff | comparison | revisions
i18n/eric5_it.ts file | annotate | diff | comparison | revisions
i18n/eric5_ru.ts file | annotate | diff | comparison | revisions
i18n/eric5_tr.ts file | annotate | diff | comparison | revisions
i18n/eric5_zh_CN.GB2312.ts file | annotate | diff | comparison | revisions
install-i18n.py file | annotate | diff | comparison | revisions
install.py file | annotate | diff | comparison | revisions
patch_modpython.py file | annotate | diff | comparison | revisions
uninstall.py file | annotate | diff | comparison | revisions
--- a/APIs/Python3/eric5.api	Fri Nov 01 15:48:48 2013 +0100
+++ b/APIs/Python3/eric5.api	Sun Nov 03 15:58:22 2013 +0100
@@ -7071,8 +7071,50 @@
 eric5.QScintilla.Lexers.LexerPygments.LexerPygments.styleBitsNeeded?4()
 eric5.QScintilla.Lexers.LexerPygments.LexerPygments.styleText?4(start, end)
 eric5.QScintilla.Lexers.LexerPygments.LexerPygments?1(parent=None, name="")
+eric5.QScintilla.Lexers.LexerPygments.PYGMENTS_ATTRIBUTE?7
+eric5.QScintilla.Lexers.LexerPygments.PYGMENTS_BUILTIN?7
+eric5.QScintilla.Lexers.LexerPygments.PYGMENTS_CHAR?7
+eric5.QScintilla.Lexers.LexerPygments.PYGMENTS_CLASS?7
+eric5.QScintilla.Lexers.LexerPygments.PYGMENTS_COMMENT?7
+eric5.QScintilla.Lexers.LexerPygments.PYGMENTS_CONSTANT?7
+eric5.QScintilla.Lexers.LexerPygments.PYGMENTS_DECORATOR?7
+eric5.QScintilla.Lexers.LexerPygments.PYGMENTS_DEFAULT?7
+eric5.QScintilla.Lexers.LexerPygments.PYGMENTS_DELETED?7
+eric5.QScintilla.Lexers.LexerPygments.PYGMENTS_DOCSTRING?7
+eric5.QScintilla.Lexers.LexerPygments.PYGMENTS_EMPHASIZE?7
+eric5.QScintilla.Lexers.LexerPygments.PYGMENTS_ENTITY?7
+eric5.QScintilla.Lexers.LexerPygments.PYGMENTS_ERROR?7
+eric5.QScintilla.Lexers.LexerPygments.PYGMENTS_ESCAPE?7
+eric5.QScintilla.Lexers.LexerPygments.PYGMENTS_EXCEPTION?7
+eric5.QScintilla.Lexers.LexerPygments.PYGMENTS_FUNCTION?7
+eric5.QScintilla.Lexers.LexerPygments.PYGMENTS_GENERIC_ERROR?7
+eric5.QScintilla.Lexers.LexerPygments.PYGMENTS_HEADING?7
+eric5.QScintilla.Lexers.LexerPygments.PYGMENTS_HEREDOC?7
 eric5.QScintilla.Lexers.LexerPygments.PYGMENTS_INSERTED?7
+eric5.QScintilla.Lexers.LexerPygments.PYGMENTS_KEYWORD?7
+eric5.QScintilla.Lexers.LexerPygments.PYGMENTS_LABEL?7
+eric5.QScintilla.Lexers.LexerPygments.PYGMENTS_MULTILINECOMMENT?7
+eric5.QScintilla.Lexers.LexerPygments.PYGMENTS_NAMESPACE?7
+eric5.QScintilla.Lexers.LexerPygments.PYGMENTS_NUMBER?7
+eric5.QScintilla.Lexers.LexerPygments.PYGMENTS_OPERATOR?7
+eric5.QScintilla.Lexers.LexerPygments.PYGMENTS_OTHER?7
+eric5.QScintilla.Lexers.LexerPygments.PYGMENTS_OUTPUT?7
+eric5.QScintilla.Lexers.LexerPygments.PYGMENTS_PREPROCESSOR?7
+eric5.QScintilla.Lexers.LexerPygments.PYGMENTS_PROMPT?7
+eric5.QScintilla.Lexers.LexerPygments.PYGMENTS_PROPERTY?7
+eric5.QScintilla.Lexers.LexerPygments.PYGMENTS_PSEUDOKEYWORD?7
 eric5.QScintilla.Lexers.LexerPygments.PYGMENTS_PUNCTUATION?7
+eric5.QScintilla.Lexers.LexerPygments.PYGMENTS_REGEX?7
+eric5.QScintilla.Lexers.LexerPygments.PYGMENTS_SCALAR?7
+eric5.QScintilla.Lexers.LexerPygments.PYGMENTS_STRING?7
+eric5.QScintilla.Lexers.LexerPygments.PYGMENTS_STRONG?7
+eric5.QScintilla.Lexers.LexerPygments.PYGMENTS_SUBHEADING?7
+eric5.QScintilla.Lexers.LexerPygments.PYGMENTS_SYMBOL?7
+eric5.QScintilla.Lexers.LexerPygments.PYGMENTS_TAG?7
+eric5.QScintilla.Lexers.LexerPygments.PYGMENTS_TRACEBACK?7
+eric5.QScintilla.Lexers.LexerPygments.PYGMENTS_TYPEKEYWORD?7
+eric5.QScintilla.Lexers.LexerPygments.PYGMENTS_VARIABLE?7
+eric5.QScintilla.Lexers.LexerPygments.PYGMENTS_WORD?7
 eric5.QScintilla.Lexers.LexerPygments.TOKEN_MAP?7
 eric5.QScintilla.Lexers.LexerPython.LexerPython.autoCompletionWordSeparators?4()
 eric5.QScintilla.Lexers.LexerPython.LexerPython.defaultKeywords?4(kwSet)
@@ -8649,8 +8691,8 @@
 eric5.UtilitiesPython2.pep8.whitespace_around_operator?4(logical_line)
 eric5.UtilitiesPython2.pep8.whitespace_before_inline_comment?4(logical_line, tokens)
 eric5.UtilitiesPython2.pep8.whitespace_before_parameters?4(logical_line, tokens)
-eric5.VCS.CommandOptionsDialog.vcsCommandOptionsDialog.getOptions?4()
-eric5.VCS.CommandOptionsDialog.vcsCommandOptionsDialog?1(vcs, parent=None)
+eric5.VCS.CommandOptionsDialog.VcsCommandOptionsDialog.getOptions?4()
+eric5.VCS.CommandOptionsDialog.VcsCommandOptionsDialog?1(vcs, parent=None)
 eric5.VCS.ProjectBrowserHelper.VcsProjectBrowserHelper._VCSAdd?5()
 eric5.VCS.ProjectBrowserHelper.VcsProjectBrowserHelper._VCSAddTree?5()
 eric5.VCS.ProjectBrowserHelper.VcsProjectBrowserHelper._VCSCommit?5()
--- a/APIs/Python3/eric5.bas	Fri Nov 01 15:48:48 2013 +0100
+++ b/APIs/Python3/eric5.bas	Sun Nov 03 15:58:22 2013 +0100
@@ -735,6 +735,7 @@
 VariableItem QTreeWidgetItem
 VariablesFilterDialog QDialog Ui_VariablesFilterDialog
 VariablesViewer QTreeWidget
+VcsCommandOptionsDialog QDialog Ui_VcsCommandOptionsDialog
 VcsMercurialPlugin QObject
 VcsPage ConfigurationPageBase Ui_VcsPage
 VcsProjectBrowserHelper QObject
@@ -766,4 +767,3 @@
 XmlEntityResolver QXmlStreamEntityResolver
 ZoomDialog QDialog Ui_ZoomDialog
 _StrikeThroughExtension markdown.Extension
-vcsCommandOptionsDialog QDialog Ui_vcsCommandOptionsDialog
--- a/Cooperation/ChatWidget.py	Fri Nov 01 15:48:48 2013 +0100
+++ b/Cooperation/ChatWidget.py	Sun Nov 03 15:58:22 2013 +0100
@@ -589,7 +589,7 @@
                         self.trUtf8("""<p>The chat contents could not be"""
                                     """ written to <b>{0}</b></p>"""
                                     """<p>Reason: {1}</p>""") .format(
-                        fname, str(err)))
+                            fname, str(err)))
     
     def __copyChat(self):
         """
--- a/DataViews/PyCoverageDialog.py	Fri Nov 01 15:48:48 2013 +0100
+++ b/DataViews/PyCoverageDialog.py	Sun Nov 03 15:58:22 2013 +0100
@@ -197,7 +197,7 @@
                 try:
                     statements, excluded, missing, readable = \
                         cover.analysis2(file)[1:]
-                    readableEx = (excluded and self.__format_lines(excluded) 
+                    readableEx = (excluded and self.__format_lines(excluded)
                                   or '')
                     n = len(statements)
                     m = n - len(missing)
--- a/DebugClients/Python/AsyncFile.py	Fri Nov 01 15:48:48 2013 +0100
+++ b/DebugClients/Python/AsyncFile.py	Sun Nov 03 15:58:22 2013 +0100
@@ -276,7 +276,7 @@
         if not self.wpending:
             self.wpending = s
         elif type(self.wpending) != type(s) or \
-            len(self.wpending) + len(s) > self.maxbuffersize:
+                len(self.wpending) + len(s) > self.maxbuffersize:
             # flush wpending so that different string types are not
             # concatenated
             while self.wpending:
--- a/DebugClients/Python/DebugBase.py	Fri Nov 01 15:48:48 2013 +0100
+++ b/DebugClients/Python/DebugBase.py	Sun Nov 03 15:58:22 2013 +0100
@@ -740,7 +740,7 @@
         """
         # The program has finished if we have just left the first frame.
         if frame == self._dbgClient.mainFrame and \
-            self._mainThread:
+                self._mainThread:
             atexit._run_exitfuncs()
             self._dbgClient.progTerminated(retval)
         elif frame is not self.stepFrame:
@@ -783,7 +783,7 @@
         #XXX - think of a better way to do this.  It's only a convience for
         #debugging the debugger - when the debugger code is in the current
         #directory.
-        if os.path.basename(fn) in [\
+        if os.path.basename(fn) in [
             'AsyncFile.py', 'AsyncIO.py',
             'DebugConfig.py', 'DCTestResult.py',
             'DebugBase.py', 'DebugClientBase.py',
--- a/DebugClients/Python/DebugClientBase.py	Fri Nov 01 15:48:48 2013 +0100
+++ b/DebugClients/Python/DebugClientBase.py	Sun Nov 03 15:58:22 2013 +0100
@@ -673,9 +673,9 @@
                             compile(cond, '<string>', 'eval')
                         except SyntaxError:
                             self.write(
-                                '%s%s,%d\n' % \
-                                    (DebugProtocol.ResponseBPConditionError,
-                                     fn, line))
+                                '%s%s,%d\n' %
+                                (DebugProtocol.ResponseBPConditionError,
+                                 fn, line))
                             return
                     self.mainThread.set_break(fn, line, temporary, cond)
                 else:
@@ -852,13 +852,13 @@
                     try:
                         if failed:
                             self.test = unittest.defaultTestLoader\
-                                        .loadTestsFromNames(failed, utModule)
+                                .loadTestsFromNames(failed, utModule)
                         else:
                             self.test = unittest.defaultTestLoader\
-                                        .loadTestsFromName(tfn, utModule)
+                                .loadTestsFromName(tfn, utModule)
                     except AttributeError:
                         self.test = unittest.defaultTestLoader\
-                                    .loadTestsFromModule(utModule)
+                            .loadTestsFromModule(utModule)
                 except:
                     exc_type, exc_value, exc_tb = sys.exc_info()
                     self.write(
@@ -1011,7 +1011,7 @@
                 pass
             return self.clientCapabilities
         except ImportError:
-            return (self.clientCapabilities & 
+            return (self.clientCapabilities &
                     ~DebugClientCapabilities.HasProfiler)
         
     def write(self, s):
@@ -1490,7 +1490,7 @@
             if qtVariable:
                 vlist = self.__formatQt4Variable(qvar, qvtype)
             elif ("sipThis" in dict.keys() and len(dict) == 1) or \
-               (len(dict) == 0 and len(udict) > 0):
+                    (len(dict) == 0 and len(udict) > 0):
                 if access:
                     exec 'qvar = udict%s' % access
                 # this has to be in line with VariablesViewer.indicators
@@ -1643,7 +1643,7 @@
                 varlist.append(
                     ("internalId", "int", "%s" % value.internalId()))
                 varlist.append(
-                    ("internalPointer", "void *", "%s" % \
+                    ("internalPointer", "void *", "%s" %
                      value.internalPointer()))
         elif qttype == 'QRegExp':
             varlist.append(("pattern", "str", "%s" % value.pattern()))
@@ -1761,7 +1761,7 @@
                             if ConfigVarTypeStrings.index('class') in filter:
                                 continue
                         elif not valtype.startswith("PySide") and \
-                             ConfigVarTypeStrings.index('other') in filter:
+                                ConfigVarTypeStrings.index('other') in filter:
                             continue
                     
                 try:
--- a/DebugClients/Python/DebugClientCapabilities.py	Fri Nov 01 15:48:48 2013 +0100
+++ b/DebugClients/Python/DebugClientCapabilities.py	Sun Nov 03 15:58:22 2013 +0100
@@ -16,7 +16,7 @@
 HasShell = 0x0040
 
 HasAll = HasDebugger | HasInterpreter | HasProfiler | \
-         HasCoverage | HasCompleter | HasUnittest | HasShell
+    HasCoverage | HasCompleter | HasUnittest | HasShell
 
 #
 # eflag: FileType = Python2
--- a/DebugClients/Python/DebugConfig.py	Fri Nov 01 15:48:48 2013 +0100
+++ b/DebugClients/Python/DebugConfig.py	Sun Nov 03 15:58:22 2013 +0100
@@ -8,13 +8,13 @@
 """
 
 ConfigVarTypeStrings = [
-    '__', 'NoneType', 'type',\
-    'bool', 'int', 'long', 'float', 'complex',\
-    'str', 'unicode', 'tuple', 'list',\
-    'dict', 'dict-proxy', 'set', 'file', 'xrange',\
-    'slice', 'buffer', 'class', 'instance',\
-    'instance method', 'property', 'generator',\
-    'function', 'builtin_function_or_method', 'code', 'module',\
+    '__', 'NoneType', 'type',
+    'bool', 'int', 'long', 'float', 'complex',
+    'str', 'unicode', 'tuple', 'list',
+    'dict', 'dict-proxy', 'set', 'file', 'xrange',
+    'slice', 'buffer', 'class', 'instance',
+    'instance method', 'property', 'generator',
+    'function', 'builtin_function_or_method', 'code', 'module',
     'ellipsis', 'traceback', 'frame', 'other'
 ]
 
--- a/DebugClients/Python/FlexCompleter.py	Fri Nov 01 15:48:48 2013 +0100
+++ b/DebugClients/Python/FlexCompleter.py	Sun Nov 03 15:58:22 2013 +0100
@@ -126,7 +126,7 @@
         @param namespace namespace for the completer
         @exception TypeError raised to indicate a wrong namespace structure
         """
-        if namespace and type(namespace) != type({}):
+        if namespace and not isinstance(namespace, dict):
             raise TypeError('namespace must be a dictionary')
 
         # Don't bind to namespace quite yet, but flag whether the user wants a
--- a/DebugClients/Python/PyProfile.py	Fri Nov 01 15:48:48 2013 +0100
+++ b/DebugClients/Python/PyProfile.py	Sun Nov 03 15:58:22 2013 +0100
@@ -115,7 +115,7 @@
         """
         # get module name from __file__
         if not isinstance(frame, profile.Profile.fake_frame) and \
-            '__file__' in frame.f_globals:
+                '__file__' in frame.f_globals:
             root, ext = os.path.splitext(frame.f_globals['__file__'])
             if ext == '.pyc' or ext == '.py':
                 fixedName = root + '.py'
@@ -142,7 +142,7 @@
                                                        rframe, rframe.f_back,
                                                        frame, frame.f_back)
                 self.trace_dispatch_return(rframe, 0)
-                assert (self.cur is None or \
+                assert (self.cur is None or
                         frame.f_back is self.cur[-2]), ("Bad call",
                                                         self.cur[-3])
         fcode = frame.f_code
@@ -165,7 +165,7 @@
         "c_exception": profile.Profile.trace_dispatch_return,
         # the C function returned
         "c_return": profile.Profile.trace_dispatch_return,
-        }
+    }
 
 #
 # eflag: FileType = Python2
--- a/DebugClients/Python3/DebugBase.py	Fri Nov 01 15:48:48 2013 +0100
+++ b/DebugClients/Python3/DebugBase.py	Sun Nov 03 15:58:22 2013 +0100
@@ -763,7 +763,7 @@
         """
         # The program has finished if we have just left the first frame.
         if frame == self._dbgClient.mainFrame and \
-            self._mainThread:
+                self._mainThread:
             atexit._run_exitfuncs()
             self._dbgClient.progTerminated(retval)
         elif frame is not self.stepFrame:
@@ -807,7 +807,7 @@
         #XXX - think of a better way to do this.  It's only a convience for
         #debugging the debugger - when the debugger code is in the current
         #directory.
-        if os.path.basename(fn) in [\
+        if os.path.basename(fn) in [
             'AsyncFile.py', 'AsyncIO.py',
             'DebugConfig.py', 'DCTestResult.py',
             'DebugBase.py', 'DebugClientBase.py',
--- a/DebugClients/Python3/DebugClientBase.py	Fri Nov 01 15:48:48 2013 +0100
+++ b/DebugClients/Python3/DebugClientBase.py	Sun Nov 03 15:58:22 2013 +0100
@@ -859,13 +859,13 @@
                     try:
                         if failed:
                             self.test = unittest.defaultTestLoader\
-                                        .loadTestsFromNames(failed, utModule)
+                                .loadTestsFromNames(failed, utModule)
                         else:
                             self.test = unittest.defaultTestLoader\
-                                        .loadTestsFromName(tfn, utModule)
+                                .loadTestsFromName(tfn, utModule)
                     except AttributeError:
                         self.test = unittest.defaultTestLoader\
-                                    .loadTestsFromModule(utModule)
+                            .loadTestsFromModule(utModule)
                 except:
                     exc_type, exc_value, exc_tb = sys.exc_info()
                     self.write('{0}{1}\n'.format(
@@ -1019,7 +1019,7 @@
                 pass
             return self.clientCapabilities
         except ImportError:
-            return (self.clientCapabilities & 
+            return (self.clientCapabilities &
                     ~DebugClientCapabilities.HasProfiler)
     
     def write(self, s):
@@ -1432,7 +1432,7 @@
                             oaccess = ''
                         try:
                             loc = {"dict": dict}
-                            exec('mdict = dict{0!s}.__dict__\nobj = dict{0!s}'\
+                            exec('mdict = dict{0!s}.__dict__\nobj = dict{0!s}'
                                  .format(access), globals(), loc)
                             mdict = loc["mdict"]
                             obj = loc["obj"]
@@ -1445,7 +1445,7 @@
                             pass
                         try:
                             loc = {"dict": dict}
-                            exec('mcdict = dict{0!s}.__class__.__dict__'\
+                            exec('mcdict = dict{0!s}.__class__.__dict__'
                                  .format(access), globals(), loc)
                             ndict.update(loc["mcdict"])
                             if mdict and not "sipThis" in mdict.keys():
@@ -1461,8 +1461,7 @@
                                 try:
                                     loc["v"] = v
                                     exec('cdict[v] = dict{0!s}.{1!s}'.format(
-                                            access, v),
-                                         globals, loc)
+                                        access, v), globals, loc)
                                 except:
                                     pass
                             ndict.update(loc["cdict"])
@@ -1496,7 +1495,7 @@
                                 try:
                                     loc["v"] = v
                                     exec('cdict[v] = dict[var[i]].{0!s}'
-                                            .format(v),
+                                         .format(v),
                                          globals(), loc)
                                 except:
                                     pass
@@ -1515,7 +1514,7 @@
             if qtVariable:
                 vlist = self.__formatQt4Variable(qvar, qvtype)
             elif ("sipThis" in dict.keys() and len(dict) == 1) or \
-               (len(dict) == 0 and len(udict) > 0):
+                    (len(dict) == 0 and len(udict) > 0):
                 if access:
                     loc = {"udict": udict}
                     exec('qvar = udict{0!s}'.format(access), globals(), loc)
@@ -1817,7 +1816,7 @@
                             if ConfigVarTypeStrings.index('class') in filter:
                                 continue
                         elif not valtype.startswith("PySide") and \
-                             ConfigVarTypeStrings.index('other') in filter:
+                                ConfigVarTypeStrings.index('other') in filter:
                             continue
                 
                 try:
--- a/DebugClients/Python3/DebugClientCapabilities.py	Fri Nov 01 15:48:48 2013 +0100
+++ b/DebugClients/Python3/DebugClientCapabilities.py	Sun Nov 03 15:58:22 2013 +0100
@@ -16,4 +16,4 @@
 HasShell = 0x0040
 
 HasAll = HasDebugger | HasInterpreter | HasProfiler | \
-         HasCoverage | HasCompleter | HasUnittest | HasShell
+    HasCoverage | HasCompleter | HasUnittest | HasShell
--- a/DebugClients/Python3/DebugConfig.py	Fri Nov 01 15:48:48 2013 +0100
+++ b/DebugClients/Python3/DebugConfig.py	Sun Nov 03 15:58:22 2013 +0100
@@ -8,12 +8,12 @@
 """
 
 ConfigVarTypeStrings = [
-    '__', 'NoneType', 'type',\
-    'bool', 'int', 'long', 'float', 'complex',\
-    'str', 'unicode', 'tuple', 'list',\
-    'dict', 'dict-proxy', 'set', 'file', 'xrange',\
-    'slice', 'buffer', 'class', 'instance',\
-    'instance method', 'property', 'generator',\
-    'function', 'builtin_function_or_method', 'code', 'module',\
+    '__', 'NoneType', 'type',
+    'bool', 'int', 'long', 'float', 'complex',
+    'str', 'unicode', 'tuple', 'list',
+    'dict', 'dict-proxy', 'set', 'file', 'xrange',
+    'slice', 'buffer', 'class', 'instance',
+    'instance method', 'property', 'generator',
+    'function', 'builtin_function_or_method', 'code', 'module',
     'ellipsis', 'traceback', 'frame', 'other'
 ]
--- a/DebugClients/Python3/FlexCompleter.py	Fri Nov 01 15:48:48 2013 +0100
+++ b/DebugClients/Python3/FlexCompleter.py	Sun Nov 03 15:58:22 2013 +0100
@@ -77,7 +77,7 @@
         @exception TypeError raised to indicate a wrong data structure of
             the namespace object
         """
-        if namespace and type(namespace) != type({}):
+        if namespace and not isinstance(namespace, dict):
             raise TypeError('namespace must be a dictionary')
 
         # Don't bind to namespace quite yet, but flag whether the user wants a
--- a/DebugClients/Python3/PyProfile.py	Fri Nov 01 15:48:48 2013 +0100
+++ b/DebugClients/Python3/PyProfile.py	Sun Nov 03 15:58:22 2013 +0100
@@ -117,7 +117,7 @@
         """
         # get module name from __file__
         if not isinstance(frame, profile.Profile.fake_frame) and \
-            '__file__' in frame.f_globals:
+                '__file__' in frame.f_globals:
             root, ext = os.path.splitext(frame.f_globals['__file__'])
             if ext in ['.pyc', '.py', '.py3', '.pyo']:
                 fixedName = root + '.py'
@@ -148,7 +148,7 @@
                                                        rframe, rframe.f_back,
                                                        frame, frame.f_back)
                 self.trace_dispatch_return(rframe, 0)
-                assert (self.cur is None or \
+                assert (self.cur is None or
                         frame.f_back is self.cur[-2]), ("Bad call",
                                                         self.cur[-3])
         fcode = frame.f_code
@@ -171,4 +171,4 @@
         "c_exception": profile.Profile.trace_dispatch_return,
         # the C function returned
         "c_return": profile.Profile.trace_dispatch_return,
-        }
+    }
--- a/Debugger/BreakPointModel.py	Fri Nov 01 15:48:48 2013 +0100
+++ b/Debugger/BreakPointModel.py	Sun Nov 03 15:58:22 2013 +0100
@@ -42,7 +42,7 @@
                            Qt.Alignment(Qt.AlignHCenter),
                            Qt.Alignment(Qt.AlignRight),
                            Qt.Alignment(Qt.AlignHCenter),
-        ]
+                           ]
 
     def columnCount(self, parent=QModelIndex()):
         """
--- a/Debugger/CallStackViewer.py	Fri Nov 01 15:48:48 2013 +0100
+++ b/Debugger/CallStackViewer.py	Sun Nov 03 15:58:22 2013 +0100
@@ -193,5 +193,5 @@
                         self.trUtf8("Error saving Call Stack Info"),
                         self.trUtf8("""<p>The call stack info could not be"""
                                     """ written to <b>{0}</b></p>"""
-                                    """<p>Reason: {1}</p>""")\
-                            .format(fname, str(err)))
+                                    """<p>Reason: {1}</p>""")
+                        .format(fname, str(err)))
--- a/Debugger/CallTraceViewer.py	Fri Nov 01 15:48:48 2013 +0100
+++ b/Debugger/CallTraceViewer.py	Sun Nov 03 15:58:22 2013 +0100
@@ -164,8 +164,8 @@
                         self.trUtf8("Error saving Call Trace Info"),
                         self.trUtf8("""<p>The call trace info could not"""
                                     """ be written to <b>{0}</b></p>"""
-                                    """<p>Reason: {1}</p>""")\
-                            .format(fname, str(err)))
+                                    """<p>Reason: {1}</p>""")
+                        .format(fname, str(err)))
     
     @pyqtSlot(QTreeWidgetItem, int)
     def on_callTrace_itemDoubleClicked(self, item, column):
--- a/Debugger/Config.py	Fri Nov 01 15:48:48 2013 +0100
+++ b/Debugger/Config.py	Sun Nov 03 15:58:22 2013 +0100
@@ -14,46 +14,46 @@
     
     # Variables type definition
     ConfigVarTypeDispStrings = [
-            QT_TRANSLATE_NOOP('Variable Types', 'Hidden Attributes'),
-            QT_TRANSLATE_NOOP('Variable Types', 'None'),
-            QT_TRANSLATE_NOOP('Variable Types', 'Type'),
-            QT_TRANSLATE_NOOP('Variable Types', 'Boolean'),
-            QT_TRANSLATE_NOOP('Variable Types', 'Integer'),
-            QT_TRANSLATE_NOOP('Variable Types', 'Long Integer'),
-            QT_TRANSLATE_NOOP('Variable Types', 'Float'),
-            QT_TRANSLATE_NOOP('Variable Types', 'Complex'),
-            QT_TRANSLATE_NOOP('Variable Types', 'String'),
-            QT_TRANSLATE_NOOP('Variable Types', 'Unicode String'),
-            QT_TRANSLATE_NOOP('Variable Types', 'Tuple'),
-            QT_TRANSLATE_NOOP('Variable Types', 'List/Array'),
-            QT_TRANSLATE_NOOP('Variable Types', 'Dictionary/Hash/Map'),
-            QT_TRANSLATE_NOOP('Variable Types', 'Dictionary Proxy'),
-            QT_TRANSLATE_NOOP('Variable Types', 'Set'),
-            QT_TRANSLATE_NOOP('Variable Types', 'File'),
-            QT_TRANSLATE_NOOP('Variable Types', 'X Range'),
-            QT_TRANSLATE_NOOP('Variable Types', 'Slice'),
-            QT_TRANSLATE_NOOP('Variable Types', 'Buffer'),
-            QT_TRANSLATE_NOOP('Variable Types', 'Class'),
-            QT_TRANSLATE_NOOP('Variable Types', 'Class Instance'),
-            QT_TRANSLATE_NOOP('Variable Types', 'Class Method'),
-            QT_TRANSLATE_NOOP('Variable Types', 'Class Property'),
-            QT_TRANSLATE_NOOP('Variable Types', 'Generator'),
-            QT_TRANSLATE_NOOP('Variable Types', 'Function'),
-            QT_TRANSLATE_NOOP('Variable Types', 'Builtin Function'),
-            QT_TRANSLATE_NOOP('Variable Types', 'Code'),
-            QT_TRANSLATE_NOOP('Variable Types', 'Module'),
-            QT_TRANSLATE_NOOP('Variable Types', 'Ellipsis'),
-            QT_TRANSLATE_NOOP('Variable Types', 'Traceback'),
-            QT_TRANSLATE_NOOP('Variable Types', 'Frame'),
-            QT_TRANSLATE_NOOP('Variable Types', 'Other')
+        QT_TRANSLATE_NOOP('Variable Types', 'Hidden Attributes'),
+        QT_TRANSLATE_NOOP('Variable Types', 'None'),
+        QT_TRANSLATE_NOOP('Variable Types', 'Type'),
+        QT_TRANSLATE_NOOP('Variable Types', 'Boolean'),
+        QT_TRANSLATE_NOOP('Variable Types', 'Integer'),
+        QT_TRANSLATE_NOOP('Variable Types', 'Long Integer'),
+        QT_TRANSLATE_NOOP('Variable Types', 'Float'),
+        QT_TRANSLATE_NOOP('Variable Types', 'Complex'),
+        QT_TRANSLATE_NOOP('Variable Types', 'String'),
+        QT_TRANSLATE_NOOP('Variable Types', 'Unicode String'),
+        QT_TRANSLATE_NOOP('Variable Types', 'Tuple'),
+        QT_TRANSLATE_NOOP('Variable Types', 'List/Array'),
+        QT_TRANSLATE_NOOP('Variable Types', 'Dictionary/Hash/Map'),
+        QT_TRANSLATE_NOOP('Variable Types', 'Dictionary Proxy'),
+        QT_TRANSLATE_NOOP('Variable Types', 'Set'),
+        QT_TRANSLATE_NOOP('Variable Types', 'File'),
+        QT_TRANSLATE_NOOP('Variable Types', 'X Range'),
+        QT_TRANSLATE_NOOP('Variable Types', 'Slice'),
+        QT_TRANSLATE_NOOP('Variable Types', 'Buffer'),
+        QT_TRANSLATE_NOOP('Variable Types', 'Class'),
+        QT_TRANSLATE_NOOP('Variable Types', 'Class Instance'),
+        QT_TRANSLATE_NOOP('Variable Types', 'Class Method'),
+        QT_TRANSLATE_NOOP('Variable Types', 'Class Property'),
+        QT_TRANSLATE_NOOP('Variable Types', 'Generator'),
+        QT_TRANSLATE_NOOP('Variable Types', 'Function'),
+        QT_TRANSLATE_NOOP('Variable Types', 'Builtin Function'),
+        QT_TRANSLATE_NOOP('Variable Types', 'Code'),
+        QT_TRANSLATE_NOOP('Variable Types', 'Module'),
+        QT_TRANSLATE_NOOP('Variable Types', 'Ellipsis'),
+        QT_TRANSLATE_NOOP('Variable Types', 'Traceback'),
+        QT_TRANSLATE_NOOP('Variable Types', 'Frame'),
+        QT_TRANSLATE_NOOP('Variable Types', 'Other')
     ]
 except ImportError:
     # Variables type definition (for non-Qt only)
     ConfigVarTypeDispStrings = [
-            'Hidden Attributes', 'None', 'Type', 'Boolean', 'Integer',
-            'Long Integer', 'Float', 'Complex', 'String', 'Unicode String',
-            'Tuple', 'List/Array', 'Dictionary/Hash/Map', 'Dictionary Proxy',
-            'Set', 'File', 'X Range', 'Slice', 'Buffer', 'Class',
-            'Class Instance', 'Class Method', 'Class Property', 'Generator',
-            'Function', 'Builtin Function', 'Code', 'Module', 'Ellipsis',
-            'Traceback', 'Frame', 'Other']
+        'Hidden Attributes', 'None', 'Type', 'Boolean', 'Integer',
+        'Long Integer', 'Float', 'Complex', 'String', 'Unicode String',
+        'Tuple', 'List/Array', 'Dictionary/Hash/Map', 'Dictionary Proxy',
+        'Set', 'File', 'X Range', 'Slice', 'Buffer', 'Class',
+        'Class Instance', 'Class Method', 'Class Property', 'Generator',
+        'Function', 'Builtin Function', 'Code', 'Module', 'Ellipsis',
+        'Traceback', 'Frame', 'Other']
--- a/Debugger/DebugClientCapabilities.py	Fri Nov 01 15:48:48 2013 +0100
+++ b/Debugger/DebugClientCapabilities.py	Sun Nov 03 15:58:22 2013 +0100
@@ -16,4 +16,4 @@
 HasShell = 0x0040
 
 HasAll = HasDebugger | HasInterpreter | HasProfiler | \
-         HasCoverage | HasCompleter | HasUnittest | HasShell
+    HasCoverage | HasCompleter | HasUnittest | HasShell
--- a/Debugger/DebugServer.py	Fri Nov 01 15:48:48 2013 +0100
+++ b/Debugger/DebugServer.py	Sun Nov 03 15:58:22 2013 +0100
@@ -262,7 +262,7 @@
                         if addressEntry.ip().toString().lower() == \
                                 address.lower():
                             return networkInterface.humanReadableName(), \
-                                    networkInterface.index()
+                                networkInterface.index()
         
         return "", 0
         
@@ -310,8 +310,8 @@
         
         if shellOnly:
             languages = \
-                [lang for lang in languages \
-                 if self.__clientCapabilities[lang] & 
+                [lang for lang in languages
+                 if self.__clientCapabilities[lang] &
                     DebugClientCapabilities.HasShell]
         
         return languages[:]
@@ -656,8 +656,8 @@
                 self.trUtf8("Connection from illegal host"),
                 self.trUtf8(
                     """<p>A connection was attempted by the illegal host"""
-                    """ <b>{0}</b>. Accept this connection?</p>""")\
-                    .format(peerAddress),
+                    """ <b>{0}</b>. Accept this connection?</p>""")
+                .format(peerAddress),
                 icon=E5MessageBox.Warning)
             if not res:
                 sock.abort()
--- a/Debugger/DebugUI.py	Fri Nov 01 15:48:48 2013 +0100
+++ b/Debugger/DebugUI.py	Sun Nov 03 15:58:22 2013 +0100
@@ -974,7 +974,7 @@
             self.profileProjectAct.setEnabled(self.projectOpen)
             self.coverageProjectAct.setEnabled(self.projectOpen)
             if self.lastDebuggedFile is not None and \
-                (self.editorOpen or self.projectOpen):
+                    (self.editorOpen or self.projectOpen):
                 self.restartAct.setEnabled(True)
             else:
                 self.restartAct.setEnabled(False)
@@ -1029,8 +1029,8 @@
                 else:
                     msg = self.trUtf8('"{0}" has terminated with an exit'
                                       ' status of {1}.')\
-                            .format(os.path.basename(self.ui.currentProg),
-                                    status)
+                        .format(os.path.basename(self.ui.currentProg),
+                                status)
                 self.ui.showNotification(
                     UI.PixmapCache.getPixmap("debug48.png"),
                     self.trUtf8("Program terminated"), msg)
@@ -1105,9 +1105,9 @@
                             ' See the shell window for details.'))
             return
         
-        if (self.exceptions and \
-            exceptionType not in self.excIgnoreList and \
-            (not len(self.excList) or \
+        if (self.exceptions and
+            exceptionType not in self.excIgnoreList and
+            (not len(self.excList) or
              (len(self.excList) and exceptionType in self.excList)))\
            or exceptionType.startswith('unhandled'):
             res = None
@@ -1132,12 +1132,12 @@
                     if stackTrace:
                         if exceptionType.startswith('unhandled'):
                             buttons = E5MessageBox.StandardButtons(
-                                E5MessageBox.No | \
+                                E5MessageBox.No |
                                 E5MessageBox.Yes)
                         else:
                             buttons = E5MessageBox.StandardButtons(
-                                E5MessageBox.No | \
-                                E5MessageBox.Yes | \
+                                E5MessageBox.No |
+                                E5MessageBox.Yes |
                                 E5MessageBox.Ignore)
                         res = E5MessageBox.critical(
                             self.ui, Program,
@@ -1146,11 +1146,11 @@
                                 ' <b>{0}</b><br>"<b>{1}</b>"<br>'
                                 'File: <b>{2}</b>, Line: <b>{3}</b></p>'
                                 '<p>Break here?</p>')
-                                .format(
-                                    exceptionType,
-                                    Utilities.html_encode(exceptionMessage),
-                                    stackTrace[0][0],
-                                    stackTrace[0][1]),
+                            .format(
+                                exceptionType,
+                                Utilities.html_encode(exceptionMessage),
+                                stackTrace[0][0],
+                                stackTrace[0][1]),
                             buttons,
                             E5MessageBox.No)
                     else:
@@ -1159,9 +1159,9 @@
                             self.trUtf8(
                                 '<p>The debugged program raised the exception'
                                 ' <b>{0}</b><br>"<b>{1}</b>"</p>')
-                                .format(
-                                    exceptionType,
-                                    Utilities.html_encode(exceptionMessage)))
+                            .format(
+                                exceptionType,
+                                Utilities.html_encode(exceptionMessage)))
             if res == E5MessageBox.Yes:
                 self.exceptionInterrupt.emit()
                 stack = []
@@ -1269,8 +1269,8 @@
             self.trUtf8("Breakpoint Condition Error"),
             self.trUtf8(
                 """<p>The condition of the breakpoint <b>{0}, {1}</b>"""
-                """ contains a syntax error.</p>""")\
-                .format(filename, lineno))
+                """ contains a syntax error.</p>""")
+            .format(filename, lineno))
         
         model = self.debugServer.getBreakPointModel()
         index = model.getBreakPointIndex(filename, lineno)
@@ -1304,8 +1304,8 @@
             self.ui,
             self.trUtf8("Watch Expression Error"),
             self.trUtf8("""<p>The watch expression <b>{0}</b>"""
-                        """ contains a syntax error.</p>""")\
-                        .format(cond))
+                        """ contains a syntax error.</p>""")
+            .format(cond))
         
         model = self.debugServer.getWatchPointModel()
         index = model.getWatchPointIndex(cond)
@@ -1332,7 +1332,7 @@
                 if not special:
                     msg = self.trUtf8("""<p>A watch expression '<b>{0}</b>'"""
                                       """ already exists.</p>""")\
-                            .format(Utilities.html_encode(cond))
+                        .format(Utilities.html_encode(cond))
                 else:
                     msg = self.trUtf8(
                         """<p>A watch expression '<b>{0}</b>'"""
@@ -1347,7 +1347,7 @@
                 model.deleteWatchPointByIndex(index)
             else:
                 model.setWatchPointByIndex(index, cond, special,
-                                                  (temp, enabled, count))
+                                           (temp, enabled, count))
         
     def __configureVariablesFilters(self):
         """
@@ -1528,9 +1528,10 @@
                 if editor is None:
                     return
                 
-                if not self.viewmanager.checkDirty(editor,
-                   Preferences.getDebugger("Autosave")) or \
-                   editor.getFileName() is None:
+                if not self.viewmanager.checkDirty(
+                        editor,
+                        Preferences.getDebugger("Autosave")) or \
+                        editor.getFileName() is None:
                     return
                     
                 fn = editor.getFileName()
@@ -1645,9 +1646,10 @@
                 if editor is None:
                     return
                 
-                if not self.viewmanager.checkDirty(editor,
-                   Preferences.getDebugger("Autosave")) or \
-                   editor.getFileName() is None:
+                if not self.viewmanager.checkDirty(
+                        editor,
+                        Preferences.getDebugger("Autosave")) or \
+                        editor.getFileName() is None:
                     return
                     
                 fn = editor.getFileName()
@@ -1764,9 +1766,10 @@
                 if editor is None:
                     return
                 
-                if not self.viewmanager.checkDirty(editor,
-                   Preferences.getDebugger("Autosave")) or \
-                   editor.getFileName() is None:
+                if not self.viewmanager.checkDirty(
+                        editor,
+                        Preferences.getDebugger("Autosave")) or \
+                        editor.getFileName() is None:
                     return
                     
                 fn = editor.getFileName()
@@ -1885,9 +1888,10 @@
                 if editor is None:
                     return
                 
-                if not self.viewmanager.checkDirty(editor,
-                   Preferences.getDebugger("Autosave")) or \
-                   editor.getFileName() is None:
+                if not self.viewmanager.checkDirty(
+                        editor,
+                        Preferences.getDebugger("Autosave")) or \
+                        editor.getFileName() is None:
                     return
                     
                 fn = editor.getFileName()
@@ -2151,11 +2155,11 @@
             curr = -1
 
         arg, ok = QInputDialog.getItem(
-                            self.ui,
-                            self.trUtf8("Evaluate"),
-                            self.trUtf8("Enter the statement to evaluate"),
-                            self.evalHistory,
-                            curr, True)
+            self.ui,
+            self.trUtf8("Evaluate"),
+            self.trUtf8("Enter the statement to evaluate"),
+            self.evalHistory,
+            curr, True)
 
         if ok:
             if not arg:
@@ -2180,11 +2184,11 @@
             curr = -1
 
         stmt, ok = QInputDialog.getItem(
-                            self.ui,
-                            self.trUtf8("Execute"),
-                            self.trUtf8("Enter the statement to execute"),
-                            self.execHistory,
-                            curr, True)
+            self.ui,
+            self.trUtf8("Execute"),
+            self.trUtf8("Enter the statement to execute"),
+            self.execHistory,
+            curr, True)
 
         if ok:
             if not stmt:
--- a/Debugger/DebuggerInterfacePython.py	Fri Nov 01 15:48:48 2013 +0100
+++ b/Debugger/DebuggerInterfacePython.py	Sun Nov 03 15:58:22 2013 +0100
@@ -192,7 +192,7 @@
                 rhost = "localhost"
             if rexec:
                 args = Utilities.parseOptionString(rexec) + \
-                       [rhost, interpreter, os.path.abspath(debugClient),
+                    [rhost, interpreter, os.path.abspath(debugClient),
                         noencoding, str(port), redirect, ipaddr]
                 args[0] = Utilities.getExecutablePath(args[0])
                 process = self.__startProcess(args[0], args[1:])
@@ -239,7 +239,7 @@
             ccmd = Preferences.getDebugger("ConsoleDbgCommand")
             if ccmd:
                 args = Utilities.parseOptionString(ccmd) + \
-                       [interpreter, os.path.abspath(debugClient),
+                    [interpreter, os.path.abspath(debugClient),
                         noencoding, str(port), '0', ipaddr]
                 args[0] = Utilities.getExecutablePath(args[0])
                 process = self.__startProcess(args[0], args[1:], clientEnv)
@@ -294,7 +294,7 @@
                 rhost = "localhost"
             if rexec:
                 args = Utilities.parseOptionString(rexec) + \
-                       [rhost, interpreter, os.path.abspath(debugClient),
+                    [rhost, interpreter, os.path.abspath(debugClient),
                         noencoding, str(port), redirect, ipaddr]
                 args[0] = Utilities.getExecutablePath(args[0])
                 process = self.__startProcess(args[0], args[1:])
@@ -338,10 +338,10 @@
         ipaddr = self.debugServer.getHostAddress(True)
         if runInConsole or project.getDebugProperty("CONSOLEDEBUGGER"):
             ccmd = project.getDebugProperty("CONSOLECOMMAND") or \
-                   Preferences.getDebugger("ConsoleDbgCommand")
+                Preferences.getDebugger("ConsoleDbgCommand")
             if ccmd:
                 args = Utilities.parseOptionString(ccmd) + \
-                       [interpreter, os.path.abspath(debugClient),
+                    [interpreter, os.path.abspath(debugClient),
                         noencoding, str(port), '0', ipaddr]
                 args[0] = Utilities.getExecutablePath(args[0])
                 process = self.__startProcess(args[0], args[1:], clientEnv)
--- a/Debugger/DebuggerInterfacePython3.py	Fri Nov 01 15:48:48 2013 +0100
+++ b/Debugger/DebuggerInterfacePython3.py	Sun Nov 03 15:58:22 2013 +0100
@@ -188,7 +188,7 @@
                 rhost = "localhost"
             if rexec:
                 args = Utilities.parseOptionString(rexec) + \
-                       [rhost, interpreter, os.path.abspath(debugClient),
+                    [rhost, interpreter, os.path.abspath(debugClient),
                         noencoding, str(port), redirect, ipaddr]
                 args[0] = Utilities.getExecutablePath(args[0])
                 process = self.__startProcess(args[0], args[1:])
@@ -235,7 +235,7 @@
             ccmd = Preferences.getDebugger("ConsoleDbgCommand")
             if ccmd:
                 args = Utilities.parseOptionString(ccmd) + \
-                       [interpreter, os.path.abspath(debugClient),
+                    [interpreter, os.path.abspath(debugClient),
                         noencoding, str(port), '0', ipaddr]
                 args[0] = Utilities.getExecutablePath(args[0])
                 process = self.__startProcess(args[0], args[1:], clientEnv)
@@ -290,7 +290,7 @@
                 rhost = "localhost"
             if rexec:
                 args = Utilities.parseOptionString(rexec) + \
-                       [rhost, interpreter, os.path.abspath(debugClient),
+                    [rhost, interpreter, os.path.abspath(debugClient),
                         noencoding, str(port), redirect, ipaddr]
                 args[0] = Utilities.getExecutablePath(args[0])
                 process = self.__startProcess(args[0], args[1:])
@@ -334,10 +334,10 @@
         ipaddr = self.debugServer.getHostAddress(True)
         if runInConsole or project.getDebugProperty("CONSOLEDEBUGGER"):
             ccmd = project.getDebugProperty("CONSOLECOMMAND") or \
-                   Preferences.getDebugger("ConsoleDbgCommand")
+                Preferences.getDebugger("ConsoleDbgCommand")
             if ccmd:
                 args = Utilities.parseOptionString(ccmd) + \
-                       [interpreter, os.path.abspath(debugClient),
+                    [interpreter, os.path.abspath(debugClient),
                         noencoding, str(port), '0', ipaddr]
                 args[0] = Utilities.getExecutablePath(args[0])
                 process = self.__startProcess(args[0], args[1:], clientEnv)
--- a/Debugger/DebuggerInterfaceRuby.py	Fri Nov 01 15:48:48 2013 +0100
+++ b/Debugger/DebuggerInterfaceRuby.py	Sun Nov 03 15:58:22 2013 +0100
@@ -159,7 +159,7 @@
                 rhost = "localhost"
             if rexec:
                 args = Utilities.parseOptionString(rexec) + \
-                       [rhost, interpreter, os.path.abspath(debugClient),
+                    [rhost, interpreter, os.path.abspath(debugClient),
                         str(port), redirect, ipaddr]
                 args[0] = Utilities.getExecutablePath(args[0])
                 process = self.__startProcess(args[0], args[1:])
@@ -206,7 +206,7 @@
             ccmd = Preferences.getDebugger("ConsoleDbgCommand")
             if ccmd:
                 args = Utilities.parseOptionString(ccmd) + \
-                       [interpreter, os.path.abspath(debugClient),
+                    [interpreter, os.path.abspath(debugClient),
                         str(port), '0', ipaddr]
                 args[0] = Utilities.getExecutablePath(args[0])
                 process = self.__startProcess(args[0], args[1:], clientEnv)
@@ -259,7 +259,7 @@
                 rhost = "localhost"
             if rexec:
                 args = Utilities.parseOptionString(rexec) + \
-                       [rhost, interpreter, os.path.abspath(debugClient),
+                    [rhost, interpreter, os.path.abspath(debugClient),
                         str(port), redirect, ipaddr]
                 args[0] = Utilities.getExecutablePath(args[0])
                 process = self.__startProcess(args[0], args[1:])
@@ -303,10 +303,10 @@
         ipaddr = self.debugServer.getHostAddress(True)
         if runInConsole or project.getDebugProperty("CONSOLEDEBUGGER"):
             ccmd = project.getDebugProperty("CONSOLECOMMAND") or \
-                   Preferences.getDebugger("ConsoleDbgCommand")
+                Preferences.getDebugger("ConsoleDbgCommand")
             if ccmd:
                 args = Utilities.parseOptionString(ccmd) + \
-                       [interpreter, os.path.abspath(debugClient),
+                    [interpreter, os.path.abspath(debugClient),
                         str(port), '0', ipaddr]
                 args[0] = Utilities.getExecutablePath(args[0])
                 process = self.__startProcess(args[0], args[1:], clientEnv)
--- a/Debugger/VariablesViewer.py	Fri Nov 01 15:48:48 2013 +0100
+++ b/Debugger/VariablesViewer.py	Sun Nov 03 15:58:22 2013 +0100
@@ -528,17 +528,17 @@
         @return The item that was generated (VariableItem).
         """
         if isSpecial and \
-           (self.dvar_rx_class1.exactMatch(dvar) or \
-            self.dvar_rx_class2.exactMatch(dvar)):
+           (self.dvar_rx_class1.exactMatch(dvar) or
+                self.dvar_rx_class2.exactMatch(dvar)):
             isSpecial = False
         
         if self.rx_class2.exactMatch(dtype):
             return SpecialVarItem(parent, dvar, dvalue, dtype[7:-1],
                                   self.framenr, self.scope)
         elif dtype != "void *" and \
-             (self.rx_class.exactMatch(dvalue) or \
-              self.rx_class3.exactMatch(dvalue) or \
-              isSpecial):
+            (self.rx_class.exactMatch(dvalue) or
+             self.rx_class3.exactMatch(dvalue) or
+             isSpecial):
             if self.dvar_rx_special_array_element.exactMatch(dvar):
                 return SpecialArrayElementVarItem(parent, dvar, dvalue, dtype,
                                                   self.framenr, self.scope)
--- a/Debugger/WatchPointModel.py	Fri Nov 01 15:48:48 2013 +0100
+++ b/Debugger/WatchPointModel.py	Sun Nov 03 15:58:22 2013 +0100
@@ -39,7 +39,7 @@
                            Qt.Alignment(Qt.AlignHCenter),
                            Qt.Alignment(Qt.AlignHCenter),
                            Qt.Alignment(Qt.AlignRight),
-        ]
+                           ]
         
     def columnCount(self, parent=QModelIndex()):
         """
--- a/Debugger/WatchPointViewer.py	Fri Nov 01 15:48:48 2013 +0100
+++ b/Debugger/WatchPointViewer.py	Sun Nov 03 15:58:22 2013 +0100
@@ -239,7 +239,7 @@
             if not special:
                 msg = self.trUtf8("""<p>A watch expression '<b>{0}</b>'"""
                                   """ already exists.</p>""")\
-                        .format(Utilities.html_encode(cond))
+                    .format(Utilities.html_encode(cond))
             else:
                 msg = self.trUtf8(
                     """<p>A watch expression '<b>{0}</b>'"""
Binary file Documentation/Help/source.qch has changed
--- a/Documentation/Help/source.qhp	Fri Nov 01 15:48:48 2013 +0100
+++ b/Documentation/Help/source.qhp	Sun Nov 03 15:58:22 2013 +0100
@@ -12083,6 +12083,9 @@
       <keyword name="VariablesViewer.mouseDoubleClickEvent" id="VariablesViewer.mouseDoubleClickEvent" ref="eric5.Debugger.VariablesViewer.html#VariablesViewer.mouseDoubleClickEvent" />
       <keyword name="VariablesViewer.showVariable" id="VariablesViewer.showVariable" ref="eric5.Debugger.VariablesViewer.html#VariablesViewer.showVariable" />
       <keyword name="VariablesViewer.showVariables" id="VariablesViewer.showVariables" ref="eric5.Debugger.VariablesViewer.html#VariablesViewer.showVariables" />
+      <keyword name="VcsCommandOptionsDialog" id="VcsCommandOptionsDialog" ref="eric5.VCS.CommandOptionsDialog.html#VcsCommandOptionsDialog" />
+      <keyword name="VcsCommandOptionsDialog (Constructor)" id="VcsCommandOptionsDialog (Constructor)" ref="eric5.VCS.CommandOptionsDialog.html#VcsCommandOptionsDialog.__init__" />
+      <keyword name="VcsCommandOptionsDialog.getOptions" id="VcsCommandOptionsDialog.getOptions" ref="eric5.VCS.CommandOptionsDialog.html#VcsCommandOptionsDialog.getOptions" />
       <keyword name="VcsMercurialPlugin" id="VcsMercurialPlugin" ref="eric5.Plugins.PluginVcsMercurial.html#VcsMercurialPlugin" />
       <keyword name="VcsMercurialPlugin (Constructor)" id="VcsMercurialPlugin (Constructor)" ref="eric5.Plugins.PluginVcsMercurial.html#VcsMercurialPlugin.__init__" />
       <keyword name="VcsMercurialPlugin.activate" id="VcsMercurialPlugin.activate" ref="eric5.Plugins.PluginVcsMercurial.html#VcsMercurialPlugin.activate" />
@@ -13369,9 +13372,6 @@
       <keyword name="usage" id="usage" ref="eric5.install.html#usage" />
       <keyword name="usage" id="usage" ref="eric5.patch_modpython.html#usage" />
       <keyword name="usage" id="usage" ref="eric5.uninstall.html#usage" />
-      <keyword name="vcsCommandOptionsDialog" id="vcsCommandOptionsDialog" ref="eric5.VCS.CommandOptionsDialog.html#vcsCommandOptionsDialog" />
-      <keyword name="vcsCommandOptionsDialog (Constructor)" id="vcsCommandOptionsDialog (Constructor)" ref="eric5.VCS.CommandOptionsDialog.html#vcsCommandOptionsDialog.__init__" />
-      <keyword name="vcsCommandOptionsDialog.getOptions" id="vcsCommandOptionsDialog.getOptions" ref="eric5.VCS.CommandOptionsDialog.html#vcsCommandOptionsDialog.getOptions" />
       <keyword name="vcsMercurial (Package)" id="vcsMercurial (Package)" ref="index-eric5.Plugins.VcsPlugins.vcsMercurial.html" />
       <keyword name="vcsPySvn (Package)" id="vcsPySvn (Package)" ref="index-eric5.Plugins.VcsPlugins.vcsPySvn.html" />
       <keyword name="vcsSubversion (Package)" id="vcsSubversion (Package)" ref="index-eric5.Plugins.VcsPlugins.vcsSubversion.html" />
--- a/Documentation/Source/eric5.Plugins.VcsPlugins.vcsPySvn.subversion.html	Fri Nov 01 15:48:48 2013 +0100
+++ b/Documentation/Source/eric5.Plugins.VcsPlugins.vcsPySvn.subversion.html	Sun Nov 03 15:58:22 2013 +0100
@@ -923,7 +923,7 @@
         Subversion repository.
 </p><p>
         If name is a directory and is the project directory, all project files
-        are saved first. If name is a file (or list of files), which is/are 
+        are saved first. If name is a file (or list of files), which is/are
         being edited and has unsaved modification, they can be saved or the
         operation may be aborted.
 </p><dl>
--- a/Documentation/Source/eric5.QScintilla.Lexers.Lexer.html	Fri Nov 01 15:48:48 2013 +0100
+++ b/Documentation/Source/eric5.QScintilla.Lexers.Lexer.html	Sun Nov 03 15:58:22 2013 +0100
@@ -149,7 +149,7 @@
 <h4>Lexer.canBlockComment</h4>
 <b>canBlockComment</b>(<i></i>)
 <p>
-        Public method to determine, whether the lexer language supports a 
+        Public method to determine, whether the lexer language supports a
         block comment.
 </p><dl>
 <dt>Returns:</dt>
--- a/Documentation/Source/eric5.QScintilla.Lexers.LexerPygments.html	Fri Nov 01 15:48:48 2013 +0100
+++ b/Documentation/Source/eric5.QScintilla.Lexers.LexerPygments.html	Sun Nov 03 15:58:22 2013 +0100
@@ -25,7 +25,7 @@
 </p>
 <h3>Global Attributes</h3>
 <table>
-<tr><td>PYGMENTS_INSERTED</td></tr><tr><td>PYGMENTS_PUNCTUATION</td></tr><tr><td>TOKEN_MAP</td></tr>
+<tr><td>PYGMENTS_ATTRIBUTE</td></tr><tr><td>PYGMENTS_BUILTIN</td></tr><tr><td>PYGMENTS_CHAR</td></tr><tr><td>PYGMENTS_CLASS</td></tr><tr><td>PYGMENTS_COMMENT</td></tr><tr><td>PYGMENTS_CONSTANT</td></tr><tr><td>PYGMENTS_DECORATOR</td></tr><tr><td>PYGMENTS_DEFAULT</td></tr><tr><td>PYGMENTS_DELETED</td></tr><tr><td>PYGMENTS_DOCSTRING</td></tr><tr><td>PYGMENTS_EMPHASIZE</td></tr><tr><td>PYGMENTS_ENTITY</td></tr><tr><td>PYGMENTS_ERROR</td></tr><tr><td>PYGMENTS_ESCAPE</td></tr><tr><td>PYGMENTS_EXCEPTION</td></tr><tr><td>PYGMENTS_FUNCTION</td></tr><tr><td>PYGMENTS_GENERIC_ERROR</td></tr><tr><td>PYGMENTS_HEADING</td></tr><tr><td>PYGMENTS_HEREDOC</td></tr><tr><td>PYGMENTS_INSERTED</td></tr><tr><td>PYGMENTS_KEYWORD</td></tr><tr><td>PYGMENTS_LABEL</td></tr><tr><td>PYGMENTS_MULTILINECOMMENT</td></tr><tr><td>PYGMENTS_NAMESPACE</td></tr><tr><td>PYGMENTS_NUMBER</td></tr><tr><td>PYGMENTS_OPERATOR</td></tr><tr><td>PYGMENTS_OTHER</td></tr><tr><td>PYGMENTS_OUTPUT</td></tr><tr><td>PYGMENTS_PREPROCESSOR</td></tr><tr><td>PYGMENTS_PROMPT</td></tr><tr><td>PYGMENTS_PROPERTY</td></tr><tr><td>PYGMENTS_PSEUDOKEYWORD</td></tr><tr><td>PYGMENTS_PUNCTUATION</td></tr><tr><td>PYGMENTS_REGEX</td></tr><tr><td>PYGMENTS_SCALAR</td></tr><tr><td>PYGMENTS_STRING</td></tr><tr><td>PYGMENTS_STRONG</td></tr><tr><td>PYGMENTS_SUBHEADING</td></tr><tr><td>PYGMENTS_SYMBOL</td></tr><tr><td>PYGMENTS_TAG</td></tr><tr><td>PYGMENTS_TRACEBACK</td></tr><tr><td>PYGMENTS_TYPEKEYWORD</td></tr><tr><td>PYGMENTS_VARIABLE</td></tr><tr><td>PYGMENTS_WORD</td></tr><tr><td>TOKEN_MAP</td></tr>
 </table>
 <h3>Classes</h3>
 <table>
--- a/Documentation/Source/eric5.VCS.CommandOptionsDialog.html	Fri Nov 01 15:48:48 2013 +0100
+++ b/Documentation/Source/eric5.VCS.CommandOptionsDialog.html	Sun Nov 03 15:58:22 2013 +0100
@@ -30,7 +30,7 @@
 <h3>Classes</h3>
 <table>
 <tr>
-<td><a href="#vcsCommandOptionsDialog">vcsCommandOptionsDialog</a></td>
+<td><a href="#VcsCommandOptionsDialog">VcsCommandOptionsDialog</a></td>
 <td>Class implementing the VCS command options dialog.</td>
 </tr>
 </table>
@@ -39,13 +39,13 @@
 <tr><td>None</td></tr>
 </table>
 <hr /><hr />
-<a NAME="vcsCommandOptionsDialog" ID="vcsCommandOptionsDialog"></a>
-<h2>vcsCommandOptionsDialog</h2>
+<a NAME="VcsCommandOptionsDialog" ID="VcsCommandOptionsDialog"></a>
+<h2>VcsCommandOptionsDialog</h2>
 <p>
     Class implementing the VCS command options dialog.
 </p>
 <h3>Derived from</h3>
-QDialog, Ui_vcsCommandOptionsDialog
+QDialog, Ui_VcsCommandOptionsDialog
 <h3>Class Attributes</h3>
 <table>
 <tr><td>None</td></tr>
@@ -57,10 +57,10 @@
 <h3>Methods</h3>
 <table>
 <tr>
-<td><a href="#vcsCommandOptionsDialog.__init__">vcsCommandOptionsDialog</a></td>
+<td><a href="#VcsCommandOptionsDialog.__init__">VcsCommandOptionsDialog</a></td>
 <td>Constructor</td>
 </tr><tr>
-<td><a href="#vcsCommandOptionsDialog.getOptions">getOptions</a></td>
+<td><a href="#VcsCommandOptionsDialog.getOptions">getOptions</a></td>
 <td>Public method used to retrieve the entered options.</td>
 </tr>
 </table>
@@ -68,9 +68,9 @@
 <table>
 <tr><td>None</td></tr>
 </table>
-<a NAME="vcsCommandOptionsDialog.__init__" ID="vcsCommandOptionsDialog.__init__"></a>
-<h4>vcsCommandOptionsDialog (Constructor)</h4>
-<b>vcsCommandOptionsDialog</b>(<i>vcs, parent=None</i>)
+<a NAME="VcsCommandOptionsDialog.__init__" ID="VcsCommandOptionsDialog.__init__"></a>
+<h4>VcsCommandOptionsDialog (Constructor)</h4>
+<b>VcsCommandOptionsDialog</b>(<i>vcs, parent=None</i>)
 <p>
         Constructor
 </p><dl>
@@ -81,8 +81,8 @@
 <dd>
 parent widget (QWidget)
 </dd>
-</dl><a NAME="vcsCommandOptionsDialog.getOptions" ID="vcsCommandOptionsDialog.getOptions"></a>
-<h4>vcsCommandOptionsDialog.getOptions</h4>
+</dl><a NAME="VcsCommandOptionsDialog.getOptions" ID="VcsCommandOptionsDialog.getOptions"></a>
+<h4>VcsCommandOptionsDialog.getOptions</h4>
 <b>getOptions</b>(<i></i>)
 <p>
         Public method used to retrieve the entered options.
--- a/DocumentationTools/APIGenerator.py	Fri Nov 01 15:48:48 2013 +0100
+++ b/DocumentationTools/APIGenerator.py	Sun Nov 03 15:58:22 2013 +0100
@@ -123,9 +123,10 @@
                 id = Editor.ClassProtectedID
             else:
                 id = Editor.ClassPrivateID
-            self.api.append('{0}{1}?{2:d}({3})'.format(
-                self.moduleName, _class.name, id,
-                 ', '.join(_class.methods['__init__'].parameters[1:])))
+            self.api.append(
+                '{0}{1}?{2:d}({3})'.format(
+                    self.moduleName, _class.name, id,
+                    ', '.join(_class.methods['__init__'].parameters[1:])))
             
         classNameStr = "{0}{1}.".format(self.moduleName, className)
         for method in methods:
@@ -136,9 +137,10 @@
                     id = Editor.MethodProtectedID
                 else:
                     id = Editor.MethodPrivateID
-                self.api.append('{0}{1}?{2:d}({3})'.format(
-                    classNameStr, method, id,
-                     ', '.join(_class.methods[method].parameters[1:])))
+                self.api.append(
+                    '{0}{1}?{2:d}({3})'.format(
+                        classNameStr, method, id,
+                        ', '.join(_class.methods[method].parameters[1:])))
         
     def __addClassVariablesAPI(self, className):
         """
@@ -177,6 +179,8 @@
                     id = Editor.MethodProtectedID
                 else:
                     id = Editor.MethodPrivateID
-                self.api.append('{0}{1}?{2:d}({3})'.format(
-                    self.moduleName, self.module.functions[funcName].name, id,
-                     ', '.join(self.module.functions[funcName].parameters)))
+                self.api.append(
+                    '{0}{1}?{2:d}({3})'.format(
+                        self.moduleName, self.module.functions[funcName].name,
+                        id,
+                        ', '.join(self.module.functions[funcName].parameters)))
--- a/DocumentationTools/Config.py	Fri Nov 01 15:48:48 2013 +0100
+++ b/DocumentationTools/Config.py	Sun Nov 03 15:58:22 2013 +0100
@@ -8,7 +8,7 @@
 """
 
 # the default colors for the eric5 documentation generator
-eric5docDefaultColors = { \
+eric5docDefaultColors = {
     'BodyColor': '#000000',
     'BodyBgColor': '#FFFFFF',
     'Level1HeaderColor': '#0000FF',
@@ -20,7 +20,7 @@
     'LinkColor': '#0000FF',
 }
 
-eric5docColorParameterNames = { \
+eric5docColorParameterNames = {
     'BodyColor': 'body-color',
     'BodyBgColor': 'body-background-color',
     'Level1HeaderColor': 'l1header-color',
--- a/DocumentationTools/IndexGenerator.py	Fri Nov 01 15:48:48 2013 +0100
+++ b/DocumentationTools/IndexGenerator.py	Sun Nov 03 15:58:22 2013 +0100
@@ -170,16 +170,15 @@
                 "Entries": "".join(lst),
             })
             
-        doc = self.headerTemplate.format(**{ \
-                "Title": title,
-                "Style": self.stylesheet}) + \
-              self.indexBodyTemplate.format(**{ \
-                "Title": title,
-                "Description": package["description"],
-                "Subpackages": subpackages,
-                "Modules": modules,
-              }) + \
-              self.footerTemplate
+        doc = self.headerTemplate.format(
+            **{"Title": title,
+               "Style": self.stylesheet}) + \
+            self.indexBodyTemplate.format(
+                **{"Title": title,
+                   "Description": package["description"],
+                   "Subpackages": subpackages,
+                   "Modules": modules}) + \
+            self.footerTemplate
     
         f = open(filename, "w", encoding="utf-8", newline=newline)
         f.write(doc)
--- a/DocumentationTools/ModuleDocumentor.py	Fri Nov 01 15:48:48 2013 +0100
+++ b/DocumentationTools/ModuleDocumentor.py	Sun Nov 03 15:58:22 2013 +0100
@@ -32,7 +32,7 @@
         [a-zA-Z_] \w*
     )
     [ \t]+ (?P<SignalDescription2> .*)
-""", re.VERBOSE | re.DOTALL | re.MULTILINE).search
+    """, re.VERBOSE | re.DOTALL | re.MULTILINE).search
 
 _event = re.compile(
 r"""
@@ -47,7 +47,7 @@
         [a-zA-Z_] \w*
     )
     [ \t]+ (?P<EventDescription2> .*)
-""", re.VERBOSE | re.DOTALL | re.MULTILINE).search
+    """, re.VERBOSE | re.DOTALL | re.MULTILINE).search
 
 
 class TagError(Exception):
@@ -237,11 +237,11 @@
         
         @return The source code documentation. (string)
         """
-        doc = self.headerTemplate.format(**{ \
-                'Title': self.module.name,
-                'Style': self.stylesheet}) + \
-              self.__genModuleSection() + \
-              self.footerTemplate
+        doc = self.headerTemplate.format(
+            **{'Title': self.module.name,
+               'Style': self.stylesheet}) + \
+            self.__genModuleSection() + \
+            self.footerTemplate
         self.generated = True
         return doc
         
@@ -257,28 +257,28 @@
         try:
             if self.module.type == RB_SOURCE:
                 rbModulesList = self.__genRbModulesListSection()
-                modBody = self.rbFileTemplate.format(**{ \
-                    'Module': self.module.name,
-                    'ModuleDescription': \
+                modBody = self.rbFileTemplate.format(
+                    **{'Module': self.module.name,
+                       'ModuleDescription':
                         self.__formatDescription(self.module.description),
-                    'GlobalsList': globalsList,
-                    'ClassList': classList,
-                    'RbModulesList': rbModulesList,
-                    'FunctionList': functionList,
-                })
+                       'GlobalsList': globalsList,
+                       'ClassList': classList,
+                       'RbModulesList': rbModulesList,
+                       'FunctionList': functionList,
+                       })
             else:
-                modBody = self.moduleTemplate.format(**{ \
-                    'Module': self.module.name,
-                    'ModuleDescription': \
+                modBody = self.moduleTemplate.format(
+                    **{'Module': self.module.name,
+                       'ModuleDescription':
                         self.__formatDescription(self.module.description),
-                    'GlobalsList': globalsList,
-                    'ClassList': classList,
-                    'FunctionList': functionList,
-                })
+                       'GlobalsList': globalsList,
+                       'ClassList': classList,
+                       'FunctionList': functionList,
+                       })
         except TagError as e:
             sys.stderr.write(
                 "Error in tags of description of module {0}.\n".format(
-                self.module.name))
+                    self.module.name))
             sys.stderr.write("{0}\n".format(e))
             return ""
             
@@ -302,15 +302,15 @@
         """
         lst = []
         for name in names:
-            lst.append(self.listEntryTemplate.format(**{ \
-                'Link': "{0}".format(name),
-                'Name': dict[name].name,
-                'Description':
+            lst.append(self.listEntryTemplate.format(
+                **{'Link': "{0}".format(name),
+                   'Name': dict[name].name,
+                   'Description':
                     self.__getShortDescription(dict[name].description),
-                'Deprecated':
-                    self.__checkDeprecated(dict[name].description) and \
+                   'Deprecated':
+                    self.__checkDeprecated(dict[name].description) and
                     self.listEntryDeprecatedTemplate or "",
-            }))
+                   }))
             if kwSuffix:
                 n = "{0} ({1})".format(name, kwSuffix)
             else:
@@ -332,16 +332,14 @@
         else:
             scope = self.module
         attrNames = sorted([attr for attr in scope.globals.keys()
-                                 if not scope.globals[attr].isSignal])
+                           if not scope.globals[attr].isSignal])
         if attrNames:
             s = ''.join(
-                [self.listEntrySimpleTemplate.format(**{'Name': name}) \
+                [self.listEntrySimpleTemplate.format(**{'Name': name})
                  for name in attrNames])
         else:
             s = self.listEntryNoneTemplate
-        return self.listTemplate.format(**{ \
-            'Entries': s,
-        })
+        return self.listTemplate.format(**{'Entries': s})
         
     def __genClassListSection(self):
         """
@@ -356,9 +354,7 @@
             s = self.__genListSection(names, self.module.classes)
         else:
             s = self.listEntryNoneTemplate
-        return self.listTemplate.format(**{ \
-            'Entries': s,
-        })
+        return self.listTemplate.format(**{'Entries': s})
         
     def __genRbModulesListSection(self):
         """
@@ -373,9 +369,7 @@
             s = self.__genListSection(names, self.module.modules)
         else:
             s = self.listEntryNoneTemplate
-        return self.listTemplate.format(**{ \
-            'Entries': s,
-        })
+        return self.listTemplate.format(**{'Entries': s})
         
     def __genFunctionListSection(self):
         """
@@ -390,9 +384,7 @@
             s = self.__genListSection(names, self.module.functions)
         else:
             s = self.listEntryNoneTemplate
-        return self.listTemplate.format(**{ \
-            'Entries': s,
-        })
+        return self.listTemplate.format(**{'Entries': s})
         
     def __genClassesSection(self):
         """
@@ -420,23 +412,23 @@
                 self.__genMethodSection(_class, className, Function.Static)
             
             try:
-                clsBody = self.classTemplate.format(**{ \
-                    'Anchor': className,
-                    'Class': _class.name,
-                    'ClassSuper': supers,
-                    'ClassDescription':
+                clsBody = self.classTemplate.format(
+                    **{'Anchor': className,
+                       'Class': _class.name,
+                       'ClassSuper': supers,
+                       'ClassDescription':
                         self.__formatDescription(_class.description),
-                    'GlobalsList': globalsList,
-                    'ClassMethodList': classMethList,
-                    'MethodList': methList,
-                    'StaticMethodList': staticMethList,
-                    'MethodDetails':
+                       'GlobalsList': globalsList,
+                       'ClassMethodList': classMethList,
+                       'MethodList': methList,
+                       'StaticMethodList': staticMethList,
+                       'MethodDetails':
                         classMethBodies + methBodies + staticMethBodies,
-                })
+                       })
             except TagError as e:
                 sys.stderr.write(
                     "Error in tags of description of class {0}.\n".format(
-                    className))
+                        className))
                 sys.stderr.write("{0}\n".format(e))
                 clsBody = ""
             
@@ -460,15 +452,15 @@
         lst = []
         if includeInit:
             try:
-                lst.append(self.listEntryTemplate.format(**{ \
-                    'Link': "{0}.{1}".format(className, '__init__'),
-                    'Name': clsName,
-                    'Description': self.__getShortDescription(
-                                        dict['__init__'].description),
-                    'Deprecated': self.__checkDeprecated(
-                                    dict['__init__'].description) and \
-                                  self.listEntryDeprecatedTemplate or "",
-                }))
+                lst.append(self.listEntryTemplate.format(
+                    **{'Link': "{0}.{1}".format(className, '__init__'),
+                       'Name': clsName,
+                       'Description': self.__getShortDescription(
+                           dict['__init__'].description),
+                       'Deprecated': self.__checkDeprecated(
+                           dict['__init__'].description) and
+                        self.listEntryDeprecatedTemplate or "",
+                       }))
                 self.keywords.append(
                     ("{0} (Constructor)".format(className),
                      "#{0}.{1}".format(className, '__init__')))
@@ -476,15 +468,15 @@
                 pass
         
         for name in names:
-            lst.append(self.listEntryTemplate.format(**{ \
-                'Link': "{0}.{1}".format(className, name),
-                'Name': dict[name].name,
-                'Description':
+            lst.append(self.listEntryTemplate.format(
+                **{'Link': "{0}.{1}".format(className, name),
+                   'Name': dict[name].name,
+                   'Description':
                     self.__getShortDescription(dict[name].description),
-                'Deprecated':
-                    self.__checkDeprecated(dict[name].description) and \
+                   'Deprecated':
+                    self.__checkDeprecated(dict[name].description) and
                     self.listEntryDeprecatedTemplate or "",
-            }))
+                   }))
             self.keywords.append(("{0}.{1}".format(className, name),
                                   "#{0}.{1}".format(className, name)))
         return ''.join(lst)
@@ -505,20 +497,20 @@
         if '__init__' in methods:
             methods.remove('__init__')
             try:
-                methBody = self.constructorTemplate.format(**{ \
-                    'Anchor': className,
-                    'Class': obj.name,
-                    'Method': '__init__',
-                    'MethodDescription': \
+                methBody = self.constructorTemplate.format(
+                    **{'Anchor': className,
+                       'Class': obj.name,
+                       'Method': '__init__',
+                       'MethodDescription':
                         self.__formatDescription(
                             obj.methods['__init__'].description),
-                    'Params':
+                       'Params':
                         ', '.join(obj.methods['__init__'].parameters[1:]),
-                })
+                       })
             except TagError as e:
                 sys.stderr.write(
                     "Error in tags of description of method {0}.{1}.\n".format(
-                    className, '__init__'))
+                        className, '__init__'))
                 sys.stderr.write("{0}\n".format(e))
                 methBody = ""
             methBodies.append(methBody)
@@ -531,20 +523,20 @@
             methodClassifier = ""
         for method in methods:
             try:
-                methBody = self.methodTemplate.format(**{ \
-                    'Anchor': className,
-                    'Class': obj.name,
-                    'Method': obj.methods[method].name,
-                    'MethodClassifier': methodClassifier,
-                    'MethodDescription':
+                methBody = self.methodTemplate.format(
+                    **{'Anchor': className,
+                       'Class': obj.name,
+                       'Method': obj.methods[method].name,
+                       'MethodClassifier': methodClassifier,
+                       'MethodDescription':
                         self.__formatDescription(
                             obj.methods[method].description),
-                    'Params': ', '.join(obj.methods[method].parameters[1:]),
-                })
+                       'Params': ', '.join(obj.methods[method].parameters[1:]),
+                       })
             except TagError as e:
                 sys.stderr.write(
                     "Error in tags of description of method {0}.{1}.\n".format(
-                    className, method))
+                        className, method))
                 sys.stderr.write("{0}\n".format(e))
                 methBody = ""
             methBodies.append(methBody)
@@ -555,9 +547,8 @@
         
         if not methList:
             methList = self.listEntryNoneTemplate
-        return self.listTemplate.format(**{ \
-            'Entries': methList,
-            }), ''.join(methBodies)
+        return (self.listTemplate.format(**{'Entries': methList}),
+                ''.join(methBodies))
         
     def __genRbModulesSection(self):
         """
@@ -577,17 +568,17 @@
                 rbModule, rbModuleName)
             
             try:
-                rbmBody = self.rbModuleTemplate.format(**{ \
-                    'Anchor': rbModuleName,
-                    'Module': rbModule.name,
-                    'ModuleDescription':
+                rbmBody = self.rbModuleTemplate.format(
+                    **{'Anchor': rbModuleName,
+                       'Module': rbModule.name,
+                       'ModuleDescription':
                         self.__formatDescription(rbModule.description),
-                    'GlobalsList': globalsList,
-                    'ClassesList': classList,
-                    'ClassesDetails': classBodies,
-                    'FunctionsList': methList,
-                    'FunctionsDetails': methBodies,
-                })
+                       'GlobalsList': globalsList,
+                       'ClassesList': classList,
+                       'ClassesDetails': classBodies,
+                       'FunctionsList': methList,
+                       'FunctionsDetails': methBodies,
+                       })
             except TagError as e:
                 sys.stderr.write(
                     "Error in tags of description of Ruby module {0}.\n"
@@ -622,19 +613,19 @@
                 self.__genMethodSection(_class, className, Function.General)
             
             try:
-                clsBody = self.rbModulesClassTemplate.format(**{ \
-                    'Anchor': className,
-                    'Class': _class.name,
-                    'ClassSuper': supers,
-                    'ClassDescription':
+                clsBody = self.rbModulesClassTemplate.format(
+                    **{'Anchor': className,
+                       'Class': _class.name,
+                       'ClassSuper': supers,
+                       'ClassDescription':
                         self.__formatDescription(_class.description),
-                    'MethodList': methList,
-                    'MethodDetails': methBodies,
-                })
+                       'MethodList': methList,
+                       'MethodDetails': methBodies,
+                       })
             except TagError as e:
                 sys.stderr.write(
                     "Error in tags of description of class {0}.\n".format(
-                    className))
+                        className))
                 sys.stderr.write("{0}\n".format(e))
                 clsBody = ""
             
@@ -645,9 +636,8 @@
         
         if not classesList:
             classesList = self.listEntryNoneTemplate
-        return self.listTemplate.format(**{ \
-            'Entries': classesList,
-            }), ''.join(classes)
+        return (self.listTemplate.format(**{'Entries': classesList}),
+                ''.join(classes))
         
     def __genRbModulesClassesListSection(self, names, dict, moduleName):
         """
@@ -661,15 +651,15 @@
         """
         lst = []
         for name in names:
-            lst.append(self.listEntryTemplate.format(**{ \
-                'Link': "{0}.{1}".format(moduleName, name),
-                'Name': dict[name].name,
-                'Description':
+            lst.append(self.listEntryTemplate.format(
+                **{'Link': "{0}.{1}".format(moduleName, name),
+                   'Name': dict[name].name,
+                   'Description':
                     self.__getShortDescription(dict[name].description),
-                'Deprecated':
-                    self.__checkDeprecated(dict[name].description) and \
+                   'Deprecated':
+                    self.__checkDeprecated(dict[name].description) and
                     self.listEntryDeprecatedTemplate or "",
-            }))
+                   }))
             self.keywords.append(("{0}.{1}".format(moduleName, name),
                                   "#{0}.{1}".format(moduleName, name)))
         return ''.join(lst)
@@ -685,18 +675,18 @@
         funcNames = sorted(list(self.module.functions.keys()))
         for funcName in funcNames:
             try:
-                funcBody = self.functionTemplate.format(**{ \
-                    'Anchor': funcName,
-                    'Function': self.module.functions[funcName].name,
-                    'FunctionDescription': self.__formatDescription(
-                        self.module.functions[funcName].description),
-                    'Params':
+                funcBody = self.functionTemplate.format(
+                    **{'Anchor': funcName,
+                       'Function': self.module.functions[funcName].name,
+                       'FunctionDescription': self.__formatDescription(
+                           self.module.functions[funcName].description),
+                       'Params':
                         ', '.join(self.module.functions[funcName].parameters),
-                })
+                       })
             except TagError as e:
                 sys.stderr.write(
                     "Error in tags of description of function {0}.\n".format(
-                    funcName))
+                        funcName))
                 sys.stderr.write("{0}\n".format(e))
                 funcBody = ""
             
@@ -780,14 +770,12 @@
                 else:
                     linelist.append(html_uencode(line))
             else:
-                lst.append(self.paragraphTemplate.format(**{ \
-                    'Lines': '\n'.join(linelist)
-                }))
+                lst.append(self.paragraphTemplate.format(
+                    **{'Lines': '\n'.join(linelist)}))
                 linelist = []
         if linelist:
-            lst.append(self.paragraphTemplate.format(**{ \
-                'Lines': '\n'.join(linelist)
-            }))
+            lst.append(self.paragraphTemplate.format(
+                **{'Lines': '\n'.join(linelist)}))
         return ''.join(lst)
         
     def __genDescriptionListSection(self, dictionary, template):
@@ -802,10 +790,10 @@
         lst = []
         keys = sorted(list(dictionary.keys()))
         for key in keys:
-            lst.append(template.format(**{ \
-                'Name': key,
-                'Description': html_uencode('\n'.join(dictionary[key])),
-            }))
+            lst.append(template.format(
+                **{'Name': key,
+                   'Description': html_uencode('\n'.join(dictionary[key])),
+                   }))
         return ''.join(lst)
         
     def __genParamDescriptionListSection(self, _list, template):
@@ -819,10 +807,10 @@
         """
         lst = []
         for name, lines in _list:
-            lst.append(template.format(**{ \
-                'Name': name,
-                'Description': html_uencode('\n'.join(lines)),
-            }))
+            lst.append(template.format(
+                **{'Name': name,
+                   'Description': html_uencode('\n'.join(lines)),
+                   }))
         return ''.join(lst)
         
     def __formatCrossReferenceEntry(self, entry):
@@ -854,9 +842,7 @@
                 reference = "{0}#{1}".format(reference, anchor)
             entry = 'href="{0}">{1}</a>'.format(reference, label)
         
-        return self.seeLinkTemplate.format(**{ \
-            'Link': entry,
-        })
+        return self.seeLinkTemplate.format(**{'Link': entry})
         
     def __genSeeListSection(self, _list, template):
         """
@@ -870,10 +856,10 @@
         lst = []
         for seeEntry in _list:
             seeEntryString = ''.join(seeEntry)
-            lst.append(template.format(**{ \
-                'Link': html_uencode(self.__formatCrossReferenceEntry(
+            lst.append(template.format(
+                **{'Link': html_uencode(self.__formatCrossReferenceEntry(
                     seeEntryString)),
-            }))
+                   }))
         return '\n'.join(lst)
         
     def __processInlineTags(self, desc):
@@ -982,9 +968,9 @@
                     if m is None:
                         raise TagError("Wrong format in @signal line.\n")
                     signalName = 1 and m.group("SignalName1") \
-                                   or m.group("SignalName2")
+                        or m.group("SignalName2")
                     signalDesc = 1 and m.group("SignalDescription1") \
-                                   or m.group("SignalDescription2")
+                        or m.group("SignalDescription2")
                     signalDict[signalName] = []
                     if signalDesc is not None:
                         signalDict[signalName].append(signalDesc)
@@ -996,9 +982,9 @@
                         raise TagError(
                             "Wrong format in {0} line.\n".format(parts[0]))
                     eventName = 1 and m.group("EventName1") \
-                                   or m.group("EventName2")
+                        or m.group("EventName2")
                     eventDesc = 1 and m.group("EventDescription1") \
-                                   or m.group("EventDescription2")
+                        or m.group("EventDescription2")
                     eventDict[eventName] = []
                     if eventDesc is not None:
                         eventDict[eventName].append(eventDesc)
@@ -1052,10 +1038,9 @@
             description = ""
         
         if paramList:
-            parameterSect = self.parametersListTemplate.format(**{ \
-                'Parameters': self.__genParamDescriptionListSection(
-                    paramList, self.parametersListEntryTemplate)
-            })
+            parameterSect = self.parametersListTemplate.format(
+                **{'Parameters': self.__genParamDescriptionListSection(
+                    paramList, self.parametersListEntryTemplate)})
         else:
             parameterSect = ""
         
@@ -1066,55 +1051,48 @@
             returnSect = ""
         
         if exceptionDict:
-            exceptionSect = self.exceptionsListTemplate.format(**{ \
-                'Exceptions': self.__genDescriptionListSection(
-                    exceptionDict, self.exceptionsListEntryTemplate)
-            })
+            exceptionSect = self.exceptionsListTemplate.format(
+                **{'Exceptions': self.__genDescriptionListSection(
+                    exceptionDict, self.exceptionsListEntryTemplate)})
         else:
             exceptionSect = ""
         
         if signalDict:
-            signalSect = self.signalsListTemplate.format(**{ \
-                'Signals': self.__genDescriptionListSection(
-                    signalDict, self.signalsListEntryTemplate)
-            })
+            signalSect = self.signalsListTemplate.format(
+                **{'Signals': self.__genDescriptionListSection(
+                    signalDict, self.signalsListEntryTemplate)})
         else:
             signalSect = ""
         
         if eventDict:
-            eventSect = self.eventsListTemplate.format(**{ \
-                'Events': self.__genDescriptionListSection(
-                    eventDict, self.eventsListEntryTemplate)
-            })
+            eventSect = self.eventsListTemplate.format(
+                **{'Events': self.__genDescriptionListSection(
+                    eventDict, self.eventsListEntryTemplate)})
         else:
             eventSect = ""
         
         if deprecated:
-            deprecatedSect = self.deprecatedTemplate.format(**{ \
-                'Lines': html_uencode('\n'.join(deprecated)),
-            })
+            deprecatedSect = self.deprecatedTemplate.format(
+                **{'Lines': html_uencode('\n'.join(deprecated))})
         else:
             deprecatedSect = ""
         
         if authorInfo:
-            authorInfoSect = self.authorInfoTemplate.format(**{ \
-                'Authors': html_uencode('\n'.join(authorInfo)),
-            })
+            authorInfoSect = self.authorInfoTemplate.format(
+                **{'Authors': html_uencode('\n'.join(authorInfo))})
         else:
             authorInfoSect = ""
         
         if sinceInfo:
-            sinceInfoSect = self.sinceInfoTemplate.format(**{ \
-                'Info': html_uencode(sinceInfo[0]),
-            })
+            sinceInfoSect = self.sinceInfoTemplate.format(
+                **{'Info': html_uencode(sinceInfo[0])})
         else:
             sinceInfoSect = ""
         
         if seeList:
-            seeSect = self.seeListTemplate.format(**{ \
-                'Links': self.__genSeeListSection(
-                    seeList, self.seeListEntryTemplate),
-            })
+            seeSect = self.seeListTemplate.format(
+                **{'Links': self.__genSeeListSection(
+                    seeList, self.seeListEntryTemplate)})
         else:
             seeSect = ''
         
--- a/DocumentationTools/QtHelpGenerator.py	Fri Nov 01 15:48:48 2013 +0100
+++ b/DocumentationTools/QtHelpGenerator.py	Sun Nov 03 15:58:22 2013 +0100
@@ -170,9 +170,9 @@
         indent1 = indent + '  '
         s = indent + '<section title="{0}" ref="{1}">\n'.format(
             package == "00index" and self.title or package,
-             package == "00index" and \
-                joinext("index", ".html") or \
-                joinext("index-{0}".format(package), ".html"))
+            package == "00index" and
+            joinext("index", ".html") or
+            joinext("index-{0}".format(package), ".html"))
         for subpack in sorted(self.packages[package]["subpackages"]):
             s += self.__generateSections(subpack, level + 1)
             s += '\n'
--- a/DocumentationTools/TemplatesListsStyle.py	Fri Nov 01 15:48:48 2013 +0100
+++ b/DocumentationTools/TemplatesListsStyle.py	Sun Nov 03 15:58:22 2013 +0100
@@ -155,14 +155,11 @@
 <td>{{Deprecated}}{{Description}}</td>
 </tr>'''
 
-listEntryNoneTemplate = \
-'''<tr><td>None</td></tr>'''
+listEntryNoneTemplate = '''<tr><td>None</td></tr>'''
 
-listEntryDeprecatedTemplate = \
-'''<b>Deprecated.</b>'''
+listEntryDeprecatedTemplate = '''<b>Deprecated.</b>'''
 
-listEntrySimpleTemplate = \
-'''<tr><td>{{Name}}</td></tr>'''
+listEntrySimpleTemplate = '''<tr><td>{{Name}}</td></tr>'''
 
 paragraphTemplate = \
 '''<p>
@@ -246,8 +243,7 @@
 {{Link}}
 </dd>'''
 
-seeLinkTemplate = \
-'''<a style="color:{LinkColor}" {{Link}}'''
+seeLinkTemplate = '''<a style="color:{LinkColor}" {{Link}}'''
 
 sinceInfoTemplate = \
 '''<p>
--- a/DocumentationTools/TemplatesListsStyleCSS.py	Fri Nov 01 15:48:48 2013 +0100
+++ b/DocumentationTools/TemplatesListsStyleCSS.py	Sun Nov 03 15:58:22 2013 +0100
@@ -137,14 +137,11 @@
 <td>{Deprecated}{Description}</td>
 </tr>'''
 
-listEntryNoneTemplate = \
-'''<tr><td>None</td></tr>'''
+listEntryNoneTemplate = '''<tr><td>None</td></tr>'''
 
-listEntryDeprecatedTemplate = \
-'''<b>Deprecated.</b>'''
+listEntryDeprecatedTemplate = '''<b>Deprecated.</b>'''
 
-listEntrySimpleTemplate = \
-'''<tr><td>{Name}</td></tr>'''
+listEntrySimpleTemplate = '''<tr><td>{Name}</td></tr>'''
 
 paragraphTemplate = \
 '''<p>
@@ -228,8 +225,7 @@
 {Link}
 </dd>'''
 
-seeLinkTemplate = \
-'''<a {Link}'''
+seeLinkTemplate = '''<a {Link}'''
 
 sinceInfoTemplate = \
 '''<p>
--- a/E5Graphics/E5GraphicsView.py	Fri Nov 01 15:48:48 2013 +0100
+++ b/E5Graphics/E5GraphicsView.py	Sun Nov 03 15:58:22 2013 +0100
@@ -322,10 +322,10 @@
         
         width = printer.width() - marginX \
             - Preferences.getPrinter("RightMargin") * int(
-            printer.resolution() / 2.54)
+                printer.resolution() / 2.54)
         height = printer.height() - fontHeight - 4 - marginY \
             - Preferences.getPrinter("BottomMargin") * int(
-            printer.resolution() / 2.54)
+                printer.resolution() / 2.54)
         
         border = self.border == 0 and 5 or self.border
         rect = self._getDiagramRect(border)
--- a/E5Gui/E5Action.py	Fri Nov 01 15:48:48 2013 +0100
+++ b/E5Gui/E5Action.py	Sun Nov 03 15:58:22 2013 +0100
@@ -81,11 +81,11 @@
         if len(args) < 6 + incr:
             raise ArgumentsError(
                 "Not enough arguments, {0:d} expected, got {1:d}".format(
-                6 + incr, len(args)))
+                    6 + incr, len(args)))
         elif len(args) > 7 + incr:
             raise ArgumentsError(
                 "Too many arguments, max. {0:d} expected, got {1:d}".format(
-                7 + incr, len(args)))
+                    7 + incr, len(args)))
             
         parent = args[4 + incr]
         super(E5Action, self).__init__(parent)
--- a/E5Gui/E5Completers.py	Fri Nov 01 15:48:48 2013 +0100
+++ b/E5Gui/E5Completers.py	Sun Nov 03 15:58:22 2013 +0100
@@ -35,7 +35,7 @@
         self.__model = QFileSystemModel(self)
         if showHidden:
             self.__model.setFilter(
-                QDir.Filters(QDir.Dirs | QDir.Files | QDir.Drives | \
+                QDir.Filters(QDir.Dirs | QDir.Files | QDir.Drives |
                              QDir.AllDirs | QDir.Hidden))
         else:
             self.__model.setFilter(QDir.Filters(
--- a/E5Gui/E5MainWindow.py	Fri Nov 01 15:48:48 2013 +0100
+++ b/E5Gui/E5MainWindow.py	Sun Nov 03 15:58:22 2013 +0100
@@ -59,7 +59,7 @@
                     self.trUtf8(
                         """<p>The Qt Style Sheet file <b>{0}</b> could"""
                         """ not be read.<br>Reason: {1}</p>""")
-                        .format(styleSheetFile, str(msg)))
+                    .format(styleSheetFile, str(msg)))
                 return
         else:
             styleSheet = ""
--- a/E5Gui/E5ModelMenu.py	Fri Nov 01 15:48:48 2013 +0100
+++ b/E5Gui/E5ModelMenu.py	Sun Nov 03 15:58:22 2013 +0100
@@ -365,7 +365,7 @@
             super(E5ModelMenu, self).mouseMoveEvent(evt)
             return
         
-        manhattanLength = (evt.pos() - 
+        manhattanLength = (evt.pos() -
                            self.__dragStartPosition).manhattanLength()
         if manhattanLength <= QApplication.startDragDistance():
             super(E5ModelMenu, self).mouseMoveEvent(evt)
--- a/E5Gui/E5ModelToolBar.py	Fri Nov 01 15:48:48 2013 +0100
+++ b/E5Gui/E5ModelToolBar.py	Sun Nov 03 15:58:22 2013 +0100
@@ -234,7 +234,7 @@
             super(E5ModelToolBar, self).mouseMoveEvent(evt)
             return
         
-        manhattanLength = (evt.pos() - 
+        manhattanLength = (evt.pos() -
                            self.__dragStartPosition).manhattanLength()
         if manhattanLength <= QApplication.startDragDistance():
             super(E5ModelToolBar, self).mouseMoveEvent(evt)
--- a/E5Gui/E5PassivePopup.py	Fri Nov 01 15:48:48 2013 +0100
+++ b/E5Gui/E5PassivePopup.py	Sun Nov 03 15:58:22 2013 +0100
@@ -212,5 +212,5 @@
 DEFAULT_POPUP_TYPE = E5PassivePopup.Boxed
 DEFAULT_POPUP_TIME = 6 * 1000
 POPUP_FLAGS = Qt.WindowFlags(
-    Qt.Tool | Qt.X11BypassWindowManagerHint | \
+    Qt.Tool | Qt.X11BypassWindowManagerHint |
     Qt.WindowStaysOnTopHint | Qt.FramelessWindowHint)
--- a/E5Gui/E5SqueezeLabels.py	Fri Nov 01 15:48:48 2013 +0100
+++ b/E5Gui/E5SqueezeLabels.py	Sun Nov 03 15:58:22 2013 +0100
@@ -109,7 +109,7 @@
         @param event reference to the paint event (QPaintEvent)
         """
         fm = self.fontMetrics()
-        if (fm.width(self.__surrounding.format(self.__path)) > 
+        if (fm.width(self.__surrounding.format(self.__path)) >
                 self.contentsRect().width()):
             super(E5SqueezeLabelPath, self).setText(
                 self.__surrounding.format(compactPath(self.__path,
--- a/E5Gui/E5ToolBarDialog.py	Fri Nov 01 15:48:48 2013 +0100
+++ b/E5Gui/E5ToolBarDialog.py	Sun Nov 03 15:58:22 2013 +0100
@@ -147,7 +147,7 @@
                     self.trUtf8(
                         """A toolbar with the name <b>{0}</b> already"""
                         """ exists.""")
-                        .format(name))
+                    .format(name))
                 return
             
             tbItem = E5ToolBarItem(None, [], False)
@@ -171,7 +171,7 @@
             self.trUtf8("Remove Toolbar"),
             self.trUtf8(
                 """Should the toolbar <b>{0}</b> really be removed?""")
-                .format(name))
+            .format(name))
         if res:
             index = self.toolbarComboBox.currentIndex()
             tbItemID = self.toolbarComboBox.itemData(index)
@@ -208,7 +208,7 @@
                     self.trUtf8(
                         """A toolbar with the name <b>{0}</b> already"""
                         """ exists.""")
-                        .format(newName))
+                    .format(newName))
                 return
             index = self.toolbarComboBox.currentIndex()
             self.toolbarComboBox.setItemText(index, newName)
@@ -358,7 +358,7 @@
             actionID = None
         else:
             actionID = self.actionsTree.currentItem()\
-                       .data(0, E5ToolBarDialog.ActionIdRole)
+                .data(0, E5ToolBarDialog.ActionIdRole)
             action = self.__manager.actionById(actionID)
             item.setText(action.text())
             item.setIcon(action.icon())
--- a/E5Gui/E5ToolBarManager.py	Fri Nov 01 15:48:48 2013 +0100
+++ b/E5Gui/E5ToolBarManager.py	Sun Nov 03 15:58:22 2013 +0100
@@ -304,7 +304,7 @@
         @return flag indicating an added toolbar (boolean)
         """
         return toolBar is not None and \
-               id(toolBar) in self.__defaultToolBars
+            id(toolBar) in self.__defaultToolBars
     
     def createToolBar(self, title, name=""):
         """
--- a/E5Network/E5Ftp.py	Fri Nov 01 15:48:48 2013 +0100
+++ b/E5Network/E5Ftp.py	Sun Nov 03 15:58:22 2013 +0100
@@ -302,7 +302,7 @@
                 if presp[0] != "2":
                     raise E5FtpProxyError(
                         "9{0}0 Error authorizing at proxy\n{1}".format(
-                        presp[0], presp))
+                            presp[0], presp))
                 
                 if self.__proxyType == E5FtpProxyType.Site:
                     # send SITE command
@@ -310,14 +310,14 @@
                     if presp[0] != "2":
                         raise E5FtpProxyError(
                             "9{0}0 Error sending SITE command\n{1}".format(
-                            presp[0], presp))
+                                presp[0], presp))
                 elif self.__proxyType == E5FtpProxyType.Open:
                     # send OPEN command
                     presp = self.sendcmd("OPEN " + self.__host)
                     if presp[0] != "2":
                         raise E5FtpProxyError(
                             "9{0}0 Error sending OPEN command\n{1}".format(
-                            presp[0], presp))
+                                presp[0], presp))
         
         # authenticate to the remote host or combined to proxy and remote host
         resp = self.sendcmd("USER " + user)
@@ -336,6 +336,6 @@
             if presp[0] != "2":
                 raise E5FtpProxyError(
                     "9{0}0 Error authorizing at proxy\n{1}".format(
-                    presp[0], presp))
+                        presp[0], presp))
         
         return resp
--- a/E5Network/E5SslCertificatesDialog.py	Fri Nov 01 15:48:48 2013 +0100
+++ b/E5Network/E5SslCertificatesDialog.py	Sun Nov 03 15:58:22 2013 +0100
@@ -68,7 +68,7 @@
         Private slot to populate the server certificates tree.
         """
         certificateDict = Preferences.toDict(
-                Preferences.Prefs.settings.value("Ssl/CaCertificatesDict"))
+            Preferences.Prefs.settings.value("Ssl/CaCertificatesDict"))
         for server in certificateDict:
             for cert in QSslCertificate.fromData(certificateDict[server]):
                 self.__createServerCertificateEntry(server, cert)
@@ -158,8 +158,8 @@
                         """<p>If the server certificate is deleted, the"""
                         """ normal security checks will be reinstantiated"""
                         """ and the server has to present a valid"""
-                        """ certificate.</p>""")\
-                .format(itm.text(0)))
+                        """ certificate.</p>""")
+            .format(itm.text(0)))
         if res:
             server = itm.text(1)
             cert = self.serversCertificatesTree.currentItem().data(
@@ -175,7 +175,7 @@
             
             # delete the certificate from the user certificate store
             certificateDict = Preferences.toDict(
-                    Preferences.Prefs.settings.value("Ssl/CaCertificatesDict"))
+                Preferences.Prefs.settings.value("Ssl/CaCertificatesDict"))
             if server in certificateDict:
                 certs = QSslCertificate.fromData(certificateDict[server])
                 if cert in certs:
@@ -224,7 +224,7 @@
                         self.trUtf8(
                             """<p>The certificate <b>{0}</b> already exists."""
                             """ Skipping.</p>""")
-                            .format(Utilities.decodeString(commonStr)))
+                        .format(Utilities.decodeString(commonStr)))
                 else:
                     pems.append(cert.toPem() + '\n')
             if server not in certificateDict:
@@ -256,7 +256,7 @@
         """
         caList = self.__getSystemCaCertificates()
         certificateDict = Preferences.toDict(
-                Preferences.Prefs.settings.value("Ssl/CaCertificatesDict"))
+            Preferences.Prefs.settings.value("Ssl/CaCertificatesDict"))
         for server in certificateDict:
             for cert in QSslCertificate.fromData(certificateDict[server]):
                 if cert not in caList:
@@ -366,8 +366,8 @@
                 """<p>Shall the CA certificate really be deleted?</p>"""
                 """<p>{0}</p>"""
                 """<p>If the CA certificate is deleted, the browser"""
-                """ will not trust any certificate issued by this CA.</p>""")\
-                .format(itm.text(0)))
+                """ will not trust any certificate issued by this CA.</p>""")
+            .format(itm.text(0)))
         if res:
             cert = self.caCertificatesTree.currentItem().data(0, self.CertRole)
             
@@ -414,7 +414,7 @@
                         self.trUtf8(
                             """<p>The certificate <b>{0}</b> already exists."""
                             """ Skipping.</p>""")
-                            .format(Utilities.decodeString(commonStr)))
+                        .format(Utilities.decodeString(commonStr)))
                 else:
                     caCerts.append(cert)
             
@@ -480,7 +480,7 @@
                         self.trUtf8(
                             """<p>The certificate could not be written"""
                             """ to file <b>{0}</b></p><p>Error: {1}</p>""")
-                            .format(fname, f.errorString()))
+                        .format(fname, f.errorString()))
                     return
                 
                 if fname.endswith(".pem"):
@@ -512,7 +512,7 @@
                     self.trUtf8(
                         """<p>The certificate could not be read from file"""
                         """ <b>{0}</b></p><p>Error: {1}</p>""")
-                        .format(fname, f.errorString()))
+                    .format(fname, f.errorString()))
                 return []
             
             crt = f.readAll()
--- a/E5Network/E5SslErrorHandler.py	Fri Nov 01 15:48:48 2013 +0100
+++ b/E5Network/E5SslErrorHandler.py	Sun Nov 03 15:58:22 2013 +0100
@@ -106,7 +106,7 @@
         """
         caMerge = {}
         certificateDict = Preferences.toDict(
-                Preferences.Prefs.settings.value("Ssl/CaCertificatesDict"))
+            Preferences.Prefs.settings.value("Ssl/CaCertificatesDict"))
         for caServer in certificateDict:
             caMerge[caServer] = QSslCertificate.fromData(
                 certificateDict[caServer])
@@ -135,8 +135,8 @@
             self.trUtf8("SSL Errors"),
             self.trUtf8("""<p>SSL Errors for <br /><b>{0}</b>"""
                         """<ul><li>{1}</li></ul></p>"""
-                        """<p>Do you want to ignore these errors?</p>""")\
-                .format(server, errorString),
+                        """<p>Do you want to ignore these errors?</p>""")
+            .format(server, errorString),
             icon=E5MessageBox.Warning)
         
         if ret:
@@ -151,8 +151,8 @@
                     self.trUtf8(
                         """<p>Certificates:<br/>{0}<br/>"""
                         """Do you want to accept all these certificates?"""
-                        """</p>""")\
-                        .format("".join(certinfos)))
+                        """</p>""")
+                    .format("".join(certinfos)))
                 if caRet:
                     if server not in caMerge:
                         caMerge[server] = []
@@ -220,7 +220,7 @@
         result += self.trUtf8(
             "<br/>Not valid before: {0}<br/>Valid Until: {1}")\
             .format(Utilities.html_encode(
-                        cert.effectiveDate().toString("yyyy-MM-dd")),
+                    cert.effectiveDate().toString("yyyy-MM-dd")),
                     Utilities.html_encode(
                         cert.expiryDate().toString("yyyy-MM-dd")))
         
--- a/E5XML/DebuggerPropertiesWriter.py	Fri Nov 01 15:48:48 2013 +0100
+++ b/E5XML/DebuggerPropertiesWriter.py	Sun Nov 03 15:58:22 2013 +0100
@@ -46,12 +46,12 @@
         self.writeDTD(
             '<!DOCTYPE DebuggerProperties SYSTEM'
             ' "DebuggerProperties-{0}.dtd">'.format(
-            debuggerPropertiesFileFormatVersion))
+                debuggerPropertiesFileFormatVersion))
         
         # add some generation comments
         self.writeComment(
             " eric5 debugger properties file for project {0} ".format(
-            self.name))
+                self.name))
         self.writeComment(
             " This file was generated automatically, do not edit. ")
         if Preferences.getProject("XMLTimestamp"):
--- a/E5XML/HighlightingStylesWriter.py	Fri Nov 01 15:48:48 2013 +0100
+++ b/E5XML/HighlightingStylesWriter.py	Sun Nov 03 15:58:22 2013 +0100
@@ -44,7 +44,7 @@
         self.writeDTD(
             '<!DOCTYPE HighlightingStyles SYSTEM'
             ' "HighlightingStyles-{0}.dtd">'.format(
-            highlightingStylesFileFormatVersion))
+                highlightingStylesFileFormatVersion))
         
         # add some generation comments
         self.writeComment(" Eric5 highlighting styles ")
--- a/E5XML/MultiProjectWriter.py	Fri Nov 01 15:48:48 2013 +0100
+++ b/E5XML/MultiProjectWriter.py	Sun Nov 03 15:58:22 2013 +0100
@@ -41,11 +41,11 @@
         """
         XMLStreamWriterBase.writeXML(self)
         
-        self.writeDTD('<!DOCTYPE MultiProject SYSTEM "MultiProject-{0}.dtd">'\
+        self.writeDTD('<!DOCTYPE MultiProject SYSTEM "MultiProject-{0}.dtd">'
             .format(multiProjectFileFormatVersion))
         
         # add some generation comments
-        self.writeComment(" eric5 multi project file for multi project {0} "\
+        self.writeComment(" eric5 multi project file for multi project {0} "
             .format(self.name))
         if Preferences.getMultiProject("XMLTimestamp"):
             self.writeComment(
--- a/E5XML/PluginRepositoryReader.py	Fri Nov 01 15:48:48 2013 +0100
+++ b/E5XML/PluginRepositoryReader.py	Sun Nov 03 15:58:22 2013 +0100
@@ -68,7 +68,7 @@
                       "author": "",
                       "version": "",
                       "filename": "",
-        }
+                      }
         pluginInfo["status"] = self.attribute("status", "unknown")
         
         while not self.atEnd():
--- a/E5XML/ProjectWriter.py	Fri Nov 01 15:48:48 2013 +0100
+++ b/E5XML/ProjectWriter.py	Sun Nov 03 15:58:22 2013 +0100
@@ -52,9 +52,9 @@
             self.writeComment(
                 " Saved: {0} ".format(time.strftime('%Y-%m-%d, %H:%M:%S')))
             self.writeComment(" Copyright (C) {0} {1}, {2} ".format(
-                    time.strftime('%Y'),
-                    self.pdata["AUTHOR"][0],
-                    self.pdata["EMAIL"][0]))
+                time.strftime('%Y'),
+                self.pdata["AUTHOR"][0],
+                self.pdata["EMAIL"][0]))
         
         # add the main tag
         self.writeStartElement("Project")
--- a/E5XML/TasksReader.py	Fri Nov 01 15:48:48 2013 +0100
+++ b/E5XML/TasksReader.py	Sun Nov 03 15:58:22 2013 +0100
@@ -82,7 +82,7 @@
                 "linenumber": 0,
                 "type": Task.TypeTodo,
                 "description": "",
-               }
+                }
         task["priority"] = int(self.attribute("priority", "1"))
         task["completed"] = self.toBool(self.attribute("completed", "False"))
         if self.version in ["4.2", "5.0"]:
--- a/E5XML/UserProjectWriter.py	Fri Nov 01 15:48:48 2013 +0100
+++ b/E5XML/UserProjectWriter.py	Sun Nov 03 15:58:22 2013 +0100
@@ -46,7 +46,7 @@
         
         self.writeDTD(
             '<!DOCTYPE UserProject SYSTEM "UserProject-{0}.dtd">'.format(
-            userProjectFileFormatVersion))
+                userProjectFileFormatVersion))
         
         # add some generation comments
         self.writeComment(
--- a/E5XML/XMLStreamReaderBase.py	Fri Nov 01 15:48:48 2013 +0100
+++ b/E5XML/XMLStreamReaderBase.py	Sun Nov 03 15:58:22 2013 +0100
@@ -54,13 +54,13 @@
                 "XMLStreamReaderBase",
                 "<p>XML parse error in file <b>{0}</b>, line {1},"
                 " column {2}</p><p>Error: {3}</p>").format(
-                    self.device().fileName(),
-                    self.lineNumber(), self.columnNumber(),
-                    self.errorString())
+                self.device().fileName(),
+                self.lineNumber(), self.columnNumber(),
+                self.errorString())
             E5MessageBox.warning(
                 None,
                 QCoreApplication.translate(
-                "XMLStreamReaderBase", "XML parse error"),
+                    "XMLStreamReaderBase", "XML parse error"),
                 msg)
     
     def raiseUnexpectedStartTag(self, tag):
@@ -159,11 +159,11 @@
                         # backward compatibility to 4.6
                         val = self.readElementText()
                     elif self.name() == "bytes":
-                        by = bytes([int(b) for b in 
+                        by = bytes([int(b) for b in
                                     self.readElementText().split(",")])
                         val = by
                     elif self.name() == "bytearray":
-                        by = bytearray([int(b) for b in 
+                        by = bytearray([int(b) for b in
                                         self.readElementText().split(",")])
                         val = by
                     elif self.name() == "tuple":
@@ -211,13 +211,13 @@
         
         @return Python tuple
         """
-        l = []
+        li = []
         while not self.atEnd():
             val = self._readBasics()
             if self.isEndElement() and self.name() == "tuple" and val is None:
-                return tuple(l)
+                return tuple(li)
             else:
-                l.append(val)
+                li.append(val)
     
     def __readList(self):
         """
@@ -225,13 +225,13 @@
         
         @return Python list
         """
-        l = []
+        li = []
         while not self.atEnd():
             val = self._readBasics()
             if self.isEndElement() and self.name() == "list" and val is None:
-                return l
+                return li
             else:
-                l.append(val)
+                li.append(val)
     
     def __readDict(self):
         """
@@ -259,13 +259,13 @@
         
         @return Python set
         """
-        l = []
+        li = []
         while not self.atEnd():
             val = self._readBasics()
             if self.isEndElement() and self.name() == "set" and val is None:
-                return set(l)
+                return set(li)
             else:
-                l.append(val)
+                li.append(val)
     
     def __readFrozenset(self):
         """
@@ -273,12 +273,12 @@
         
         @return Python set
         """
-        l = []
+        li = []
         while not self.atEnd():
             val = self._readBasics()
             if self.isEndElement() and \
                     self.name() == "frozenset" and \
                     val is None:
-                return frozenset(l)
+                return frozenset(li)
             else:
-                l.append(val)
+                li.append(val)
--- a/Globals/AppInfo.py	Fri Nov 01 15:48:48 2013 +0100
+++ b/Globals/AppInfo.py	Sun Nov 03 15:58:22 2013 +0100
@@ -33,4 +33,4 @@
         "description": description,
         "version": Version,
         "options": options
-        }
+    }
--- a/Globals/__init__.py	Fri Nov 01 15:48:48 2013 +0100
+++ b/Globals/__init__.py	Sun Nov 03 15:58:22 2013 +0100
@@ -96,7 +96,7 @@
         # check for blacklisted versions
         for vers in BlackLists["PyQt4"] + PlatformBlackLists["PyQt4"]:
             if vers == pyqtVersion:
-                print('Sorry, PyQt4 version {0} is not compatible with eric5.'\
+                print('Sorry, PyQt4 version {0} is not compatible with eric5.'
                       .format(vers))
                 print('Please install another version.')
                 return False
--- a/Graphics/ApplicationDiagramBuilder.py	Fri Nov 01 15:48:48 2013 +0100
+++ b/Graphics/ApplicationDiagramBuilder.py	Sun Nov 03 15:58:22 2013 +0100
@@ -107,17 +107,17 @@
         
         # step 1: build a dictionary of packages
         for module in sortedkeys:
-            l = module.split('.')
-            package = '.'.join(l[:-1])
+            li = module.split('.')
+            package = '.'.join(li[:-1])
             if package in packages:
-                packages[package][0].append(l[-1])
+                packages[package][0].append(li[-1])
             else:
-                packages[package] = ([l[-1]], [])
+                packages[package] = ([li[-1]], [])
                 
         # step 2: assign modules to dictionaries and update import relationship
         for module in sortedkeys:
-            l = module.split('.')
-            package = '.'.join(l[:-1])
+            li = module.split('.')
+            package = '.'.join(li[:-1])
             impLst = []
             for i in modules[module].imports:
                 if i in modules:
@@ -156,7 +156,7 @@
                         packageList = shortPackage.split('.')[1:]
                         packageListLen = len(packageList)
                         i = '.'.join(
-                            packageList[:packageListLen - dots + 1] + 
+                            packageList[:packageListLen - dots + 1] +
                             [i[dots:]])
                 
                 if i in modules:
@@ -248,8 +248,8 @@
         for package in shapes:
             for rel in shapes[package][1]:
                 assoc = AssociationItem(
-                        shapes[package][0], shapes[rel][0],
-                        Imports)
+                    shapes[package][0], shapes[rel][0],
+                    Imports)
                 self.scene.addItem(assoc)
     
     def getPersistenceData(self):
--- a/Graphics/ImportsDiagramBuilder.py	Fri Nov 01 15:48:48 2013 +0100
+++ b/Graphics/ImportsDiagramBuilder.py	Sun Nov 03 15:58:22 2013 +0100
@@ -78,11 +78,11 @@
         """
         import Utilities.ModuleParser
         extensions = Preferences.getPython("PythonExtensions") + \
-                     Preferences.getPython("Python3Extensions")
+            Preferences.getPython("Python3Extensions")
         moduleDict = {}
         modules = []
         for ext in Preferences.getPython("PythonExtensions") + \
-                    Preferences.getPython("Python3Extensions"):
+                Preferences.getPython("Python3Extensions"):
             modules.extend(glob.glob(Utilities.normjoinpath(
                 self.packagePath, '*{0}'.format(ext))))
         
@@ -123,7 +123,7 @@
             ct.setHtml(
                 self.trUtf8(
                     "The directory <b>'{0}'</b> is not a Python package.")
-                    .format(self.package))
+                .format(self.package))
             self.scene.addItem(ct)
             return
         
@@ -249,8 +249,8 @@
         for module in list(shapes.keys()):
             for rel in shapes[module][1]:
                 assoc = AssociationItem(
-                        shapes[module][0], shapes[rel][0],
-                        Imports)
+                    shapes[module][0], shapes[rel][0],
+                    Imports)
                 self.scene.addItem(assoc)
     
     def getPersistenceData(self):
--- a/Graphics/PackageDiagramBuilder.py	Fri Nov 01 15:48:48 2013 +0100
+++ b/Graphics/PackageDiagramBuilder.py	Sun Nov 03 15:58:22 2013 +0100
@@ -76,9 +76,9 @@
         import Utilities.ModuleParser
         
         supportedExt = \
-            ['*{0}'.format(ext) for ext in 
+            ['*{0}'.format(ext) for ext in
              Preferences.getPython("PythonExtensions")] + \
-            ['*{0}'.format(ext) for ext in 
+            ['*{0}'.format(ext) for ext in
              Preferences.getPython("Python3Extensions")] + \
             ['*.rb']
         extensions = Preferences.getPython("PythonExtensions") + \
@@ -127,9 +127,9 @@
         import Utilities.ModuleParser
         
         supportedExt = \
-            ['*{0}'.format(ext) for ext in 
+            ['*{0}'.format(ext) for ext in
              Preferences.getPython("PythonExtensions")] + \
-            ['*{0}'.format(ext) for ext in 
+            ['*{0}'.format(ext) for ext in
              Preferences.getPython("Python3Extensions")] + \
             ['*.rb']
         extensions = Preferences.getPython("PythonExtensions") + \
@@ -200,7 +200,7 @@
         if len(initlist) == 0:
             ct = QGraphicsTextItem(None, self.scene)
             ct.setHtml(
-                self.trUtf8("The directory <b>'{0}'</b> is not a package.")\
+                self.trUtf8("The directory <b>'{0}'</b> is not a package.")
                     .format(self.package))
             return
         
@@ -210,7 +210,7 @@
             ct.setHtml(
                 self.trUtf8(
                     "The package <b>'{0}'</b> does not contain any modules.")
-                    .format(self.package))
+                .format(self.package))
             return
             
         # step 1: build all classes found in the modules
@@ -226,7 +226,7 @@
             ct.setHtml(
                 self.trUtf8(
                     "The package <b>'{0}'</b> does not contain any classes.")
-                    .format(self.package))
+                .format(self.package))
             return
         
         # step 2: build the class hierarchies
@@ -246,10 +246,10 @@
                             self.allClasses[className] = cw
                     if cw and cw.noAttrs != self.noAttrs:
                         cw = None
-                    if cw and not (cw.external and \
+                    if cw and not (cw.external and
                                    (className in module.classes or
                                     className in module.modules)
-                                  ):
+                                   ):
                         if className not in nodes:
                             nodes.append(className)
                     else:
@@ -428,10 +428,10 @@
         for route in routes:
             if len(route) > 1:
                 assoc = AssociationItem(
-                        self.__getCurrentShape(route[1]),
-                        self.__getCurrentShape(route[0]),
-                        Generalisation,
-                        topToBottom=True)
+                    self.__getCurrentShape(route[1]),
+                    self.__getCurrentShape(route[0]),
+                    Generalisation,
+                    topToBottom=True)
                 self.scene.addItem(assoc)
     
     def getPersistenceData(self):
--- a/Graphics/PixmapDiagram.py	Fri Nov 01 15:48:48 2013 +0100
+++ b/Graphics/PixmapDiagram.py	Sun Nov 03 15:58:22 2013 +0100
@@ -234,7 +234,7 @@
         @param factor factor to adjust by (float)
         """
         scrollBar.setValue(int(factor * scrollBar.value()
-                                + ((factor - 1) * scrollBar.pageStep() / 2)))
+                           + ((factor - 1) * scrollBar.pageStep() / 2)))
         
     def __levelForZoom(self, zoom):
         """
@@ -298,7 +298,7 @@
         
         @return current zoom factor in percent (integer)
         """
-        return int(self.pixmapLabel.width() / 
+        return int(self.pixmapLabel.width() /
                    self.pixmapLabel.pixmap().width() * 100.0)
         
     def __printDiagram(self):
--- a/Graphics/SvgDiagram.py	Fri Nov 01 15:48:48 2013 +0100
+++ b/Graphics/SvgDiagram.py	Sun Nov 03 15:58:22 2013 +0100
@@ -203,8 +203,9 @@
         @param scrollBar reference to the scrollbar object (QScrollBar)
         @param factor factor to adjust by (float)
         """
-        scrollBar.setValue(int(factor * scrollBar.value()
-                                + ((factor - 1) * scrollBar.pageStep() / 2)))
+        scrollBar.setValue(
+            int(factor * scrollBar.value() +
+                ((factor - 1) * scrollBar.pageStep() / 2)))
         
     def __levelForZoom(self, zoom):
         """
@@ -265,7 +266,7 @@
         
         @return current zoom factor in percent (integer)
         """
-        return int(self.svgWidget.width() / 
+        return int(self.svgWidget.width() /
                    self.svgWidget.sizeHint().width() * 100.0)
         
     def __printDiagram(self):
@@ -282,7 +283,9 @@
             printer.setPageOrder(QPrinter.FirstPageFirst)
         else:
             printer.setPageOrder(QPrinter.LastPageFirst)
-        printer.setPrinterName(Preferences.getPrinter("PrinterName"))
+        printerName = Preferences.getPrinter("PrinterName")
+        if printerName:
+            self.setPrinterName(printerName)
         
         printDialog = QPrintDialog(printer, self)
         if printDialog.exec_():
@@ -311,7 +314,9 @@
             Preferences.getPrinter("BottomMargin") * 10,
             QPrinter.Millimeter
         )
-        printer.setPrinterName(Preferences.getPrinter("PrinterName"))
+        printerName = Preferences.getPrinter("PrinterName")
+        if printerName:
+            self.setPrinterName(printerName)
         
         preview = QPrintPreviewDialog(printer, self)
         preview.paintRequested[QPrinter].connect(self.__print)
--- a/Graphics/UMLClassDiagramBuilder.py	Fri Nov 01 15:48:48 2013 +0100
+++ b/Graphics/UMLClassDiagramBuilder.py	Sun Nov 03 15:58:22 2013 +0100
@@ -107,10 +107,9 @@
                             self.allModules[self.file].append(className)
                 if cw and cw.noAttrs != self.noAttrs:
                     cw = None
-                if cw and not (cw.external and \
+                if cw and not (cw.external and
                                (className in module.classes or
-                                className in module.modules)
-                              ):
+                                className in module.modules)):
                     if cw.scene() != self.scene:
                         self.scene.addItem(cw)
                         cw.setPos(10, 10)
@@ -279,10 +278,10 @@
         for route in routes:
             if len(route) > 1:
                 assoc = AssociationItem(
-                        self.__getCurrentShape(route[1]),
-                        self.__getCurrentShape(route[0]),
-                        Generalisation,
-                        topToBottom=True)
+                    self.__getCurrentShape(route[1]),
+                    self.__getCurrentShape(route[0]),
+                    Generalisation,
+                    topToBottom=True)
                 self.scene.addItem(assoc)
     
     def getPersistenceData(self):
--- a/Graphics/UMLDialog.py	Fri Nov 01 15:48:48 2013 +0100
+++ b/Graphics/UMLDialog.py	Sun Nov 03 15:58:22 2013 +0100
@@ -374,9 +374,9 @@
         """
         if linenum < 0:
             msg = self.trUtf8("""<p>The file <b>{0}</b> does not contain"""
-                               """ valid data.</p>""").format(filename)
+                              """ valid data.</p>""").format(filename)
         else:
             msg = self.trUtf8("""<p>The file <b>{0}</b> does not contain"""
-                               """ valid data.</p><p>Invalid line: {1}</p>"""
+                              """ valid data.</p><p>Invalid line: {1}</p>"""
                               ).format(filename, linenum + 1)
         E5MessageBox.critical(self, self.trUtf8("Load Diagram"), msg)
--- a/Graphics/UMLGraphicsView.py	Fri Nov 01 15:48:48 2013 +0100
+++ b/Graphics/UMLGraphicsView.py	Sun Nov 03 15:58:22 2013 +0100
@@ -308,7 +308,7 @@
         rect = self._getDiagramRect(10)
         sceneRect = self.scene().sceneRect()
         dlg = UMLSceneSizeDialog(sceneRect.width(), sceneRect.height(),
-                                  rect.width(), rect.height(), self)
+                                 rect.width(), rect.height(), self)
         if dlg.exec_() == QDialog.Accepted:
             width, height = dlg.getData()
             self.setSceneSize(width, height)
@@ -360,7 +360,7 @@
                     self.trUtf8("Save Diagram"),
                     self.trUtf8(
                         """<p>The file <b>{0}</b> could not be saved.</p>""")
-                        .format(fname))
+                    .format(fname))
         
     def __relayout(self):
         """
@@ -418,7 +418,9 @@
             Preferences.getPrinter("BottomMargin") * 10,
             QPrinter.Millimeter
         )
-        printer.setPrinterName(Preferences.getPrinter("PrinterName"))
+        printerName = Preferences.getPrinter("PrinterName")
+        if printerName:
+            self.setPrinterName(printerName)
         
         printDialog = QPrintDialog(printer, self)
         if printDialog.exec_():
@@ -447,7 +449,9 @@
             Preferences.getPrinter("BottomMargin") * 10,
             QPrinter.Millimeter
         )
-        printer.setPrinterName(Preferences.getPrinter("PrinterName"))
+        printerName = Preferences.getPrinter("PrinterName")
+        if printerName:
+            self.setPrinterName(printerName)
         
         preview = QPrintPreviewDialog(printer, self)
         preview.paintRequested[QPrinter].connect(self.__printPreviewPrint)
--- a/Helpviewer/AdBlock/AdBlockBlockedNetworkReply.py	Fri Nov 01 15:48:48 2013 +0100
+++ b/Helpviewer/AdBlock/AdBlockBlockedNetworkReply.py	Sun Nov 03 15:58:22 2013 +0100
@@ -34,7 +34,7 @@
         self.setError(
             QNetworkReply.ContentAccessDenied,
             "AdBlockRule:{0} ({1})"
-                .format(subscription.title(), rule.filter()))
+            .format(subscription.title(), rule.filter()))
         QTimer.singleShot(0, self.__fireSignals)
     
     def __fireSignals(self):
--- a/Helpviewer/AdBlock/AdBlockDialog.py	Fri Nov 01 15:48:48 2013 +0100
+++ b/Helpviewer/AdBlock/AdBlockDialog.py	Sun Nov 03 15:58:22 2013 +0100
@@ -112,11 +112,11 @@
         Private slot to show the actions menu.
         """
         subscriptionEditable = self.__currentSubscription and \
-                               self.__currentSubscription.canEditRules()
+            self.__currentSubscription.canEditRules()
         subscriptionRemovable = self.__currentSubscription and \
-                               self.__currentSubscription.canBeRemoved()
+            self.__currentSubscription.canBeRemoved()
         subscriptionEnabled = self.__currentSubscription and \
-                              self.__currentSubscription.isEnabled()
+            self.__currentSubscription.isEnabled()
         
         menu = self.actionButton.menu()
         menu.clear()
@@ -215,8 +215,8 @@
                 "<p>Do you really want to remove subscription"
                 " <b>{0}</b> and all subscriptions requiring it?</p>"
                 "<ul><li>{1}</li></ul>").format(
-                    self.__currentSubscription.title(),
-                    "</li><li>".join(requiresTitles))
+                self.__currentSubscription.title(),
+                "</li><li>".join(requiresTitles))
         else:
             message = self.trUtf8(
                 "<p>Do you really want to remove subscription"
--- a/Helpviewer/AdBlock/AdBlockIcon.py	Fri Nov 01 15:48:48 2013 +0100
+++ b/Helpviewer/AdBlock/AdBlockIcon.py	Sun Nov 03 15:58:22 2013 +0100
@@ -168,7 +168,7 @@
         import Helpviewer.HelpWindow
         return urlHost and \
             Helpviewer.HelpWindow.HelpWindow.adBlockManager()\
-                .isHostExcepted(urlHost)
+            .isHostExcepted(urlHost)
     
     def currentChanged(self):
         """
--- a/Helpviewer/AdBlock/AdBlockNetwork.py	Fri Nov 01 15:48:48 2013 +0100
+++ b/Helpviewer/AdBlock/AdBlockNetwork.py	Sun Nov 03 15:58:22 2013 +0100
@@ -45,7 +45,7 @@
                 blockedRule = subscription.match(request, urlDomain, urlString)
                 if blockedRule:
                     webPage = request.attribute(QNetworkRequest.User + 100)
-                    if  webPage is not None:
+                    if webPage is not None:
                         if not self.__canBeBlocked(webPage.url()):
                             return None
                         
--- a/Helpviewer/AdBlock/AdBlockRule.py	Fri Nov 01 15:48:48 2013 +0100
+++ b/Helpviewer/AdBlock/AdBlockRule.py	Sun Nov 03 15:58:22 2013 +0100
@@ -199,7 +199,7 @@
             parsedLine = parsedLine[1:-1]
             self.__useRegExp = True
             self.__regExp = QRegExp(parsedLine, self.__caseSensitivity,
-                                     QRegExp.RegExp)
+                                    QRegExp.RegExp)
             return
         
         # Remove starting / ending wildcards
--- a/Helpviewer/AdBlock/AdBlockSubscription.py	Fri Nov 01 15:48:48 2013 +0100
+++ b/Helpviewer/AdBlock/AdBlockSubscription.py	Sun Nov 03 15:58:22 2013 +0100
@@ -271,8 +271,8 @@
                     None,
                     self.trUtf8("Load subscription rules"),
                     self.trUtf8(
-                        """Unable to open adblock file '{0}' for reading.""")\
-                        .format(fileName))
+                        """Unable to open adblock file '{0}' for reading.""")
+                    .format(fileName))
             else:
                 textStream = QTextStream(f)
                 header = textStream.readLine(1024)
@@ -281,8 +281,8 @@
                         None,
                         self.trUtf8("Load subscription rules"),
                         self.trUtf8("""AdBlock file '{0}' does not start"""
-                                    """ with [Adblock.""")\
-                            .format(fileName))
+                                    """ with [Adblock.""")
+                        .format(fileName))
                     f.close()
                     f.remove()
                     self.__lastUpdate = QDateTime()
@@ -333,8 +333,8 @@
         else:
             updatePeriod = Preferences.getHelp("AdBlockUpdatePeriod") * 24
         if not self.__lastUpdate.isValid() or \
-           (self.__remoteModified.isValid() and \
-            self.__remoteModified.addSecs(updatePeriod * 3600) < \
+           (self.__remoteModified.isValid() and
+            self.__remoteModified.addSecs(updatePeriod * 3600) <
                 QDateTime.currentDateTime()) or \
            self.__lastUpdate.addSecs(updatePeriod * 3600) < \
                 QDateTime.currentDateTime():
@@ -381,7 +381,7 @@
                     self.trUtf8(
                         """<p>Subscription rules could not be"""
                         """ downloaded.</p><p>Error: {0}</p>""")
-                        .format(reply.errorString()))
+                    .format(reply.errorString()))
             else:
                 # reset after first download attempt
                 self.__defaultSubscription = False
@@ -402,8 +402,8 @@
                 None,
                 self.trUtf8("Downloading subscription rules"),
                 self.trUtf8(
-                    """Unable to open adblock file '{0}' for writing.""")\
-                    .file(fileName))
+                    """Unable to open adblock file '{0}' for writing.""")
+                .file(fileName))
             return
         f.write(response)
         f.close()
@@ -458,9 +458,9 @@
                     """ checksum.<br/>"""
                     """Found: {1}<br/>"""
                     """Calculated: {2}<br/>"""
-                    """Use it anyway?</p>""")\
-                    .format(self.__title, expectedChecksum,
-                            calculatedChecksum))
+                    """Use it anyway?</p>""")
+                .format(self.__title, expectedChecksum,
+                        calculatedChecksum))
             return res
     
     def saveRules(self):
@@ -477,8 +477,8 @@
                 None,
                 self.trUtf8("Saving subscription rules"),
                 self.trUtf8(
-                    """Unable to open adblock file '{0}' for writing.""")\
-                    .format(fileName))
+                    """Unable to open adblock file '{0}' for writing.""")
+                .format(fileName))
             return
         
         textStream = QTextStream(f)
--- a/Helpviewer/Bookmarks/BookmarkPropertiesDialog.py	Fri Nov 01 15:48:48 2013 +0100
+++ b/Helpviewer/Bookmarks/BookmarkPropertiesDialog.py	Sun Nov 03 15:58:22 2013 +0100
@@ -44,7 +44,7 @@
         """
         from .BookmarkNode import BookmarkNode
         
-        if (self.__node.type() == BookmarkNode.Bookmark and \
+        if (self.__node.type() == BookmarkNode.Bookmark and
             not self.addressEdit.text()) or \
            not self.nameEdit.text():
             super(BookmarkPropertiesDialog, self).accept()
--- a/Helpviewer/Bookmarks/BookmarksManager.py	Fri Nov 01 15:48:48 2013 +0100
+++ b/Helpviewer/Bookmarks/BookmarksManager.py	Sun Nov 03 15:58:22 2013 +0100
@@ -141,23 +141,23 @@
                 self.trUtf8("Loading Bookmarks"),
                 self.trUtf8(
                     """Error when loading bookmarks on line {0},"""
-                    """ column {1}:\n {2}""")\
-                    .format(reader.lineNumber(),
-                            reader.columnNumber(),
-                            reader.errorString()))
+                    """ column {1}:\n {2}""")
+                .format(reader.lineNumber(),
+                        reader.columnNumber(),
+                        reader.errorString()))
         
         others = []
         for index in range(
                 len(self.__bookmarkRootNode.children()) - 1, -1, -1):
             node = self.__bookmarkRootNode.children()[index]
             if node.type() == BookmarkNode.Folder:
-                if (node.title == self.trUtf8("Toolbar Bookmarks") or \
+                if (node.title == self.trUtf8("Toolbar Bookmarks") or
                     node.title == BOOKMARKBAR) and \
                    self.__toolbar is None:
                     node.title = self.trUtf8(BOOKMARKBAR)
                     self.__toolbar = node
                 
-                if (node.title == self.trUtf8("Menu") or \
+                if (node.title == self.trUtf8("Menu") or
                     node.title == BOOKMARKMENU) and \
                    self.__menu is None:
                     node.title = self.trUtf8(BOOKMARKMENU)
@@ -206,8 +206,8 @@
             E5MessageBox.warning(
                 None,
                 self.trUtf8("Saving Bookmarks"),
-                self.trUtf8("""Error saving bookmarks to <b>{0}</b>.""")\
-                    .format(bookmarkFile))
+                self.trUtf8("""Error saving bookmarks to <b>{0}</b>.""")
+                .format(bookmarkFile))
         
         # restore localized titles
         self.__menu.title = self.trUtf8(BOOKMARKMENU)
@@ -392,8 +392,8 @@
             E5MessageBox.critical(
                 None,
                 self.trUtf8("Exporting Bookmarks"),
-                self.trUtf8("""Error exporting bookmarks to <b>{0}</b>.""")\
-                    .format(fileName))
+                self.trUtf8("""Error exporting bookmarks to <b>{0}</b>.""")
+                .format(fileName))
     
     def __convertFromOldBookmarks(self):
         """
--- a/Helpviewer/Bookmarks/BookmarksMenu.py	Fri Nov 01 15:48:48 2013 +0100
+++ b/Helpviewer/Bookmarks/BookmarksMenu.py	Sun Nov 03 15:58:22 2013 +0100
@@ -236,8 +236,8 @@
         self.__bookmarksManager = Helpviewer.HelpWindow.HelpWindow\
             .bookmarksManager()
         self.setModel(self.__bookmarksManager.bookmarksModel())
-        self.setRootIndex(self.__bookmarksManager.bookmarksModel()\
-                            .nodeIndex(self.__bookmarksManager.menu()))
+        self.setRootIndex(self.__bookmarksManager.bookmarksModel()
+                          .nodeIndex(self.__bookmarksManager.menu()))
         
         # initial actions
         for act in self.__initialActions:
@@ -249,7 +249,7 @@
             self.addSeparator()
         
         self.createMenu(
-            self.__bookmarksManager.bookmarksModel()\
+            self.__bookmarksManager.bookmarksModel()
                 .nodeIndex(self.__bookmarksManager.toolbar()),
             1, self)
         return True
--- a/Helpviewer/Bookmarks/BookmarksModel.py	Fri Nov 01 15:48:48 2013 +0100
+++ b/Helpviewer/Bookmarks/BookmarksModel.py	Sun Nov 03 15:58:22 2013 +0100
@@ -194,7 +194,7 @@
                     return UI.PixmapCache.getIcon("dirOpen.png")
                 import Helpviewer.HelpWindow
                 return Helpviewer.HelpWindow.HelpWindow.icon(
-                        QUrl(bookmarkNode.url))
+                    QUrl(bookmarkNode.url))
         
         return None
     
--- a/Helpviewer/ClosedTabsManager.py	Fri Nov 01 15:48:48 2013 +0100
+++ b/Helpviewer/ClosedTabsManager.py	Sun Nov 03 15:58:22 2013 +0100
@@ -37,8 +37,8 @@
         @return flag indicating equality of the tabs (boolean)
         """
         return self.url == other.url and \
-               self.title == other.title and \
-               self.position == other.position
+            self.title == other.title and \
+            self.position == other.position
 
 
 class ClosedTabsManager(QObject):
--- a/Helpviewer/CookieJar/CookieExceptionsModel.py	Fri Nov 01 15:48:48 2013 +0100
+++ b/Helpviewer/CookieJar/CookieExceptionsModel.py	Sun Nov 03 15:58:22 2013 +0100
@@ -126,8 +126,8 @@
             return 0
         else:
             return len(self.__allowedCookies) + \
-                   len(self.__blockedCookies) + \
-                   len(self.__sessionCookies)
+                len(self.__blockedCookies) + \
+                len(self.__sessionCookies)
     
     def removeRows(self, row, count, parent=QModelIndex()):
         """
--- a/Helpviewer/CookieJar/CookieJar.py	Fri Nov 01 15:48:48 2013 +0100
+++ b/Helpviewer/CookieJar/CookieJar.py	Sun Nov 03 15:58:22 2013 +0100
@@ -245,11 +245,11 @@
         host = url.host()
         eBlock = self.__isOnDomainList(self.__exceptionsBlock, host)
         eAllow = not eBlock and \
-                 self.__isOnDomainList(self.__exceptionsAllow, host)
+            self.__isOnDomainList(self.__exceptionsAllow, host)
         eAllowSession = not eBlock and \
-                        not eAllow and \
-                        self.__isOnDomainList(
-                            self.__exceptionsAllowForSession, host)
+            not eAllow and \
+            self.__isOnDomainList(
+                self.__exceptionsAllowForSession, host)
         
         addedCookies = False
         acceptInitially = self.__acceptCookies != self.AcceptNever
@@ -260,7 +260,7 @@
             soon = soon.addDays(90)
             for cookie in cookieList:
                 lst = []
-                if not (self.__filterTrackingCookies and \
+                if not (self.__filterTrackingCookies and
                         cookie.name().startsWith("__utm")):
                     if eAllowSession:
                         cookie.setExpirationDate(QDateTime())
--- a/Helpviewer/Download/DownloadItem.py	Fri Nov 01 15:48:48 2013 +0100
+++ b/Helpviewer/Download/DownloadItem.py	Sun Nov 03 15:58:22 2013 +0100
@@ -226,7 +226,7 @@
                 self.__reply.close()
                 self.on_stopButton_clicked()
                 self.filenameLabel.setText(
-                    self.trUtf8("Download canceled: {0}")\
+                    self.trUtf8("Download canceled: {0}")
                         .format(QFileInfo(defaultFileName).fileName()))
                 self.__canceledFileSelect = True
                 return
@@ -246,7 +246,7 @@
                 self.progressBar.setVisible(False)
                 self.on_stopButton_clicked()
                 self.infoLabel.setText(self.trUtf8(
-                    "Download directory ({0}) couldn't be created.")\
+                    "Download directory ({0}) couldn't be created.")
                     .format(saveDirPath.absolutePath()))
                 return
         
@@ -422,7 +422,7 @@
                 self.__getFileName()
             if not self.__output.open(QIODevice.WriteOnly):
                 self.infoLabel.setText(
-                    self.trUtf8("Error opening save file: {0}")\
+                    self.trUtf8("Error opening save file: {0}")
                     .format(self.__output.errorString()))
                 self.on_stopButton_clicked()
                 self.statusChanged.emit()
@@ -434,7 +434,7 @@
         self.__md5Hash.addData(buffer)
         bytesWritten = self.__output.write(buffer)
         if bytesWritten == -1:
-            self.infoLabel.setText(self.trUtf8("Error saving: {0}")\
+            self.infoLabel.setText(self.trUtf8("Error saving: {0}")
                 .format(self.__output.errorString()))
             self.on_stopButton_clicked()
         else:
@@ -446,7 +446,7 @@
         """
         Private slot to handle a network error.
         """
-        self.infoLabel.setText(self.trUtf8("Network Error: {0}")\
+        self.infoLabel.setText(self.trUtf8("Network Error: {0}")
             .format(self.__reply.errorString()))
         self.tryAgainButton.setEnabled(True)
         self.tryAgainButton.setVisible(True)
@@ -517,7 +517,7 @@
         if self.bytesTotal() == -1:
             return -1.0
         
-        timeRemaining = (self.bytesTotal() - 
+        timeRemaining = (self.bytesTotal() -
                          self.bytesReceived()) / self.currentSpeed()
         
         # ETA should never be 0
@@ -560,8 +560,8 @@
             info = self.trUtf8("{0} of {1} ({2}/sec)\n{3}")\
                 .format(
                     dataString(self.__bytesReceived),
-                    bytesTotal == -1 and self.trUtf8("?") \
-                                     or dataString(bytesTotal),
+                    bytesTotal == -1 and self.trUtf8("?")
+                    or dataString(bytesTotal),
                     dataString(int(speed)),
                     remaining)
         else:
@@ -572,7 +572,7 @@
                                 encoding="ascii"),
                             str(self.__md5Hash.result().toHex(),
                                 encoding="ascii")
-                    )
+                            )
             else:
                 info = self.trUtf8("{0} of {1} - Stopped")\
                     .format(dataString(self.__bytesReceived),
--- a/Helpviewer/Download/DownloadManager.py	Fri Nov 01 15:48:48 2013 +0100
+++ b/Helpviewer/Download/DownloadManager.py	Sun Nov 03 15:58:22 2013 +0100
@@ -108,9 +108,9 @@
             menu.addSeparator()
         menu.addAction(self.trUtf8("Select All"), self.__contextMenuSelectAll)
         if selectedRowsCount > 1 or \
-           (selectedRowsCount == 1 and \
+           (selectedRowsCount == 1 and
             not self.__downloads[
-                self.downloadsView.selectionModel().selectedRows()[0].row()]\
+                self.downloadsView.selectionModel().selectedRows()[0].row()]
                 .downloading()):
             menu.addSeparator()
             menu.addAction(
--- a/Helpviewer/Feeds/FeedsManager.py	Fri Nov 01 15:48:48 2013 +0100
+++ b/Helpviewer/Feeds/FeedsManager.py	Sun Nov 03 15:58:22 2013 +0100
@@ -366,7 +366,7 @@
             return
         
         self.__openMessage(
-            QApplication.keyboardModifiers() & 
+            QApplication.keyboardModifiers() &
             Qt.ControlModifier == Qt.ControlModifier)
         
     def __openMessageInCurrentTab(self):
--- a/Helpviewer/GreaseMonkey/GreaseMonkeyAddScriptDialog.py	Fri Nov 01 15:48:48 2013 +0100
+++ b/Helpviewer/GreaseMonkey/GreaseMonkeyAddScriptDialog.py	Sun Nov 03 15:58:22 2013 +0100
@@ -57,7 +57,7 @@
         if exclude:
             doesNotRunAt = self.trUtf8(
                 "<p>does not run at:<br/><i>{0}</i></p>").format(
-                    "<br/>".join(exclude))
+                "<br/>".join(exclude))
         
         scriptInfoTxt = "<p><b>{0}</b> {1}<br/>{2}</p>{3}{4}".format(
             script.name(), script.version(), script.description(), runsAt,
--- a/Helpviewer/GreaseMonkey/GreaseMonkeyConfiguration/GreaseMonkeyConfigurationDialog.py	Fri Nov 01 15:48:48 2013 +0100
+++ b/Helpviewer/GreaseMonkey/GreaseMonkeyConfiguration/GreaseMonkeyConfigurationDialog.py	Sun Nov 03 15:58:22 2013 +0100
@@ -21,7 +21,7 @@
 
 
 class GreaseMonkeyConfigurationDialog(
-    QDialog, Ui_GreaseMonkeyConfigurationDialog):
+        QDialog, Ui_GreaseMonkeyConfigurationDialog):
     """
     Class implementing the GreaseMonkey scripts configuration dialog.
     """
@@ -150,7 +150,7 @@
             self.trUtf8("Remove Script"),
             self.trUtf8(
                 """<p>Are you sure you want to remove <b>{0}</b>?</p>""")
-                .format(script.name()))
+            .format(script.name()))
         if removeIt and self.__manager.removeScript(script):
             self.scriptsList.takeItem(self.scriptsList.row(itm))
             del itm
--- a/Helpviewer/GreaseMonkey/GreaseMonkeyConfiguration/GreaseMonkeyConfigurationListDelegate.py	Fri Nov 01 15:48:48 2013 +0100
+++ b/Helpviewer/GreaseMonkey/GreaseMonkeyConfiguration/GreaseMonkeyConfigurationListDelegate.py	Sun Nov 03 15:58:22 2013 +0100
@@ -81,7 +81,7 @@
         
         leftPos = self.__padding
         rightPos = opt.rect.right() - self.__padding - \
-                   GreaseMonkeyConfigurationListDelegate.RemoveIconSize
+            GreaseMonkeyConfigurationListDelegate.RemoveIconSize
         
         # Draw background
         style.drawPrimitive(QStyle.PE_PanelItemViewItem, opt, painter, widget)
@@ -182,9 +182,9 @@
             titleMetrics = QFontMetrics(titleFont)
             
             self.__rowHeight = 2 * self.__padding + \
-                                opt.fontMetrics.leading() + \
-                                opt.fontMetrics.height() + \
-                                titleMetrics.height()
+                opt.fontMetrics.leading() + \
+                opt.fontMetrics.height() + \
+                titleMetrics.height()
         
         return QSize(GreaseMonkeyConfigurationListDelegate.ItemWidth,
                      self.__rowHeight)
--- a/Helpviewer/GreaseMonkey/GreaseMonkeyConfiguration/GreaseMonkeyConfigurationScriptInfoDialog.py	Fri Nov 01 15:48:48 2013 +0100
+++ b/Helpviewer/GreaseMonkey/GreaseMonkeyConfiguration/GreaseMonkeyConfigurationScriptInfoDialog.py	Sun Nov 03 15:58:22 2013 +0100
@@ -21,7 +21,7 @@
 
 
 class GreaseMonkeyConfigurationScriptInfoDialog(
-    QDialog, Ui_GreaseMonkeyConfigurationScriptInfoDialog):
+        QDialog, Ui_GreaseMonkeyConfigurationScriptInfoDialog):
     """
     Class implementing a dialog to show GreaseMonkey script information.
     """
--- a/Helpviewer/GreaseMonkey/GreaseMonkeyDownloader.py	Fri Nov 01 15:48:48 2013 +0100
+++ b/Helpviewer/GreaseMonkey/GreaseMonkeyDownloader.py	Sun Nov 03 15:58:22 2013 +0100
@@ -74,7 +74,7 @@
                     self.trUtf8(
                         """<p>The file <b>{0}</b> could not be opened"""
                         """ for writing.<br/>Reason: {1}</p>""").format(
-                            self.__fileName, str(err)))
+                        self.__fileName, str(err)))
                 self.finished.emit()
                 return
             f.write(response)
@@ -125,7 +125,7 @@
                     self.trUtf8(
                         """<p>The file <b>{0}</b> could not be opened"""
                         """ for writing.<br/>Reason: {1}</p>""").format(
-                            fileName, str(err)))
+                        fileName, str(err)))
                 self.finished.emit()
                 return
             f.write(response)
@@ -169,7 +169,7 @@
                         self.trUtf8("GreaseMonkey Download"),
                         self.trUtf8(
                             """<p><b>{0}</b> is already installed.</p>""")
-                            .format(script.name()))
+                        .format(script.name()))
             
             if deleteScript:
                 try:
--- a/Helpviewer/GreaseMonkey/GreaseMonkeyManager.py	Fri Nov 01 15:48:48 2013 +0100
+++ b/Helpviewer/GreaseMonkey/GreaseMonkeyManager.py	Sun Nov 03 15:58:22 2013 +0100
@@ -252,7 +252,7 @@
             if script.match(urlString):
                 javascript = 'window.addEventListener("DOMContentLoaded",' \
                     'function(e) {{ {0} }}, false);'.format(
-                    bootstrap_js + script.script())
+                        bootstrap_js + script.script())
                 frame.evaluateJavaScript(javascript)
     
     def __load(self):
--- a/Helpviewer/HelpBrowserWV.py	Fri Nov 01 15:48:48 2013 +0100
+++ b/Helpviewer/HelpBrowserWV.py	Sun Nov 03 15:58:22 2013 +0100
@@ -145,7 +145,7 @@
         @return search URL (string)
         """
         return bytes(
-            self.__mw.openSearchManager().currentEngine()\
+            self.__mw.openSearchManager().currentEngine()
             .searchUrl(searchStr).toEncoded()).decode()
 
 ###############################################################################
@@ -256,7 +256,7 @@
         """
         try:
             if extension in [QWebPage.ErrorPageExtension,
-                              QWebPage.ChooseMultipleFilesExtension]:
+                             QWebPage.ChooseMultipleFilesExtension]:
                 return True
         except AttributeError:
             pass
@@ -342,13 +342,13 @@
             htmlFile.open(QFile.ReadOnly)
             html = htmlFile.readAll()
             pixmap = qApp.style()\
-                     .standardIcon(QStyle.SP_MessageBoxWarning).pixmap(48, 48)
+                .standardIcon(QStyle.SP_MessageBoxWarning).pixmap(48, 48)
             imageBuffer = QBuffer()
             imageBuffer.open(QIODevice.ReadWrite)
             if pixmap.save(imageBuffer, "PNG"):
                 html = html.replace("@IMAGE@", imageBuffer.buffer().toBase64())
             pixmap = qApp.style()\
-                     .standardIcon(QStyle.SP_MessageBoxWarning).pixmap(16, 16)
+                .standardIcon(QStyle.SP_MessageBoxWarning).pixmap(16, 16)
             imageBuffer = QBuffer()
             imageBuffer.open(QIODevice.ReadWrite)
             if pixmap.save(imageBuffer, "PNG"):
@@ -357,7 +357,7 @@
             html = html.replace("@TITLE@", title.encode("utf8"))
             html = html.replace("@H1@", info.errorString.encode("utf8"))
             html = html.replace(
-                "@H2@", self.trUtf8("When connecting to: {0}.")\
+                "@H2@", self.trUtf8("When connecting to: {0}.")
                 .format(urlString).encode("utf8"))
             html = html.replace(
                 "@LI-1@",
@@ -378,7 +378,7 @@
             html = html.replace(
                 "@LI-4@",
                 self.trUtf8("If your cache policy is set to offline browsing,"
-                            "only pages in the local cache are available.")\
+                            "only pages in the local cache are available.")
                 .encode("utf8"))
             html = html.replace(
                 "@BUTTON@", self.trUtf8("Try Again").encode("utf8"))
@@ -564,7 +564,7 @@
             return False
         
         certificateDict = Preferences.toDict(
-                Preferences.Prefs.settings.value("Ssl/CaCertificatesDict"))
+            Preferences.Prefs.settings.value("Ssl/CaCertificatesDict"))
         for server in certificateDict:
             localCAList = QSslCertificate.fromData(certificateDict[server])
             for cert in certList:
@@ -829,8 +829,8 @@
                     self,
                     self.trUtf8("eric5 Web Browser"),
                     self.trUtf8(
-                        """<p>The file <b>{0}</b> does not exist.</p>""")\
-                        .format(name.toLocalFile()))
+                        """<p>The file <b>{0}</b> does not exist.</p>""")
+                    .format(name.toLocalFile()))
                 return
 
             if name.toLocalFile().endswith(".pdf") or \
@@ -1199,7 +1199,7 @@
                                     act.setVisible(False)
                                 directionFound = True
                             elif self.pageAction(QWebPage.ToggleBold) in \
-                                 act.menu().actions():
+                                    act.menu().actions():
                                 act.setVisible(False)
                         elif act == self.pageAction(QWebPage.InspectElement):
                             # we have our own inspect entry
@@ -1353,9 +1353,9 @@
         @return flag indicating a valid URL (boolean)
         """
         return url.isValid() and \
-               bool(url.host()) and \
-               bool(url.scheme()) and \
-               "." in url.host()
+            bool(url.host()) and \
+            bool(url.scheme()) and \
+            "." in url.host()
     
     def __openLinkInNewTab(self):
         """
@@ -1729,7 +1729,7 @@
         
         if self.__enableAccessKeys:
             self.__accessKeysPressed = (
-                evt.modifiers() == Qt.ControlModifier and \
+                evt.modifiers() == Qt.ControlModifier and
                 evt.key() == Qt.Key_Control)
             if not self.__accessKeysPressed:
                 if self.__checkForAccessKey(evt):
@@ -1944,13 +1944,13 @@
         htmlFile.open(QFile.ReadOnly)
         html = htmlFile.readAll()
         pixmap = qApp.style()\
-                 .standardIcon(QStyle.SP_MessageBoxWarning).pixmap(48, 48)
+            .standardIcon(QStyle.SP_MessageBoxWarning).pixmap(48, 48)
         imageBuffer = QBuffer()
         imageBuffer.open(QIODevice.ReadWrite)
         if pixmap.save(imageBuffer, "PNG"):
             html = html.replace("@IMAGE@", imageBuffer.buffer().toBase64())
         pixmap = qApp.style()\
-                 .standardIcon(QStyle.SP_MessageBoxWarning).pixmap(16, 16)
+            .standardIcon(QStyle.SP_MessageBoxWarning).pixmap(16, 16)
         imageBuffer = QBuffer()
         imageBuffer.open(QIODevice.ReadWrite)
         if pixmap.save(imageBuffer, "PNG"):
@@ -1958,8 +1958,8 @@
         html = html.replace("@TITLE@", title.encode("utf8"))
         html = html.replace("@H1@", reply.errorString().encode("utf8"))
         html = html.replace(
-            "@H2@", self.trUtf8("When connecting to: {0}.")\
-                .format(urlString).encode("utf8"))
+            "@H2@", self.trUtf8("When connecting to: {0}.")
+            .format(urlString).encode("utf8"))
         html = html.replace(
             "@LI-1@",
             self.trUtf8("Check the address for errors such as "
@@ -1978,7 +1978,7 @@
         html = html.replace(
             "@LI-4@",
             self.trUtf8("If your cache policy is set to offline browsing,"
-                        "only pages in the local cache are available.")\
+                        "only pages in the local cache are available.")
             .encode("utf8"))
         html = html.replace(
             "@BUTTON@", self.trUtf8("Try Again").encode("utf8"))
@@ -2014,9 +2014,9 @@
             self.trUtf8(
                 """<p>The database quota of <strong>{0}</strong> has"""
                 """ been exceeded while accessing database <strong>{1}"""
-                """</strong>.</p><p>Shall it be changed?</p>""")\
-                .format(self.__dataString(securityOrigin.databaseQuota()),
-                        databaseName),
+                """</strong>.</p><p>Shall it be changed?</p>""")
+            .format(self.__dataString(securityOrigin.databaseQuota()),
+                    databaseName),
             yesDefault=True)
         if res:
             newQuota, ok = QInputDialog.getInt(
@@ -2024,7 +2024,7 @@
                 self.trUtf8("New Web Database Quota"),
                 self.trUtf8(
                     "Enter the new quota in MB (current = {0}, used = {1}; "
-                    "step size = 5 MB):"\
+                    "step size = 5 MB):"
                     .format(
                         self.__dataString(securityOrigin.databaseQuota()),
                         self.__dataString(securityOrigin.databaseUsage()))),
@@ -2256,8 +2256,8 @@
         for linkElement in linkElementsList:
             # only atom+xml and rss+xml will be processed
             if linkElement.attribute("rel") != "alternate" or \
-               (linkElement.attribute("type") != "application/rss+xml" and \
-                linkElement.attribute("type") != "application/atom+xml"):
+               (linkElement.attribute("type") != "application/rss+xml" and
+                    linkElement.attribute("type") != "application/atom+xml"):
                 continue
             
             title = linkElement.attribute("title")
@@ -2314,7 +2314,9 @@
             Preferences.getPrinter("BottomMargin") * 10,
             QPrinter.Millimeter
         )
-        printer.setPrinterName(Preferences.getPrinter("PrinterName"))
+        printerName = Preferences.getPrinter("PrinterName")
+        if printerName:
+            self.setPrinterName(printerName)
         
         printDialog = QPrintDialog(printer, self)
         if printDialog.exec_() == QDialog.Accepted:
@@ -2350,7 +2352,9 @@
             Preferences.getPrinter("BottomMargin") * 10,
             QPrinter.Millimeter
         )
-        printer.setPrinterName(Preferences.getPrinter("PrinterName"))
+        printerName = Preferences.getPrinter("PrinterName")
+        if printerName:
+            self.setPrinterName(printerName)
         
         preview = QPrintPreviewDialog(printer, self)
         preview.paintRequested.connect(self.__generatePrintPreviewClickedFrame)
@@ -2382,7 +2386,9 @@
             printer.setColorMode(QPrinter.Color)
         else:
             printer.setColorMode(QPrinter.GrayScale)
-        printer.setPrinterName(Preferences.getPrinter("PrinterName"))
+        printerName = Preferences.getPrinter("PrinterName")
+        if printerName:
+            self.setPrinterName(printerName)
         printer.setOutputFormat(QPrinter.PdfFormat)
         name = self.__clickedFrame.url().path().rsplit('/', 1)[-1]
         if name:
--- a/Helpviewer/HelpDocsInstaller.py	Fri Nov 01 15:48:48 2013 +0100
+++ b/Helpviewer/HelpDocsInstaller.py	Sun Nov 03 15:58:22 2013 +0100
@@ -113,7 +113,7 @@
         
         if version == 4:
             docsPath = QDir(
-                QLibraryInfo.location(QLibraryInfo.DocumentationPath) + \
+                QLibraryInfo.location(QLibraryInfo.DocumentationPath) +
                 QDir.separator() + "qch")
         elif version == 5:
             docsPath = QDir(
@@ -151,14 +151,14 @@
                     self.errorMessage.emit(
                         self.trUtf8(
                             """<p>The file <b>{0}</b> could not be"""
-                            """ registered. <br/>Reason: {1}</p>""")\
-                            .format(fi.absoluteFilePath, engine.error())
+                            """ registered. <br/>Reason: {1}</p>""")
+                        .format(fi.absoluteFilePath, engine.error())
                     )
                     return False
                 
                 engine.setCustomValue(
                     versionKey,
-                    fi.lastModified().toString(Qt.ISODate) + '|' + \
+                    fi.lastModified().toString(Qt.ISODate) + '|' +
                     fi.absoluteFilePath())
                 return True
         
@@ -212,14 +212,14 @@
                     self.errorMessage.emit(
                         self.trUtf8(
                             """<p>The file <b>{0}</b> could not be"""
-                            """ registered. <br/>Reason: {1}</p>""")\
-                            .format(fi.absoluteFilePath, engine.error())
+                            """ registered. <br/>Reason: {1}</p>""")
+                        .format(fi.absoluteFilePath, engine.error())
                     )
                     return False
                 
                 engine.setCustomValue(
                     versionKey,
-                    fi.lastModified().toString(Qt.ISODate) + '|' + \
+                    fi.lastModified().toString(Qt.ISODate) + '|' +
                     fi.absoluteFilePath())
                 return True
         
--- a/Helpviewer/HelpIndexWidget.py	Fri Nov 01 15:48:48 2013 +0100
+++ b/Helpviewer/HelpIndexWidget.py	Sun Nov 03 15:58:22 2013 +0100
@@ -43,11 +43,11 @@
         self.__index = None
         
         self.__layout = QVBoxLayout(self)
-        l = QLabel(self.trUtf8("&Look for:"))
-        self.__layout.addWidget(l)
+        label = QLabel(self.trUtf8("&Look for:"))
+        self.__layout.addWidget(label)
         
         self.__searchEdit = QLineEdit()
-        l.setBuddy(self.__searchEdit)
+        label.setBuddy(self.__searchEdit)
         self.__searchEdit.textChanged.connect(self.__filterIndices)
         self.__searchEdit.installEventFilter(self)
         self.__layout.addWidget(self.__searchEdit)
@@ -138,7 +138,7 @@
             elif event.key() == Qt.Key_Escape:
                 self.escapePressed.emit()
         elif self.__index and watched == self.__index and \
-             event.type() == QEvent.ContextMenu:
+                event.type() == QEvent.ContextMenu:
             idx = self.__index.indexAt(event.pos())
             if idx.isValid():
                 menu = QMenu()
@@ -162,7 +162,7 @@
                             if dlg.exec_() == QDialog.Accepted:
                                 self.__mw.newTab(dlg.link())
         elif self.__index and watched == self.__index.viewport() and \
-             event.type() == QEvent.MouseButtonRelease:
+                event.type() == QEvent.MouseButtonRelease:
             idx = self.__index.indexAt(event.pos())
             if idx.isValid() and event.button() == Qt.MidButton:
                 model = self.__index.model()
--- a/Helpviewer/HelpLanguagesDialog.py	Fri Nov 01 15:48:48 2013 +0100
+++ b/Helpviewer/HelpLanguagesDialog.py	Sun Nov 03 15:58:22 2013 +0100
@@ -159,7 +159,7 @@
             return cls.expand(QLocale(language).language())
     
     @classmethod
-    def expand(self, language):
+    def expand(cls, language):
         """
         Class method to expand a language enum to a readable languages list.
         
--- a/Helpviewer/HelpTabBar.py	Fri Nov 01 15:48:48 2013 +0100
+++ b/Helpviewer/HelpTabBar.py	Sun Nov 03 15:58:22 2013 +0100
@@ -61,10 +61,10 @@
         self.__previewPopup.setFixedSize(w, h)
         
         from .HelpSnap import renderTabPreview
-        l = QLabel()
-        l.setPixmap(renderTabPreview(indexedBrowser.page(), w, h))
+        label = QLabel()
+        label.setPixmap(renderTabPreview(indexedBrowser.page(), w, h))
         
-        self.__previewPopup.setView(l)
+        self.__previewPopup.setView(label)
         self.__previewPopup.layout().setAlignment(Qt.AlignTop)
         self.__previewPopup.layout().setContentsMargins(0, 0, 0, 0)
         
--- a/Helpviewer/HelpTabWidget.py	Fri Nov 01 15:48:48 2013 +0100
+++ b/Helpviewer/HelpTabWidget.py	Sun Nov 03 15:58:22 2013 +0100
@@ -263,7 +263,7 @@
         """
         index = self.__tabContextMenuIndex
         for i in list(range(self.count() - 1, index, -1)) + \
-                 list(range(index - 1, -1, -1)):
+                list(range(index - 1, -1, -1)):
             self.closeBrowserAt(i)
     
     def __tabContextMenuPrint(self):
@@ -477,10 +477,10 @@
         
         @return list of references to browsers (list of HelpBrowser)
         """
-        l = []
+        li = []
         for index in range(self.count()):
-            l.append(self.widget(index))
-        return l
+            li.append(self.widget(index))
+        return li
     
     def printBrowser(self, browser=None):
         """
@@ -515,7 +515,9 @@
             Preferences.getPrinter("BottomMargin") * 10,
             QPrinter.Millimeter
         )
-        printer.setPrinterName(Preferences.getPrinter("PrinterName"))
+        printerName = Preferences.getPrinter("PrinterName")
+        if printerName:
+            self.setPrinterName(printerName)
         
         printDialog = QPrintDialog(printer, self)
         if printDialog.exec_() == QDialog.Accepted:
@@ -552,7 +554,9 @@
             printer.setColorMode(QPrinter.Color)
         else:
             printer.setColorMode(QPrinter.GrayScale)
-        printer.setPrinterName(Preferences.getPrinter("PrinterName"))
+        printerName = Preferences.getPrinter("PrinterName")
+        if printerName:
+            self.setPrinterName(printerName)
         printer.setOutputFormat(QPrinter.PdfFormat)
         name = frame.url().path().rsplit('/', 1)[-1]
         if name:
@@ -600,7 +604,9 @@
             Preferences.getPrinter("BottomMargin") * 10,
             QPrinter.Millimeter
         )
-        printer.setPrinterName(Preferences.getPrinter("PrinterName"))
+        printerName = Preferences.getPrinter("PrinterName")
+        if printerName:
+            self.setPrinterName(printerName)
         
         self.__printPreviewBrowser = browser
         preview = QPrintPreviewDialog(printer, self)
--- a/Helpviewer/HelpTocWidget.py	Fri Nov 01 15:48:48 2013 +0100
+++ b/Helpviewer/HelpTocWidget.py	Sun Nov 03 15:58:22 2013 +0100
@@ -103,7 +103,7 @@
                event.button() == Qt.LeftButton:
                 self.itemClicked(self.__tocWidget.currentIndex())
             elif self.__tocWidget.indexAt(event.pos()).isValid() and \
-                 event.button() == Qt.MidButton:
+                    event.button() == Qt.MidButton:
                 model = self.__tocWidget.model()
                 itm = model.contentItemAt(self.__tocWidget.currentIndex())
                 self.__mw.newTab(itm.url())
--- a/Helpviewer/HelpTopicDialog.py	Fri Nov 01 15:48:48 2013 +0100
+++ b/Helpviewer/HelpTopicDialog.py	Sun Nov 03 15:58:22 2013 +0100
@@ -31,7 +31,7 @@
         super(HelpTopicDialog, self).__init__(parent)
         self.setupUi(self)
         
-        self.label.setText(self.trUtf8("Choose a &topic for <b>{0}</b>:")\
+        self.label.setText(self.trUtf8("Choose a &topic for <b>{0}</b>:")
             .format(keyword))
         
         self.__links = links
--- a/Helpviewer/HelpWebSearchWidget.py	Fri Nov 01 15:48:48 2013 +0100
+++ b/Helpviewer/HelpWebSearchWidget.py	Sun Nov 03 15:58:22 2013 +0100
@@ -115,8 +115,8 @@
         Private method to create the completer menu.
         """
         if not self.__suggestions or \
-           (self.__model.rowCount() > 0 and \
-            self.__model.item(0) != self.__suggestionsItem):
+           (self.__model.rowCount() > 0 and
+                self.__model.item(0) != self.__suggestionsItem):
             self.__model.clear()
             self.__suggestionsItem = None
         else:
@@ -373,7 +373,7 @@
         self.setInactiveText(self.__openSearchManager.currentEngineName())
         self.__currentEngine = self.__openSearchManager.currentEngineName()
         self.__engineButton.setIcon(QIcon(QPixmap.fromImage(
-                self.__openSearchManager.currentEngine().image())))
+            self.__openSearchManager.currentEngine().image())))
         self.__suggestions = []
         self.__setupCompleterMenu()
     
@@ -382,7 +382,7 @@
         Private slot to handle a change of the current search engine icon.
         """
         self.__engineButton.setIcon(QIcon(QPixmap.fromImage(
-                self.__openSearchManager.currentEngine().image())))
+            self.__openSearchManager.currentEngine().image())))
     
     def mousePressEvent(self, evt):
         """
--- a/Helpviewer/HelpWindow.py	Fri Nov 01 15:48:48 2013 +0100
+++ b/Helpviewer/HelpWindow.py	Sun Nov 03 15:58:22 2013 +0100
@@ -357,7 +357,7 @@
                 os.makedirs(webDatabaseDir)
             settings.setOfflineStoragePath(webDatabaseDir)
             settings.setOfflineStorageDefaultQuota(
-                Preferences.getHelp("OfflineStorageDatabaseQuota") * \
+                Preferences.getHelp("OfflineStorageDatabaseQuota") *
                 1024 * 1024)
         
         if hasattr(QWebSettings, "OfflineWebApplicationCacheEnabled"):
@@ -370,7 +370,7 @@
                 os.makedirs(appCacheDir)
             settings.setOfflineWebApplicationCachePath(appCacheDir)
             settings.setOfflineWebApplicationCacheQuota(
-                Preferences.getHelp("OfflineWebApplicationCacheQuota") * \
+                Preferences.getHelp("OfflineWebApplicationCacheQuota") *
                 1024 * 1024)
         
         if hasattr(QWebSettings, "LocalStorageEnabled"):
@@ -434,8 +434,8 @@
             0, self, 'help_file_new_tab')
         self.newTabAct.setStatusTip(self.trUtf8('Open a new help window tab'))
         self.newTabAct.setWhatsThis(self.trUtf8(
-                """<b>New Tab</b>"""
-                """<p>This opens a new help window tab.</p>"""
+            """<b>New Tab</b>"""
+            """<p>This opens a new help window tab.</p>"""
         ))
         if not self.initShortcutsOnly:
             self.newTabAct.triggered[()].connect(self.newTab)
@@ -449,8 +449,8 @@
             0, self, 'help_file_new_window')
         self.newAct.setStatusTip(self.trUtf8('Open a new help browser window'))
         self.newAct.setWhatsThis(self.trUtf8(
-                """<b>New Window</b>"""
-                """<p>This opens a new help browser window.</p>"""
+            """<b>New Window</b>"""
+            """<p>This opens a new help browser window.</p>"""
         ))
         if not self.initShortcutsOnly:
             self.newAct.triggered[()].connect(self.newWindow)
@@ -464,9 +464,9 @@
             0, self, 'help_file_open')
         self.openAct.setStatusTip(self.trUtf8('Open a help file for display'))
         self.openAct.setWhatsThis(self.trUtf8(
-                """<b>Open File</b>"""
-                """<p>This opens a new help file for display."""
-                """ It pops up a file selection dialog.</p>"""
+            """<b>Open File</b>"""
+            """<p>This opens a new help file for display."""
+            """ It pops up a file selection dialog.</p>"""
         ))
         if not self.initShortcutsOnly:
             self.openAct.triggered[()].connect(self.__openFile)
@@ -481,9 +481,9 @@
         self.openTabAct.setStatusTip(
             self.trUtf8('Open a help file for display in a new tab'))
         self.openTabAct.setWhatsThis(self.trUtf8(
-                """<b>Open File in New Tab</b>"""
-                """<p>This opens a new help file for display in a new tab."""
-                """ It pops up a file selection dialog.</p>"""
+            """<b>Open File in New Tab</b>"""
+            """<p>This opens a new help file for display in a new tab."""
+            """ It pops up a file selection dialog.</p>"""
         ))
         if not self.initShortcutsOnly:
             self.openTabAct.triggered[()].connect(self.__openFileNewTab)
@@ -498,8 +498,8 @@
         self.saveAsAct.setStatusTip(
             self.trUtf8('Save the current page to disk'))
         self.saveAsAct.setWhatsThis(self.trUtf8(
-                """<b>Save As...</b>"""
-                """<p>Saves the current page to disk.</p>"""
+            """<b>Save As...</b>"""
+            """<p>Saves the current page to disk.</p>"""
         ))
         if not self.initShortcutsOnly:
             self.saveAsAct.triggered[()].connect(self.__savePageAs)
@@ -513,8 +513,8 @@
         self.savePageScreenAct.setStatusTip(
             self.trUtf8('Save the current page as a screen shot'))
         self.savePageScreenAct.setWhatsThis(self.trUtf8(
-                """<b>Save Page Screen...</b>"""
-                """<p>Saves the current page as a screen shot.</p>"""
+            """<b>Save Page Screen...</b>"""
+            """<p>Saves the current page as a screen shot.</p>"""
         ))
         if not self.initShortcutsOnly:
             self.savePageScreenAct.triggered[()].connect(self.__savePageScreen)
@@ -546,8 +546,8 @@
         self.importBookmarksAct.setStatusTip(
             self.trUtf8('Import bookmarks from other browsers'))
         self.importBookmarksAct.setWhatsThis(self.trUtf8(
-                """<b>Import Bookmarks</b>"""
-                """<p>Import bookmarks from other browsers.</p>"""
+            """<b>Import Bookmarks</b>"""
+            """<p>Import bookmarks from other browsers.</p>"""
         ))
         if not self.initShortcutsOnly:
             self.importBookmarksAct.triggered[()].connect(
@@ -561,8 +561,8 @@
         self.exportBookmarksAct.setStatusTip(
             self.trUtf8('Export the bookmarks into a file'))
         self.exportBookmarksAct.setWhatsThis(self.trUtf8(
-                """<b>Export Bookmarks</b>"""
-                """<p>Export the bookmarks into a file.</p>"""
+            """<b>Export Bookmarks</b>"""
+            """<p>Export the bookmarks into a file.</p>"""
         ))
         if not self.initShortcutsOnly:
             self.exportBookmarksAct.triggered[()].connect(
@@ -577,8 +577,8 @@
             0, self, 'help_file_print')
         self.printAct.setStatusTip(self.trUtf8('Print the displayed help'))
         self.printAct.setWhatsThis(self.trUtf8(
-                """<b>Print</b>"""
-                """<p>Print the displayed help text.</p>"""
+            """<b>Print</b>"""
+            """<p>Print the displayed help text.</p>"""
         ))
         if not self.initShortcutsOnly:
             self.printAct.triggered[()].connect(self.tabWidget.printBrowser)
@@ -606,10 +606,10 @@
             self.trUtf8('Print Preview'),
             0, 0, self, 'help_file_print_preview')
         self.printPreviewAct.setStatusTip(self.trUtf8(
-                'Print preview of the displayed help'))
+            'Print preview of the displayed help'))
         self.printPreviewAct.setWhatsThis(self.trUtf8(
-                """<b>Print Preview</b>"""
-                """<p>Print preview of the displayed help text.</p>"""
+            """<b>Print Preview</b>"""
+            """<p>Print preview of the displayed help text.</p>"""
         ))
         if not self.initShortcutsOnly:
             self.printPreviewAct.triggered[()].connect(
@@ -638,8 +638,8 @@
             0, 0, self, 'help_file_close_all')
         self.closeAllAct.setStatusTip(self.trUtf8('Close all help windows'))
         self.closeAllAct.setWhatsThis(self.trUtf8(
-                """<b>Close All</b>"""
-                """<p>Closes all help windows except the first one.</p>"""
+            """<b>Close All</b>"""
+            """<p>Closes all help windows except the first one.</p>"""
         ))
         if not self.initShortcutsOnly:
             self.closeAllAct.triggered[()].connect(
@@ -653,9 +653,9 @@
             0, 0, self, 'help_file_private_browsing')
         self.privateBrowsingAct.setStatusTip(self.trUtf8('Private Browsing'))
         self.privateBrowsingAct.setWhatsThis(self.trUtf8(
-                """<b>Private Browsing</b>"""
-                """<p>Enables private browsing. In this mode no history is"""
-                """ recorded anymore.</p>"""
+            """<b>Private Browsing</b>"""
+            """<p>Enables private browsing. In this mode no history is"""
+            """ recorded anymore.</p>"""
         ))
         if not self.initShortcutsOnly:
             self.privateBrowsingAct.triggered[()].connect(
@@ -671,8 +671,8 @@
             0, self, 'help_file_quit')
         self.exitAct.setStatusTip(self.trUtf8('Quit the eric5 Web Browser'))
         self.exitAct.setWhatsThis(self.trUtf8(
-                """<b>Quit</b>"""
-                """<p>Quit the eric5 Web Browser.</p>"""
+            """<b>Quit</b>"""
+            """<p>Quit the eric5 Web Browser.</p>"""
         ))
         if not self.initShortcutsOnly:
             if self.fromEric:
@@ -690,9 +690,9 @@
             self, 'help_go_backward')
         self.backAct.setStatusTip(self.trUtf8('Move one help screen backward'))
         self.backAct.setWhatsThis(self.trUtf8(
-                """<b>Backward</b>"""
-                """<p>Moves one help screen backward. If none is"""
-                """ available, this action is disabled.</p>"""
+            """<b>Backward</b>"""
+            """<p>Moves one help screen backward. If none is"""
+            """ available, this action is disabled.</p>"""
         ))
         if not self.initShortcutsOnly:
             self.backAct.triggered[()].connect(self.__backward)
@@ -758,8 +758,8 @@
             self, 'help_go_stop')
         self.stopAct.setStatusTip(self.trUtf8('Stop loading'))
         self.stopAct.setWhatsThis(self.trUtf8(
-                """<b>Stop</b>"""
-                """<p>Stops loading of the current tab.</p>"""
+            """<b>Stop</b>"""
+            """<p>Stops loading of the current tab.</p>"""
         ))
         if not self.initShortcutsOnly:
             self.stopAct.triggered[()].connect(self.__stopLoading)
@@ -773,8 +773,8 @@
             0, self, 'help_edit_copy')
         self.copyAct.setStatusTip(self.trUtf8('Copy the selected text'))
         self.copyAct.setWhatsThis(self.trUtf8(
-                """<b>Copy</b>"""
-                """<p>Copy the selected text to the clipboard.</p>"""
+            """<b>Copy</b>"""
+            """<p>Copy the selected text to the clipboard.</p>"""
         ))
         if not self.initShortcutsOnly:
             self.copyAct.triggered[()].connect(self.__copy)
@@ -788,8 +788,8 @@
             0, self, 'help_edit_find')
         self.findAct.setStatusTip(self.trUtf8('Find text in page'))
         self.findAct.setWhatsThis(self.trUtf8(
-                """<b>Find</b>"""
-                """<p>Find text in the current page.</p>"""
+            """<b>Find</b>"""
+            """<p>Find text in the current page.</p>"""
         ))
         if not self.initShortcutsOnly:
             self.findAct.triggered[()].connect(self.__find)
@@ -834,10 +834,10 @@
             QKeySequence(self.trUtf8("Ctrl+Shift+B", "Help|Manage bookmarks")),
             0, self, 'help_bookmarks_manage')
         self.bookmarksManageAct.setStatusTip(self.trUtf8(
-                'Open a dialog to manage the bookmarks.'))
+            'Open a dialog to manage the bookmarks.'))
         self.bookmarksManageAct.setWhatsThis(self.trUtf8(
-                """<b>Manage Bookmarks...</b>"""
-                """<p>Open a dialog to manage the bookmarks.</p>"""
+            """<b>Manage Bookmarks...</b>"""
+            """<p>Open a dialog to manage the bookmarks.</p>"""
         ))
         if not self.initShortcutsOnly:
             self.bookmarksManageAct.triggered[()].connect(
@@ -866,10 +866,10 @@
             self.trUtf8('Add &Folder...'),
             0, 0, self, 'help_bookmark_show_all')
         self.bookmarksAddFolderAct.setStatusTip(self.trUtf8(
-                'Open a dialog to add a new bookmarks folder.'))
+            'Open a dialog to add a new bookmarks folder.'))
         self.bookmarksAddFolderAct.setWhatsThis(self.trUtf8(
-                """<b>Add Folder...</b>"""
-                """<p>Open a dialog to add a new bookmarks folder.</p>"""
+            """<b>Add Folder...</b>"""
+            """<p>Open a dialog to add a new bookmarks folder.</p>"""
         ))
         if not self.initShortcutsOnly:
             self.bookmarksAddFolderAct.triggered[()].connect(
@@ -881,11 +881,11 @@
             self.trUtf8('Bookmark All Tabs...'),
             0, 0, self, 'help_bookmark_all_tabs')
         self.bookmarksAllTabsAct.setStatusTip(self.trUtf8(
-                'Bookmark all open tabs.'))
+            'Bookmark all open tabs.'))
         self.bookmarksAllTabsAct.setWhatsThis(self.trUtf8(
-                """<b>Bookmark All Tabs...</b>"""
-                """<p>Open a dialog to add a new bookmarks folder for"""
-                """ all open tabs.</p>"""
+            """<b>Bookmark All Tabs...</b>"""
+            """<p>Open a dialog to add a new bookmarks folder for"""
+            """ all open tabs.</p>"""
         ))
         if not self.initShortcutsOnly:
             self.bookmarksAllTabsAct.triggered[()].connect(self.bookmarkAll)
@@ -931,8 +931,8 @@
         self.aboutQtAct.setStatusTip(
             self.trUtf8('Display information about the Qt toolkit'))
         self.aboutQtAct.setWhatsThis(self.trUtf8(
-                """<b>About Qt</b>"""
-                """<p>Display some information about the Qt toolkit.</p>"""
+            """<b>About Qt</b>"""
+            """<p>Display some information about the Qt toolkit.</p>"""
         ))
         if not self.initShortcutsOnly:
             self.aboutQtAct.triggered[()].connect(self.__aboutQt)
@@ -947,8 +947,8 @@
             self, 'help_view_zoom_in')
         self.zoomInAct.setStatusTip(self.trUtf8('Zoom in on the text'))
         self.zoomInAct.setWhatsThis(self.trUtf8(
-                """<b>Zoom in</b>"""
-                """<p>Zoom in on the text. This makes the text bigger.</p>"""
+            """<b>Zoom in</b>"""
+            """<p>Zoom in on the text. This makes the text bigger.</p>"""
         ))
         if not self.initShortcutsOnly:
             self.zoomInAct.triggered[()].connect(self.__zoomIn)
@@ -963,8 +963,8 @@
             self, 'help_view_zoom_out')
         self.zoomOutAct.setStatusTip(self.trUtf8('Zoom out on the text'))
         self.zoomOutAct.setWhatsThis(self.trUtf8(
-                """<b>Zoom out</b>"""
-                """<p>Zoom out on the text. This makes the text smaller.</p>"""
+            """<b>Zoom out</b>"""
+            """<p>Zoom out on the text. This makes the text smaller.</p>"""
         ))
         if not self.initShortcutsOnly:
             self.zoomOutAct.triggered[()].connect(self.__zoomOut)
@@ -994,10 +994,10 @@
                 0, 0, self, 'help_view_zoom_text_only')
             self.zoomTextOnlyAct.setCheckable(True)
             self.zoomTextOnlyAct.setStatusTip(self.trUtf8(
-                    'Zoom text only; pictures remain constant'))
+                'Zoom text only; pictures remain constant'))
             self.zoomTextOnlyAct.setWhatsThis(self.trUtf8(
-                    """<b>Zoom text only</b>"""
-                    """<p>Zoom text only; pictures remain constant.</p>"""
+                """<b>Zoom text only</b>"""
+                """<p>Zoom text only; pictures remain constant.</p>"""
             ))
             if not self.initShortcutsOnly:
                 self.zoomTextOnlyAct.triggered[bool].connect(
@@ -1186,7 +1186,7 @@
                 self.trUtf8('Sync with Table of Contents'),
                 0, 0, self, 'help_sync_toc')
             self.syncTocAct.setStatusTip(self.trUtf8(
-                    'Synchronizes the table of contents with current page'))
+                'Synchronizes the table of contents with current page'))
             self.syncTocAct.setWhatsThis(self.trUtf8(
                 """<b>Sync with Table of Contents</b>"""
                 """<p>Synchronizes the table of contents with current"""
@@ -1201,10 +1201,10 @@
                 self.trUtf8('Table of Contents'),
                 0, 0, self, 'help_show_toc')
             self.showTocAct.setStatusTip(self.trUtf8(
-                    'Shows the table of contents window'))
+                'Shows the table of contents window'))
             self.showTocAct.setWhatsThis(self.trUtf8(
-                    """<b>Table of Contents</b>"""
-                    """<p>Shows the table of contents window.</p>"""
+                """<b>Table of Contents</b>"""
+                """<p>Shows the table of contents window.</p>"""
             ))
             if not self.initShortcutsOnly:
                 self.showTocAct.triggered[()].connect(self.__showTocWindow)
@@ -1215,10 +1215,10 @@
                 self.trUtf8('Index'),
                 0, 0, self, 'help_show_index')
             self.showIndexAct.setStatusTip(self.trUtf8(
-                    'Shows the index window'))
+                'Shows the index window'))
             self.showIndexAct.setWhatsThis(self.trUtf8(
-                    """<b>Index</b>"""
-                    """<p>Shows the index window.</p>"""
+                """<b>Index</b>"""
+                """<p>Shows the index window.</p>"""
             ))
             if not self.initShortcutsOnly:
                 self.showIndexAct.triggered[()].connect(self.__showIndexWindow)
@@ -1229,10 +1229,10 @@
                 self.trUtf8('Search'),
                 0, 0, self, 'help_show_search')
             self.showSearchAct.setStatusTip(self.trUtf8(
-                    'Shows the search window'))
+                'Shows the search window'))
             self.showSearchAct.setWhatsThis(self.trUtf8(
-                    """<b>Search</b>"""
-                    """<p>Shows the search window.</p>"""
+                """<b>Search</b>"""
+                """<p>Shows the search window.</p>"""
             ))
             if not self.initShortcutsOnly:
                 self.showSearchAct.triggered[()].connect(
@@ -1260,10 +1260,10 @@
                 self.trUtf8('Manage QtHelp &Filters'),
                 0, 0, self, 'help_qthelp_filters')
             self.manageQtHelpFiltersAct.setStatusTip(self.trUtf8(
-                    'Shows a dialog to manage the QtHelp filters'))
+                'Shows a dialog to manage the QtHelp filters'))
             self.manageQtHelpFiltersAct.setWhatsThis(self.trUtf8(
-                    """<b>Manage QtHelp Filters</b>"""
-                    """<p>Shows a dialog to manage the QtHelp filters.</p>"""
+                """<b>Manage QtHelp Filters</b>"""
+                """<p>Shows a dialog to manage the QtHelp filters.</p>"""
             ))
             if not self.initShortcutsOnly:
                 self.manageQtHelpFiltersAct.triggered[()].connect(
@@ -1275,10 +1275,10 @@
                 self.trUtf8('&Reindex Documentation'),
                 0, 0, self, 'help_qthelp_reindex')
             self.reindexDocumentationAct.setStatusTip(self.trUtf8(
-                    'Reindexes the documentation set'))
+                'Reindexes the documentation set'))
             self.reindexDocumentationAct.setWhatsThis(self.trUtf8(
-                    """<b>Reindex Documentation</b>"""
-                    """<p>Reindexes the documentation set.</p>"""
+                """<b>Reindex Documentation</b>"""
+                """<p>Reindexes the documentation set.</p>"""
             ))
             if not self.initShortcutsOnly:
                 self.reindexDocumentationAct.triggered[()].connect(
@@ -1342,10 +1342,10 @@
             0, 0,
             self, 'help_manage_passwords')
         self.passwordsAct.setStatusTip(self.trUtf8(
-                'Manage the saved passwords'))
+            'Manage the saved passwords'))
         self.passwordsAct.setWhatsThis(self.trUtf8(
-                """<b>Manage Saved Passwords...</b>"""
-                """<p>Opens a dialog to manage the saved passwords.</p>"""
+            """<b>Manage Saved Passwords...</b>"""
+            """<p>Opens a dialog to manage the saved passwords.</p>"""
         ))
         if not self.initShortcutsOnly:
             self.passwordsAct.triggered[()].connect(self.__showPasswordsDialog)
@@ -1426,10 +1426,10 @@
             self.trUtf8('Downloads'),
             0, 0, self, 'help_show_downloads')
         self.showDownloadManagerAct.setStatusTip(self.trUtf8(
-                'Shows the downloads window'))
+            'Shows the downloads window'))
         self.showDownloadManagerAct.setWhatsThis(self.trUtf8(
-                """<b>Downloads</b>"""
-                """<p>Shows the downloads window.</p>"""
+            """<b>Downloads</b>"""
+            """<p>Shows the downloads window.</p>"""
         ))
         if not self.initShortcutsOnly:
             self.showDownloadManagerAct.triggered[()].connect(
@@ -1476,10 +1476,10 @@
             self.trUtf8('Manage &User Agent Settings'),
             0, 0, self, 'help_user_agent_settings')
         self.userAgentManagerAct.setStatusTip(self.trUtf8(
-                'Shows a dialog to manage the User Agent settings'))
+            'Shows a dialog to manage the User Agent settings'))
         self.userAgentManagerAct.setWhatsThis(self.trUtf8(
-                """<b>Manage User Agent Settings</b>"""
-                """<p>Shows a dialog to manage the User Agent settings.</p>"""
+            """<b>Manage User Agent Settings</b>"""
+            """<p>Shows a dialog to manage the User Agent settings.</p>"""
         ))
         if not self.initShortcutsOnly:
             self.userAgentManagerAct.triggered[()].connect(
@@ -1991,7 +1991,7 @@
                         "PDF Files (*.pdf);;"
                         "CHM Files (*.chm);;"
                         "All Files (*)"
-            ))
+                        ))
         if fn:
             if Utilities.isWindowsPlatform():
                 url = "file:///" + Utilities.fromNativeSeparators(fn)
@@ -2011,7 +2011,7 @@
                         "PDF Files (*.pdf);;"
                         "CHM Files (*.chm);;"
                         "All Files (*)"
-            ))
+                        ))
         if fn:
             if Utilities.isWindowsPlatform():
                 url = "file:///" + Utilities.fromNativeSeparators(fn)
@@ -3573,8 +3573,8 @@
         @param txt contents of the search (string)
         """
         self.virustotalSearchAct.setEnabled(
-            txt != "" and \
-            Preferences.getHelp("VirusTotalEnabled") and \
+            txt != "" and
+            Preferences.getHelp("VirusTotalEnabled") and
             Preferences.getHelp("VirusTotalServiceKey") != "")
     
     def __virusTotalSearch(self):
@@ -3650,7 +3650,7 @@
         @return style sheet (QUrl)
         """
         userStyle = self.adBlockManager().elementHidingRules() + \
-                    "{display:none !important;}"
+            "{display:none !important;}"
         
         if styleSheetFile:
             try:
--- a/Helpviewer/History/HistoryFilterModel.py	Fri Nov 01 15:48:48 2013 +0100
+++ b/Helpviewer/History/HistoryFilterModel.py	Sun Nov 03 15:58:22 2013 +0100
@@ -37,7 +37,7 @@
         @return flag indicating equality (boolean)
         """
         return self.tailOffset == other.tailOffset and \
-            (self.frequency == -1 or other.frequency == -1 or \
+            (self.frequency == -1 or other.frequency == -1 or
              self.frequency == other.frequency)
     
     def __lt__(self, other):
--- a/Helpviewer/History/HistoryManager.py	Fri Nov 01 15:48:48 2013 +0100
+++ b/Helpviewer/History/HistoryManager.py	Sun Nov 03 15:58:22 2013 +0100
@@ -353,8 +353,8 @@
         else:
             breakMS = QDateTime.currentMSecsSinceEpoch() - period
             while self.__history and \
-                  (QDateTime(self.__history[0].dateTime).toMSecsSinceEpoch() >
-                   breakMS):
+                (QDateTime(self.__history[0].dateTime).toMSecsSinceEpoch() >
+                 breakMS):
                 itm = self.__history.pop(0)
                 self.entryRemoved.emit(itm)
         self.__lastSavedUrl = ""
@@ -389,8 +389,8 @@
                 self.trUtf8("Loading History"),
                 self.trUtf8(
                     """<p>Unable to open history file <b>{0}</b>.<br/>"""
-                    """Reason: {1}</p>""")\
-                    .format(historyFile.fileName, historyFile.errorString()))
+                    """Reason: {1}</p>""")
+                .format(historyFile.fileName, historyFile.errorString()))
             return
         
         history = []
@@ -469,8 +469,8 @@
                 self.trUtf8("Saving History"),
                 self.trUtf8(
                     """<p>Unable to open history file <b>{0}</b>.<br/>"""
-                    """Reason: {1}</p>""")\
-                    .format(f.fileName(), f.errorString()))
+                    """Reason: {1}</p>""")
+                .format(f.fileName(), f.errorString()))
             return
         
         for index in range(first, -1, -1):
@@ -492,17 +492,17 @@
                     self.trUtf8("Saving History"),
                     self.trUtf8(
                         """<p>Error removing old history file <b>{0}</b>."""
-                        """<br/>Reason: {1}</p>""")\
-                        .format(historyFile.fileName(),
-                                historyFile.errorString()))
+                        """<br/>Reason: {1}</p>""")
+                    .format(historyFile.fileName(),
+                            historyFile.errorString()))
             if not f.copy(historyFile.fileName()):
                 E5MessageBox.warning(
                     None,
                     self.trUtf8("Saving History"),
                     self.trUtf8(
                         """<p>Error moving new history file over old one """
-                        """(<b>{0}</b>).<br/>Reason: {1}</p>""")\
-                        .format(historyFile.fileName(), f.errorString()))
+                        """(<b>{0}</b>).<br/>Reason: {1}</p>""")
+                    .format(historyFile.fileName(), f.errorString()))
         self.historySaved.emit()
         try:
             self.__lastSavedUrl = self.__history[0].url
--- a/Helpviewer/History/HistoryMenu.py	Fri Nov 01 15:48:48 2013 +0100
+++ b/Helpviewer/History/HistoryMenu.py	Sun Nov 03 15:58:22 2013 +0100
@@ -295,12 +295,12 @@
         """
         if self._keyboardModifiers & Qt.ControlModifier:
             self.newUrl.emit(
-                      idx.data(HistoryModel.UrlRole),
-                      idx.data(HistoryModel.TitleRole))
+                idx.data(HistoryModel.UrlRole),
+                idx.data(HistoryModel.TitleRole))
         else:
             self.openUrl.emit(
-                      idx.data(HistoryModel.UrlRole),
-                      idx.data(HistoryModel.TitleRole))
+                idx.data(HistoryModel.UrlRole),
+                idx.data(HistoryModel.TitleRole))
     
     def prePopulated(self):
         """
@@ -449,12 +449,12 @@
         """
         if self._keyboardModifiers & Qt.ControlModifier:
             self.newUrl.emit(
-                      idx.data(HistoryModel.UrlRole),
-                      idx.data(HistoryModel.TitleRole))
+                idx.data(HistoryModel.UrlRole),
+                idx.data(HistoryModel.TitleRole))
         else:
             self.openUrl.emit(
-                      idx.data(HistoryModel.UrlRole),
-                      idx.data(HistoryModel.TitleRole))
+                idx.data(HistoryModel.UrlRole),
+                idx.data(HistoryModel.TitleRole))
     
     def prePopulated(self):
         """
--- a/Helpviewer/OpenSearch/DefaultSearchEngines/DefaultSearchEngines_rc.py	Fri Nov 01 15:48:48 2013 +0100
+++ b/Helpviewer/OpenSearch/DefaultSearchEngines/DefaultSearchEngines_rc.py	Sun Nov 03 15:58:22 2013 +0100
@@ -2,7 +2,7 @@
 
 # Resource object code
 #
-# Created: So. Okt 13 16:47:44 2013
+# Created: Sa. Okt 26 17:29:22 2013
 #      by: The Resource Compiler for PyQt (Qt v4.8.5)
 #
 # WARNING! All changes made in this file will be lost!
--- a/Helpviewer/OpenSearch/OpenSearchEngine.py	Fri Nov 01 15:48:48 2013 +0100
+++ b/Helpviewer/OpenSearch/OpenSearchEngine.py	Sun Nov 03 15:58:22 2013 +0100
@@ -194,8 +194,8 @@
         if not self._suggestionsUrlTemplate:
             return QUrl()
         
-        ret = QUrl.fromEncoded(QByteArray(
-              self.parseTemplate(searchTerm, self._suggestionsUrlTemplate)))
+        ret = QUrl.fromEncoded(QByteArray(self.parseTemplate(
+            searchTerm, self._suggestionsUrlTemplate)))
         
         if self.__searchMethod != "post":
             for parameter in self._suggestionsParameters:
--- a/Helpviewer/OpenSearch/OpenSearchEngineModel.py	Fri Nov 01 15:48:48 2013 +0100
+++ b/Helpviewer/OpenSearch/OpenSearchEngineModel.py	Sun Nov 03 15:58:22 2013 +0100
@@ -133,7 +133,7 @@
                 
             elif role == Qt.ToolTipRole:
                 description = self.trUtf8("<strong>Description:</strong> {0}")\
-                              .format(engine.description())
+                    .format(engine.description())
                 if engine.providesSuggestions():
                     description += "<br/>"
                     description += self.trUtf8(
--- a/Helpviewer/OpenSearch/OpenSearchManager.py	Fri Nov 01 15:48:48 2013 +0100
+++ b/Helpviewer/OpenSearch/OpenSearchManager.py	Sun Nov 03 15:58:22 2013 +0100
@@ -361,8 +361,8 @@
         from .OpenSearchReader import OpenSearchReader
         from .DefaultSearchEngines import DefaultSearchEngines_rc   # __IGNORE_WARNING__
         
-        defaultEngineFiles = ["YouTube.xml", "Amazoncom.xml", "Bing.xml", 
-                              "DeEn_Beolingus.xml", "Facebook.xml", 
+        defaultEngineFiles = ["YouTube.xml", "Amazoncom.xml", "Bing.xml",
+                              "DeEn_Beolingus.xml", "Facebook.xml",
                               "Google_Im_Feeling_Lucky.xml", "Google.xml",
                               "LEO_DeuEng.xml", "LinuxMagazin.xml",
                               "Reddit.xml", "Wikia_en.xml", "Wikia.xml",
--- a/Helpviewer/OpenSearch/OpenSearchReader.py	Fri Nov 01 15:48:48 2013 +0100
+++ b/Helpviewer/OpenSearch/OpenSearchReader.py	Sun Nov 03 15:58:22 2013 +0100
@@ -71,8 +71,8 @@
                    engine.suggestionsUrlTemplate():
                     continue
                 
-                if (not type_ or \
-                    type_ == "text/html" or \
+                if (not type_ or
+                    type_ == "text/html" or
                     type_ == "application/xhtml+xml") and \
                    engine.suggestionsUrlTemplate():
                     continue
@@ -104,8 +104,8 @@
                     engine.setSuggestionsParameters(parameters)
                     engine.setSuggestionsMethod(method)
                 elif not type_ or \
-                     type_ == "text/html" or \
-                     type_ == "application/xhtml+xml":
+                    type_ == "text/html" or \
+                        type_ == "application/xhtml+xml":
                     engine.setSearchUrlTemplate(url)
                     engine.setSearchParameters(parameters)
                     engine.setSearchMethod(method)
--- a/Helpviewer/PageScreenDialog.py	Fri Nov 01 15:48:48 2013 +0100
+++ b/Helpviewer/PageScreenDialog.py	Sun Nov 03 15:58:22 2013 +0100
@@ -90,7 +90,7 @@
             E5MessageBox.warning(
                 self,
                 self.trUtf8("Save Page Screen"),
-                self.trUtf8("Cannot write file '{0}:\n{1}.")\
+                self.trUtf8("Cannot write file '{0}:\n{1}.")
                 .format(fileName, file.errorString()))
             return False
         
@@ -101,7 +101,7 @@
             E5MessageBox.warning(
                 self,
                 self.trUtf8("Save Page Screen"),
-                self.trUtf8("Cannot write file '{0}:\n{1}.")\
+                self.trUtf8("Cannot write file '{0}:\n{1}.")
                 .format(fileName, file.errorString()))
             return False
         
--- a/Helpviewer/Passwords/PasswordManager.py	Fri Nov 01 15:48:48 2013 +0100
+++ b/Helpviewer/Passwords/PasswordManager.py	Sun Nov 03 15:58:22 2013 +0100
@@ -102,7 +102,7 @@
         
         key = self.__createKey(url, realm)
         self.__logins[key] = (
-            username, 
+            username,
             Utilities.crypto.pwConvert(password, encode=True)
         )
         self.changed.emit()
@@ -168,10 +168,10 @@
                     None,
                     self.trUtf8("Loading login data"),
                     self.trUtf8("""Error when loading login data on"""
-                                """ line {0}, column {1}:\n{2}""")\
-                        .format(reader.lineNumber(),
-                                reader.columnNumber(),
-                                reader.errorString()))
+                                """ line {0}, column {1}:\n{2}""")
+                    .format(reader.lineNumber(),
+                            reader.columnNumber(),
+                            reader.errorString()))
         
         self.__loaded = True
     
@@ -195,8 +195,8 @@
                     self.trUtf8("Loading login data"),
                     self.trUtf8("""<p>Login data could not be loaded """
                                 """from <b>{0}</b></p>"""
-                                """<p>Reason: {1}</p>""")\
-                        .format(loginFile, str(err)))
+                                """<p>Reason: {1}</p>""")
+                    .format(loginFile, str(err)))
                 return
             
             data = []
@@ -221,8 +221,8 @@
                                 self.trUtf8(
                                     """<p>Login data could not be loaded """
                                     """from <b>{0}</b></p>"""
-                                    """<p>Reason: Wrong input format</p>""")\
-                                    .format(loginFile))
+                                    """<p>Reason: Wrong input format</p>""")
+                                .format(loginFile))
                             return
                         self.__logins[data[0]] = (data[1], data[2])
                         data = []
@@ -357,7 +357,7 @@
         
         # determine the QWebPage
         webPage = request.attribute(QNetworkRequest.User + 100)
-        if  webPage is None:
+        if webPage is None:
             return
         
         # determine the requests content type
@@ -415,7 +415,7 @@
                type_ == "text":
                 user = element[1]
             elif password == "" and \
-                 type_ == "password":
+                    type_ == "password":
                 password = element[1]
                 form.elements[index] = (element[0], "--PASSWORD--")
         if user and password:
@@ -468,7 +468,7 @@
             formHasPasswords = False
             formName = map["name"]
             formIndex = map["index"]
-            if type(formIndex) == type(0.0) and formIndex.is_integer():
+            if isinstance(formIndex, float) and formIndex.is_integer():
                 formIndex = int(formIndex)
             elements = map["elements"]
             formElements = set()
--- a/Helpviewer/QtHelpDocumentationDialog.py	Fri Nov 01 15:48:48 2013 +0100
+++ b/Helpviewer/QtHelpDocumentationDialog.py	Sun Nov 03 15:58:22 2013 +0100
@@ -82,8 +82,8 @@
                     self,
                     self.trUtf8("Add Documentation"),
                     self.trUtf8(
-                        """The namespace <b>{0}</b> is already registered.""")\
-                        .format(ns)
+                        """The namespace <b>{0}</b> is already registered.""")
+                    .format(ns)
                 )
                 continue
             
@@ -144,7 +144,7 @@
         @return flag indicating presence of changes
         """
         return len(self.__registeredDocs) > 0 or \
-               len(self.__unregisteredDocs) > 0
+            len(self.__unregisteredDocs) > 0
     
     def getTabsToClose(self):
         """
--- a/Helpviewer/SiteInfo/SiteInfoDialog.py	Fri Nov 01 15:48:48 2013 +0100
+++ b/Helpviewer/SiteInfo/SiteInfoDialog.py	Sun Nov 03 15:58:22 2013 +0100
@@ -93,8 +93,8 @@
         
         # populate the Security info and the Security tab
         if sslInfo and \
-           ((qVersion() >= "5.0.0" and not sslInfo[0].isBlacklisted()) or \
-            (qVersion() < "5.0.0" and sslInfo[0].isValid())):
+           ((qVersion() >= "5.0.0" and not sslInfo[0].isBlacklisted()) or
+                (qVersion() < "5.0.0" and sslInfo[0].isValid())):
             self.securityLabel.setStyleSheet(SiteInfoDialog.okStyle)
             self.securityLabel.setText('<b>Connection is encrypted.</b>')
             if SSL:
@@ -274,7 +274,7 @@
                 self.trUtf8("Save Image"),
                 self.trUtf8(
                     """<p>Cannot write to file <b>{0}</b>.</p>""")
-                    .format(filename))
+                .format(filename))
             return
         f.write(cacheData.readAll())
         f.close()
--- a/Helpviewer/SpeedDial/Page.py	Fri Nov 01 15:48:48 2013 +0100
+++ b/Helpviewer/SpeedDial/Page.py	Sun Nov 03 15:58:22 2013 +0100
@@ -35,4 +35,4 @@
         @return flag indicating equality (boolean)
         """
         return self.title == other.title and \
-               self.url == other.url
+            self.url == other.url
--- a/Helpviewer/Sync/DirectorySyncHandler.py	Fri Nov 01 15:48:48 2013 +0100
+++ b/Helpviewer/Sync/DirectorySyncHandler.py	Sun Nov 03 15:58:22 2013 +0100
@@ -65,7 +65,7 @@
         
         self.__remoteFilesFound = []
         
-        # check the existence of the shared directory; create it, if it is 
+        # check the existence of the shared directory; create it, if it is
         # not there
         if not os.path.exists(Preferences.getHelp("SyncDirectoryPath")):
             try:
@@ -181,16 +181,16 @@
         if Preferences.getHelp("SyncBookmarks"):
             self.__initialSyncFile(
                 "bookmarks",
-                Helpviewer.HelpWindow.HelpWindow.bookmarksManager()\
-                    .getFileName())
+                Helpviewer.HelpWindow.HelpWindow.bookmarksManager()
+                .getFileName())
         
         QCoreApplication.processEvents()
         # History
         if Preferences.getHelp("SyncHistory"):
             self.__initialSyncFile(
                 "history",
-                Helpviewer.HelpWindow.HelpWindow.historyManager()\
-                    .getFileName())
+                Helpviewer.HelpWindow.HelpWindow.historyManager()
+                .getFileName())
         
         QCoreApplication.processEvents()
         # Passwords
@@ -198,7 +198,7 @@
             self.__initialSyncFile(
                 "passwords",
                 Helpviewer.HelpWindow.HelpWindow.passwordManager()
-                    .getFileName())
+                .getFileName())
         
         QCoreApplication.processEvents()
         # User Agent Settings
@@ -206,7 +206,7 @@
             self.__initialSyncFile(
                 "useragents",
                 Helpviewer.HelpWindow.HelpWindow.userAgentsManager()
-                    .getFileName())
+                .getFileName())
         
         QCoreApplication.processEvents()
         # Speed Dial Settings
--- a/Helpviewer/Sync/FtpSyncHandler.py	Fri Nov 01 15:48:48 2013 +0100
+++ b/Helpviewer/Sync/FtpSyncHandler.py	Sun Nov 03 15:58:22 2013 +0100
@@ -283,28 +283,28 @@
             self.__initialSyncFile(
                 "bookmarks",
                 Helpviewer.HelpWindow.HelpWindow.bookmarksManager()
-                    .getFileName())
+                .getFileName())
         
         # History
         if Preferences.getHelp("SyncHistory"):
             self.__initialSyncFile(
                 "history",
                 Helpviewer.HelpWindow.HelpWindow.historyManager()
-                    .getFileName())
+                .getFileName())
         
         # Passwords
         if Preferences.getHelp("SyncPasswords"):
             self.__initialSyncFile(
                 "passwords",
                 Helpviewer.HelpWindow.HelpWindow.passwordManager()
-                    .getFileName())
+                .getFileName())
         
         # User Agent Settings
         if Preferences.getHelp("SyncUserAgents"):
             self.__initialSyncFile(
                 "useragents",
                 Helpviewer.HelpWindow.HelpWindow.userAgentsManager()
-                    .getFileName())
+                .getFileName())
         
         # Speed Dial Settings
         if Preferences.getHelp("SyncSpeedDial"):
--- a/Helpviewer/Sync/SyncEncryptionPage.py	Fri Nov 01 15:48:48 2013 +0100
+++ b/Helpviewer/Sync/SyncEncryptionPage.py	Sun Nov 03 15:58:22 2013 +0100
@@ -101,7 +101,7 @@
             
             if self.encryptionKeyEdit.text() != "" and \
                     self.reencryptCheckBox.isChecked() and \
-                    (self.encryptionKeyEdit.text() != 
+                    (self.encryptionKeyEdit.text() !=
                      self.encryptionKeyAgainEdit.text()):
                 error = error or self.trUtf8(
                     "Repeated encryption key is wrong.")
--- a/Helpviewer/Sync/SyncHandler.py	Fri Nov 01 15:48:48 2013 +0100
+++ b/Helpviewer/Sync/SyncHandler.py	Sun Nov 03 15:58:22 2013 +0100
@@ -217,8 +217,8 @@
                 return QByteArray()
             
             if Preferences.getHelp("SyncEncryptData") and \
-               (not Preferences.getHelp("SyncEncryptPasswordsOnly") or \
-                (Preferences.getHelp("SyncEncryptPasswordsOnly") and \
+               (not Preferences.getHelp("SyncEncryptPasswordsOnly") or
+                (Preferences.getHelp("SyncEncryptPasswordsOnly") and
                  type_ == "passwords")):
                 key = Preferences.getHelp("SyncEncryptionKey")
                 if not key:
@@ -255,7 +255,7 @@
         
         if Preferences.getHelp("SyncEncryptData") and \
                 (not Preferences.getHelp("SyncEncryptPasswordsOnly") or
-                 (Preferences.getHelp("SyncEncryptPasswordsOnly") and 
+                 (Preferences.getHelp("SyncEncryptPasswordsOnly") and
                   type_ == "passwords")):
             key = Preferences.getHelp("SyncEncryptionKey")
             if not key:
--- a/Helpviewer/Sync/SyncManager.py	Fri Nov 01 15:48:48 2013 +0100
+++ b/Helpviewer/Sync/SyncManager.py	Sun Nov 03 15:58:22 2013 +0100
@@ -184,7 +184,7 @@
         """
         from . import SyncGlobals
         return Preferences.getHelp("SyncEnabled") and \
-               Preferences.getHelp("SyncType") != SyncGlobals.SyncTypeNone
+            Preferences.getHelp("SyncType") != SyncGlobals.SyncTypeNone
     
     def __syncBookmarks(self):
         """
--- a/Helpviewer/UrlBar/StackedUrlBar.py	Fri Nov 01 15:48:48 2013 +0100
+++ b/Helpviewer/UrlBar/StackedUrlBar.py	Sun Nov 03 15:58:22 2013 +0100
@@ -64,7 +64,7 @@
         
         @return list of references to url bars (list of UrlBar)
         """
-        l = []
+        li = []
         for index in range(self.count()):
-            l.append(self.widget(index))
-        return l
+            li.append(self.widget(index))
+        return li
--- a/Helpviewer/UrlBar/UrlBar.py	Fri Nov 01 15:48:48 2013 +0100
+++ b/Helpviewer/UrlBar/UrlBar.py	Sun Nov 03 15:58:22 2013 +0100
@@ -160,7 +160,7 @@
                 manager.setTimestamp(bookmark, BookmarkNode.TsVisited,
                                      QDateTime.currentDateTime())
         elif Helpviewer.HelpWindow.HelpWindow.speedDial()\
-           .pageForUrl(self.__browser.url()).url != "":
+                .pageForUrl(self.__browser.url()).url != "":
             self.__bookmarkButton.setIcon(self.__bmActiveIcon)
         else:
             self.__bookmarkButton.setIcon(self.__bmInactiveIcon)
@@ -265,7 +265,7 @@
                 self.__browser.addBookmark()
             elif action == BookmarkActionSelectionDialog.EditBookmark:
                 bookmark = Helpviewer.HelpWindow.HelpWindow.bookmarksManager()\
-                   .bookmarkForUrl(url)
+                    .bookmarkForUrl(url)
                 from .BookmarkInfoDialog import BookmarkInfoDialog
                 dlg = BookmarkInfoDialog(bookmark, self.__browser)
                 dlg.exec_()
@@ -322,7 +322,7 @@
                 b = (highlight.blue() + 2 * backgroundColor.blue()) // 3
                 
                 loadingColor = QColor(r, g, b)
-                if abs(loadingColor.lightness() - 
+                if abs(loadingColor.lightness() -
                         backgroundColor.lightness()) < 20:
                     # special handling for special color schemes (e.g Gaia)
                     r = (2 * highlight.red() + backgroundColor.red()) // 3
--- a/Helpviewer/UserAgent/UserAgentManager.py	Fri Nov 01 15:48:48 2013 +0100
+++ b/Helpviewer/UserAgent/UserAgentManager.py	Sun Nov 03 15:58:22 2013 +0100
@@ -90,10 +90,10 @@
                     None,
                     self.trUtf8("Loading user agent data"),
                     self.trUtf8("""Error when loading user agent data on"""
-                                """ line {0}, column {1}:\n{2}""")\
-                        .format(reader.lineNumber(),
-                                reader.columnNumber(),
-                                reader.errorString()))
+                                """ line {0}, column {1}:\n{2}""")
+                    .format(reader.lineNumber(),
+                            reader.columnNumber(),
+                            reader.errorString()))
         
         self.__loaded = True
     
@@ -117,8 +117,8 @@
                     self.trUtf8("Loading user agent data"),
                     self.trUtf8("""<p>User agent data could not be loaded """
                                 """from <b>{0}</b></p>"""
-                                """<p>Reason: {1}</p>""")\
-                        .format(agentFile, str(err)))
+                                """<p>Reason: {1}</p>""")
+                    .format(agentFile, str(err)))
                 return
             
             for line in lines.splitlines():
--- a/Helpviewer/UserAgent/UserAgentMenu.py	Fri Nov 01 15:48:48 2013 +0100
+++ b/Helpviewer/UserAgent/UserAgentMenu.py	Sun Nov 03 15:58:22 2013 +0100
@@ -184,6 +184,6 @@
                 self.trUtf8("Parsing default user agents"),
                 self.trUtf8(
                     """<p>Error parsing default user agents.</p><p>{0}</p>""")
-                    .format(xml.errorString()))
+                .format(xml.errorString()))
         
         return isChecked
--- a/Helpviewer/VirusTotalApi.py	Fri Nov 01 15:48:48 2013 +0100
+++ b/Helpviewer/VirusTotalApi.py	Sun Nov 03 15:58:22 2013 +0100
@@ -88,7 +88,7 @@
         self.errorMessages = {
             -2: self.trUtf8("Request limit has been reached."),
             -1: self.trUtf8("Invalid key given."),
-             0: self.trUtf8("Requested item is not present.")
+            0: self.trUtf8("Requested item is not present.")
         }
     
     def preferencesChanged(self):
@@ -148,7 +148,7 @@
         request.setHeader(QNetworkRequest.ContentTypeHeader,
                           "application/x-www-form-urlencoded")
         params = QByteArray("key={0}&url=".format(
-                Preferences.getHelp("VirusTotalServiceKey")))\
+            Preferences.getHelp("VirusTotalServiceKey")))\
             .append(QUrl.toPercentEncoding(url.toString()))
         
         import Helpviewer.HelpWindow
--- a/Helpviewer/WebPlugins/ClickToFlash/ClickToFlash.py	Fri Nov 01 15:48:48 2013 +0100
+++ b/Helpviewer/WebPlugins/ClickToFlash/ClickToFlash.py	Sun Nov 03 15:58:22 2013 +0100
@@ -316,5 +316,5 @@
         @return flag indicating that this was already accepted (boolean)
         """
         return url == cls._acceptedUrl and \
-               argumentNames == cls._acceptedArgNames and \
-               argumentValues == cls._acceptedArgValues
+            argumentNames == cls._acceptedArgNames and \
+            argumentValues == cls._acceptedArgValues
--- a/Helpviewer/WebPlugins/ClickToFlash/ClickToFlashPlugin.py	Fri Nov 01 15:48:48 2013 +0100
+++ b/Helpviewer/WebPlugins/ClickToFlash/ClickToFlashPlugin.py	Sun Nov 03 15:58:22 2013 +0100
@@ -150,8 +150,8 @@
         @return flag indicating presence in the whitelist (boolean)
         """
         return host in self.__whitelist or \
-               "www." + host in self.__whitelist or \
-               host.replace("www.", "") in self.__whitelist
+            "www." + host in self.__whitelist or \
+            host.replace("www.", "") in self.__whitelist
     
     def addToWhitelist(self, host):
         """
--- a/IconEditor/IconEditorGrid.py	Fri Nov 01 15:48:48 2013 +0100
+++ b/IconEditor/IconEditorGrid.py	Sun Nov 03 15:58:22 2013 +0100
@@ -651,19 +651,20 @@
         
         elif self.__curTool in [self.Rectangle, self.FilledRectangle,
                                 self.RectangleSelection]:
-            l = min(start.x(), end.x())
-            t = min(start.y(), end.y())
-            r = max(start.x(), end.x())
-            b = max(start.y(), end.y())
+            left = min(start.x(), end.x())
+            top = min(start.y(), end.y())
+            right = max(start.x(), end.x())
+            bottom = max(start.y(), end.y())
             if self.__curTool == self.RectangleSelection:
                 painter.setBrush(QBrush(drawColor))
             if self.__curTool == self.FilledRectangle:
-                for y in range(t, b + 1):
-                    painter.drawLine(l, y, r, y)
+                for y in range(top, bottom + 1):
+                    painter.drawLine(left, y, right, y)
             else:
-                painter.drawRect(l, t, r - l, b - t)
+                painter.drawRect(left, top, right - left, bottom - top)
             if self.__selecting:
-                self.__selRect = QRect(l, t, r - l + 1, b - t + 1)
+                self.__selRect = QRect(
+                    left, top, right - left + 1, bottom - top + 1)
                 self.__selectionAvailable = True
                 self.selectionAvailable.emit(True)
         
--- a/IconEditor/IconEditorWindow.py	Fri Nov 01 15:48:48 2013 +0100
+++ b/IconEditor/IconEditorWindow.py	Sun Nov 03 15:58:22 2013 +0100
@@ -193,8 +193,8 @@
             0, self, 'iconEditor_file_new')
         self.newAct.setStatusTip(self.trUtf8('Create a new icon'))
         self.newAct.setWhatsThis(self.trUtf8(
-                """<b>New</b>"""
-                """<p>This creates a new icon.</p>"""
+            """<b>New</b>"""
+            """<p>This creates a new icon.</p>"""
         ))
         self.newAct.triggered[()].connect(self.__newIcon)
         self.__actions.append(self.newAct)
@@ -207,8 +207,8 @@
         self.newWindowAct.setStatusTip(self.trUtf8(
             'Open a new icon editor window'))
         self.newWindowAct.setWhatsThis(self.trUtf8(
-                """<b>New Window</b>"""
-                """<p>This opens a new icon editor window.</p>"""
+            """<b>New Window</b>"""
+            """<p>This opens a new icon editor window.</p>"""
         ))
         self.newWindowAct.triggered[()].connect(self.__newWindow)
         self.__actions.append(self.newWindowAct)
@@ -221,9 +221,9 @@
             0, self, 'iconEditor_file_open')
         self.openAct.setStatusTip(self.trUtf8('Open an icon file for editing'))
         self.openAct.setWhatsThis(self.trUtf8(
-                """<b>Open File</b>"""
-                """<p>This opens a new icon file for editing."""
-                """ It pops up a file selection dialog.</p>"""
+            """<b>Open File</b>"""
+            """<p>This opens a new icon file for editing."""
+            """ It pops up a file selection dialog.</p>"""
         ))
         self.openAct.triggered[()].connect(self.__openIcon)
         self.__actions.append(self.openAct)
@@ -251,8 +251,8 @@
         self.saveAsAct.setStatusTip(
             self.trUtf8('Save the current icon to a new file'))
         self.saveAsAct.setWhatsThis(self.trUtf8(
-                """<b>Save As...</b>"""
-                """<p>Saves the current icon to a new file.</p>"""
+            """<b>Save As...</b>"""
+            """<p>Saves the current icon to a new file.</p>"""
         ))
         self.saveAsAct.triggered[()].connect(self.__saveIconAs)
         self.__actions.append(self.saveAsAct)
@@ -266,8 +266,8 @@
         self.closeAct.setStatusTip(self.trUtf8(
             'Close the current icon editor window'))
         self.closeAct.setWhatsThis(self.trUtf8(
-                """<b>Close</b>"""
-                """<p>Closes the current icon editor window.</p>"""
+            """<b>Close</b>"""
+            """<p>Closes the current icon editor window.</p>"""
         ))
         self.closeAct.triggered[()].connect(self.close)
         self.__actions.append(self.closeAct)
@@ -293,8 +293,8 @@
             0, self, 'iconEditor_file_quit')
         self.exitAct.setStatusTip(self.trUtf8('Quit the icon editor'))
         self.exitAct.setWhatsThis(self.trUtf8(
-                """<b>Quit</b>"""
-                """<p>Quit the icon editor.</p>"""
+            """<b>Quit</b>"""
+            """<p>Quit the icon editor.</p>"""
         ))
         if not self.fromEric:
             self.exitAct.triggered[()].connect(self.__closeAll)
@@ -481,8 +481,8 @@
             0, self, 'iconEditor_view_zoom_in')
         self.zoomInAct.setStatusTip(self.trUtf8('Zoom in on the icon'))
         self.zoomInAct.setWhatsThis(self.trUtf8(
-                """<b>Zoom in</b>"""
-                """<p>Zoom in on the icon. This makes the grid bigger.</p>"""
+            """<b>Zoom in</b>"""
+            """<p>Zoom in on the icon. This makes the grid bigger.</p>"""
         ))
         self.zoomInAct.triggered[()].connect(self.__zoomIn)
         self.__actions.append(self.zoomInAct)
@@ -495,8 +495,8 @@
             0, self, 'iconEditor_view_zoom_out')
         self.zoomOutAct.setStatusTip(self.trUtf8('Zoom out on the icon'))
         self.zoomOutAct.setWhatsThis(self.trUtf8(
-                """<b>Zoom out</b>"""
-                """<p>Zoom out on the icon. This makes the grid smaller.</p>"""
+            """<b>Zoom out</b>"""
+            """<p>Zoom out on the icon. This makes the grid smaller.</p>"""
         ))
         self.zoomOutAct.triggered[()].connect(self.__zoomOut)
         self.__actions.append(self.zoomOutAct)
@@ -510,9 +510,9 @@
         self.zoomResetAct.setStatusTip(self.trUtf8(
             'Reset the zoom of the icon'))
         self.zoomResetAct.setWhatsThis(self.trUtf8(
-                """<b>Zoom reset</b>"""
-                """<p>Reset the zoom of the icon. """
-                """This sets the zoom factor to 100%.</p>"""
+            """<b>Zoom reset</b>"""
+            """<p>Reset the zoom of the icon. """
+            """This sets the zoom factor to 100%.</p>"""
         ))
         self.zoomResetAct.triggered[()].connect(self.__zoomReset)
         self.__actions.append(self.zoomResetAct)
@@ -526,9 +526,9 @@
         self.showGridAct.setStatusTip(self.trUtf8(
             'Toggle the display of the grid'))
         self.showGridAct.setWhatsThis(self.trUtf8(
-                """<b>Show Grid</b>"""
-                """<p>Toggle the display of the grid.</p>"""
-                ))
+            """<b>Show Grid</b>"""
+            """<p>Toggle the display of the grid.</p>"""
+        ))
         self.showGridAct.triggered[bool].connect(self.__editor.setGridEnabled)
         self.__actions.append(self.showGridAct)
         self.showGridAct.setCheckable(True)
@@ -551,8 +551,8 @@
             0, 0,
             self.drawingActGrp, 'iconEditor_tools_pencil')
         self.drawPencilAct.setWhatsThis(self.trUtf8(
-                """<b>Free hand</b>"""
-                """<p>Draws non linear lines.</p>"""
+            """<b>Free hand</b>"""
+            """<p>Draws non linear lines.</p>"""
         ))
         self.drawPencilAct.setCheckable(True)
         self.esm.setMapping(self.drawPencilAct, IconEditorGrid.Pencil)
@@ -566,9 +566,9 @@
             0, 0,
             self.drawingActGrp, 'iconEditor_tools_color_picker')
         self.drawColorPickerAct.setWhatsThis(self.trUtf8(
-                """<b>Color Picker</b>"""
-                """<p>The color of the pixel clicked on will become """
-                """the current draw color.</p>"""
+            """<b>Color Picker</b>"""
+            """<p>The color of the pixel clicked on will become """
+            """the current draw color.</p>"""
         ))
         self.drawColorPickerAct.setCheckable(True)
         self.esm.setMapping(self.drawColorPickerAct,
@@ -583,8 +583,8 @@
             0, 0,
             self.drawingActGrp, 'iconEditor_tools_rectangle')
         self.drawRectangleAct.setWhatsThis(self.trUtf8(
-                """<b>Rectangle</b>"""
-                """<p>Draw a rectangle.</p>"""
+            """<b>Rectangle</b>"""
+            """<p>Draw a rectangle.</p>"""
         ))
         self.drawRectangleAct.setCheckable(True)
         self.esm.setMapping(self.drawRectangleAct, IconEditorGrid.Rectangle)
@@ -598,8 +598,8 @@
             0, 0,
             self.drawingActGrp, 'iconEditor_tools_filled_rectangle')
         self.drawFilledRectangleAct.setWhatsThis(self.trUtf8(
-                """<b>Filled Rectangle</b>"""
-                """<p>Draw a filled rectangle.</p>"""
+            """<b>Filled Rectangle</b>"""
+            """<p>Draw a filled rectangle.</p>"""
         ))
         self.drawFilledRectangleAct.setCheckable(True)
         self.esm.setMapping(self.drawFilledRectangleAct,
@@ -614,8 +614,8 @@
             0, 0,
             self.drawingActGrp, 'iconEditor_tools_circle')
         self.drawCircleAct.setWhatsThis(self.trUtf8(
-                """<b>Circle</b>"""
-                """<p>Draw a circle.</p>"""
+            """<b>Circle</b>"""
+            """<p>Draw a circle.</p>"""
         ))
         self.drawCircleAct.setCheckable(True)
         self.esm.setMapping(self.drawCircleAct, IconEditorGrid.Circle)
@@ -629,8 +629,8 @@
             0, 0,
             self.drawingActGrp, 'iconEditor_tools_filled_circle')
         self.drawFilledCircleAct.setWhatsThis(self.trUtf8(
-                """<b>Filled Circle</b>"""
-                """<p>Draw a filled circle.</p>"""
+            """<b>Filled Circle</b>"""
+            """<p>Draw a filled circle.</p>"""
         ))
         self.drawFilledCircleAct.setCheckable(True)
         self.esm.setMapping(self.drawFilledCircleAct,
@@ -645,8 +645,8 @@
             0, 0,
             self.drawingActGrp, 'iconEditor_tools_ellipse')
         self.drawEllipseAct.setWhatsThis(self.trUtf8(
-                """<b>Ellipse</b>"""
-                """<p>Draw an ellipse.</p>"""
+            """<b>Ellipse</b>"""
+            """<p>Draw an ellipse.</p>"""
         ))
         self.drawEllipseAct.setCheckable(True)
         self.esm.setMapping(self.drawEllipseAct, IconEditorGrid.Ellipse)
@@ -660,8 +660,8 @@
             0, 0,
             self.drawingActGrp, 'iconEditor_tools_filled_ellipse')
         self.drawFilledEllipseAct.setWhatsThis(self.trUtf8(
-                """<b>Filled Ellipse</b>"""
-                """<p>Draw a filled ellipse.</p>"""
+            """<b>Filled Ellipse</b>"""
+            """<p>Draw a filled ellipse.</p>"""
         ))
         self.drawFilledEllipseAct.setCheckable(True)
         self.esm.setMapping(self.drawFilledEllipseAct,
@@ -676,9 +676,9 @@
             0, 0,
             self.drawingActGrp, 'iconEditor_tools_flood_fill')
         self.drawFloodFillAct.setWhatsThis(self.trUtf8(
-                """<b>Flood Fill</b>"""
-                """<p>Fill adjoining pixels with the same color with """
-                """the current color.</p>"""
+            """<b>Flood Fill</b>"""
+            """<p>Fill adjoining pixels with the same color with """
+            """the current color.</p>"""
         ))
         self.drawFloodFillAct.setCheckable(True)
         self.esm.setMapping(self.drawFloodFillAct, IconEditorGrid.Fill)
@@ -692,8 +692,8 @@
             0, 0,
             self.drawingActGrp, 'iconEditor_tools_line')
         self.drawLineAct.setWhatsThis(self.trUtf8(
-                """<b>Line</b>"""
-                """<p>Draw a line.</p>"""
+            """<b>Line</b>"""
+            """<p>Draw a line.</p>"""
         ))
         self.drawLineAct.setCheckable(True)
         self.esm.setMapping(self.drawLineAct, IconEditorGrid.Line)
@@ -707,8 +707,8 @@
             0, 0,
             self.drawingActGrp, 'iconEditor_tools_eraser')
         self.drawEraserAct.setWhatsThis(self.trUtf8(
-                """<b>Eraser (Transparent)</b>"""
-                """<p>Erase pixels by setting them to transparent.</p>"""
+            """<b>Eraser (Transparent)</b>"""
+            """<p>Erase pixels by setting them to transparent.</p>"""
         ))
         self.drawEraserAct.setCheckable(True)
         self.esm.setMapping(self.drawEraserAct, IconEditorGrid.Rubber)
@@ -1122,14 +1122,14 @@
             E5MessageBox.warning(
                 self, self.trUtf8("eric5 Icon Editor"),
                 self.trUtf8("The file '{0}' does not exist.")
-                    .format(fileName))
+                .format(fileName))
             return
         
         if not file.open(QFile.ReadOnly):
             E5MessageBox.warning(
                 self, self.trUtf8("eric5 Icon Editor"),
                 self.trUtf8("Cannot read file '{0}:\n{1}.")
-                    .format(fileName, file.errorString()))
+                .format(fileName, file.errorString()))
             return
         file.close()
         
@@ -1149,7 +1149,7 @@
             E5MessageBox.warning(
                 self, self.trUtf8("eric5 Icon Editor"),
                 self.trUtf8("Cannot write file '{0}:\n{1}.")
-                    .format(fileName, file.errorString()))
+                .format(fileName, file.errorString()))
         
             self.__checkActions()
             
@@ -1163,7 +1163,7 @@
             E5MessageBox.warning(
                 self, self.trUtf8("eric5 Icon Editor"),
                 self.trUtf8("Cannot write file '{0}:\n{1}.")
-                    .format(fileName, file.errorString()))
+                .format(fileName, file.errorString()))
         
             self.__checkActions()
             
--- a/MultiProject/AddProjectDialog.py	Fri Nov 01 15:48:48 2013 +0100
+++ b/MultiProject/AddProjectDialog.py	Sun Nov 03 15:58:22 2013 +0100
@@ -106,5 +106,5 @@
         """
         Private method to update the dialog.
         """
-        self.__okButton.setEnabled(self.nameEdit.text() != "" and \
+        self.__okButton.setEnabled(self.nameEdit.text() != "" and
                                    self.filenameEdit.text() != "")
--- a/MultiProject/MultiProject.py	Fri Nov 01 15:48:48 2013 +0100
+++ b/MultiProject/MultiProject.py	Sun Nov 03 15:58:22 2013 +0100
@@ -420,8 +420,8 @@
             fn = E5FileDialog.getOpenFileName(
                 self.parent(),
                 self.trUtf8("Open multiproject"),
-                Preferences.getMultiProject("Workspace") or \
-                    Utilities.getHomeDir(),
+                Preferences.getMultiProject("Workspace") or
+                Utilities.getHomeDir(),
                 self.trUtf8("Multiproject Files (*.e4m)"))
             
             if fn == "":
@@ -446,7 +446,7 @@
                 self.multiProjectOpened.emit()
                 
                 if openMaster and Preferences.getMultiProject(
-                    "OpenMasterAutomatically"):
+                        "OpenMasterAutomatically"):
                     self.__openMasterProject(False)
             else:
                 QApplication.restoreOverrideCursor()
@@ -477,7 +477,7 @@
             defaultPath = self.ppath
         else:
             defaultPath = Preferences.getMultiProject("Workspace") or \
-                          Utilities.getHomeDir()
+                Utilities.getHomeDir()
         fn, selectedFilter = E5FileDialog.getSaveFileNameAndFilter(
             self.parent(),
             self.trUtf8("Save multiproject as"),
--- a/Network/IRC/IrcChannelWidget.py	Fri Nov 01 15:48:48 2013 +0100
+++ b/Network/IRC/IrcChannelWidget.py	Sun Nov 03 15:58:22 2013 +0100
@@ -172,8 +172,8 @@
         
         @return flag indicating that the topic can be changed (boolean)
         """
-        return(bool(self.__privilege & IrcUserItem.Operator) or \
-               bool(self.__privilege & IrcUserItem.Admin) or \
+        return(bool(self.__privilege & IrcUserItem.Operator) or
+               bool(self.__privilege & IrcUserItem.Admin) or
                bool(self.__privilege & IrcUserItem.Owner))
 
 
@@ -351,9 +351,10 @@
             self.messages.append(
                 '<font color="{0}">{2} <b>&lt;</b><font color="{1}">{3}</font>'
                 '<b>&gt;</b> {4}</font>'.format(
-                Preferences.getIrc("ChannelMessageColour"),
-                Preferences.getIrc("OwnNickColour"),
-                ircTimestamp(), self.__userName, Utilities.html_encode(msg)))
+                    Preferences.getIrc("ChannelMessageColour"),
+                    Preferences.getIrc("OwnNickColour"),
+                    ircTimestamp(), self.__userName,
+                    Utilities.html_encode(msg)))
             if msg.startswith("/"):
                 if self.__private:
                     E5MessageBox.information(
@@ -388,7 +389,7 @@
             self.trUtf8("Leave IRC channel"),
             self.trUtf8(
                 """Do you really want to leave the IRC channel <b>{0}</b>?""")
-                .format(self.__name))
+            .format(self.__name))
         if ok:
             if not self.__private:
                 self.sendData.emit(
@@ -519,16 +520,16 @@
         self.__appendMessage(
             '<font color="{0}">{2} <b>&lt;</b><font color="{1}">{3}</font>'
             '<b>&gt;</b> {4}</font>'.format(
-            Preferences.getIrc("ChannelMessageColour"),
-            Preferences.getIrc("NickColour"),
-            ircTimestamp(), sender, ircFilter(msg)))
+                Preferences.getIrc("ChannelMessageColour"),
+                Preferences.getIrc("NickColour"),
+                ircTimestamp(), sender, ircFilter(msg)))
         if Preferences.getIrc("ShowNotifications"):
             if Preferences.getIrc("NotifyMessage"):
                 self.__ui.showNotification(
                     UI.PixmapCache.getPixmap("irc48.png"),
                     self.trUtf8("Channel Message"), msg)
             elif Preferences.getIrc("NotifyNick") and \
-                 self.__userName.lower() in msg.lower():
+                    self.__userName.lower() in msg.lower():
                 self.__ui.showNotification(
                     UI.PixmapCache.getPixmap("irc48.png"),
                     self.trUtf8("Nick mentioned"), msg)
@@ -556,13 +557,13 @@
                 IrcUserItem(match.group(1), self.usersList)
                 msg = self.trUtf8(
                     "{0} has joined the channel {1} ({2}).").format(
-                        match.group(1), self.__name, match.group(2))
+                    match.group(1), self.__name, match.group(2))
                 self.__addManagementMessage(
                     IrcChannelWidget.JoinIndicator, msg)
             else:
                 msg = self.trUtf8(
                     "You have joined the channel {0} ({1}).").format(
-                        self.__name, match.group(2))
+                    self.__name, match.group(2))
                 self.__addManagementMessage(
                     IrcChannelWidget.JoinIndicator, msg)
             if Preferences.getIrc("ShowNotifications") and \
@@ -728,8 +729,8 @@
             self.__addManagementMessage(
                 IrcChannelWidget.MessageIndicator,
                 self.trUtf8("The topic was set by {0} on {1}.").format(
-                    match.group(2), QDateTime.fromTime_t(int(match.group(3)))\
-                                    .toString("yyyy-MM-dd hh:mm")))
+                    match.group(2), QDateTime.fromTime_t(int(match.group(3)))
+                    .toString("yyyy-MM-dd hh:mm")))
             return True
         
         return False
@@ -797,8 +798,8 @@
             self.__addManagementMessage(
                 IrcChannelWidget.MessageIndicator,
                 self.trUtf8("This channel was created on {0}.").format(
-                    QDateTime.fromTime_t(int(match.group(2)))\
-                        .toString("yyyy-MM-dd hh:mm")))
+                    QDateTime.fromTime_t(int(match.group(2)))
+                    .toString("yyyy-MM-dd hh:mm")))
             return True
         
         return False
@@ -1025,7 +1026,7 @@
                 self.__addManagementMessage(
                     self.trUtf8("CTCP"),
                     self.trUtf8("Received Version request from {0}.").format(
-                    match.group(1)))
+                        match.group(1)))
                 self.sendCtcpReply.emit(match.group(1), "VERSION " + msg)
             elif ctcpRequest == "ping":
                 self.__addManagementMessage(
@@ -1109,7 +1110,7 @@
             color = Preferences.getIrc("ChannelInfoColour")
         self.__appendMessage(
             '<font color="{0}">{1} <b>[</b>{2}<b>]</b> {3}</font>'.format(
-            color, ircTimestamp(), indicator, message))
+                color, ircTimestamp(), indicator, message))
     
     def __appendMessage(self, message):
         """
@@ -1201,7 +1202,7 @@
                 "",
                 self.trUtf8(
                     "HTML Files (*.{0});;Text Files (*.txt);;All Files (*)")
-                    .format(htmlExtension),
+                .format(htmlExtension),
                 None,
                 E5FileDialog.Options(E5FileDialog.DontConfirmOverwrite))
             if fname:
@@ -1237,7 +1238,7 @@
                         self.trUtf8(
                             """<p>The messages contents could not be written"""
                             """ to <b>{0}</b></p><p>Reason: {1}</p>""")
-                            .format(fname, str(err)))
+                        .format(fname, str(err)))
     
     def __initMessagesMenu(self):
         """
@@ -1415,7 +1416,7 @@
                 self.__addManagementMessage(
                     self.trUtf8("Who"),
                     self.trUtf8("End of WHO list for {0}.").format(
-                    match.group(1)))
+                        match.group(1)))
             return True
         
         return False
@@ -1490,7 +1491,7 @@
                 if channel.startswith(("*", "&")):
                     adminChannels.append(channel[1:])
                 elif channel.startswith(("!", "~")) and \
-                     self.__ircWidget.isChannelName(channel[1:]):
+                        self.__ircWidget.isChannelName(channel[1:]):
                     ownerChannels.append(channel[1:])
                 elif channel.startswith("@+"):
                     opChannels.append(channel[2:])
@@ -1508,32 +1509,32 @@
                 self.__addManagementMessage(
                     self.trUtf8("Whois"),
                     self.trUtf8("{0} is a user on channels: {1}").format(
-                    match.group(1), " ".join(userChannels)))
+                        match.group(1), " ".join(userChannels)))
             if voiceChannels:
                 self.__addManagementMessage(
                     self.trUtf8("Whois"),
                     self.trUtf8("{0} has voice on channels: {1}").format(
-                    match.group(1), " ".join(voiceChannels)))
+                        match.group(1), " ".join(voiceChannels)))
             if halfopChannels:
                 self.__addManagementMessage(
                     self.trUtf8("Whois"),
                     self.trUtf8("{0} is a halfop on channels: {1}").format(
-                    match.group(1), " ".join(halfopChannels)))
+                        match.group(1), " ".join(halfopChannels)))
             if opChannels:
                 self.__addManagementMessage(
                     self.trUtf8("Whois"),
                     self.trUtf8("{0} is an operator on channels: {1}").format(
-                    match.group(1), " ".join(opChannels)))
+                        match.group(1), " ".join(opChannels)))
             if ownerChannels:
                 self.__addManagementMessage(
                     self.trUtf8("Whois"),
                     self.trUtf8("{0} is owner of channels: {1}").format(
-                    match.group(1), " ".join(ownerChannels)))
+                        match.group(1), " ".join(ownerChannels)))
             if adminChannels:
                 self.__addManagementMessage(
                     self.trUtf8("Whois"),
                     self.trUtf8("{0} is admin on channels: {1}").format(
-                    match.group(1), " ".join(adminChannels)))
+                        match.group(1), " ".join(adminChannels)))
             return True
         
         return False
@@ -1620,19 +1621,22 @@
                 secondsString = self.trUtf8("%n second(s)", "", seconds)
                 self.__addManagementMessage(
                     self.trUtf8("Whois"),
-                    self.trUtf8("{0} has been idle for {1}, {2}, and {3}.",
-                                "{0} = name of person, {1} = (x hours), "
-                                "{2} = (x minutes), {3} = (x seconds)").format(
-                    match.group(1), hoursString, minutesString, secondsString))
+                    self.trUtf8(
+                        "{0} has been idle for {1}, {2}, and {3}.",
+                        "{0} = name of person, {1} = (x hours), "
+                        "{2} = (x minutes), {3} = (x seconds)")
+                    .format(match.group(1), hoursString, minutesString,
+                            secondsString))
             elif minutes:
                 minutesString = self.trUtf8("%n minute(s)", "", minutes)
                 secondsString = self.trUtf8("%n second(s)", "", seconds)
                 self.__addManagementMessage(
                     self.trUtf8("Whois"),
-                    self.trUtf8("{0} has been idle for {1} and {2}.",
-                                "{0} = name of person, {1} = (x minutes), "
-                                "{3} = (x seconds)").format(
-                    match.group(1), minutesString, secondsString))
+                    self.trUtf8(
+                        "{0} has been idle for {1} and {2}.",
+                        "{0} = name of person, {1} = (x minutes), "
+                        "{3} = (x seconds)")
+                    .format(match.group(1), minutesString, secondsString))
             else:
                 self.__addManagementMessage(
                     self.trUtf8("Whois"),
@@ -1644,8 +1648,8 @@
                 self.__addManagementMessage(
                     self.trUtf8("Whois"),
                     self.trUtf8("{0} has been online since {1}.").format(
-                    match.group(1),
-                    signonTime.toString("yyyy-MM-dd, hh:mm:ss")))
+                        match.group(1),
+                        signonTime.toString("yyyy-MM-dd, hh:mm:ss")))
             return True
         
         return False
@@ -1774,7 +1778,7 @@
             self.__addManagementMessage(
                 self.trUtf8("Whois"),
                 self.trUtf8("{0} is connecting from {1} (IP: {2}).").format(
-                match.group(1), match.group(2), match.group(3)))
+                    match.group(1), match.group(2), match.group(3)))
             return True
         
         return False
--- a/Network/IRC/IrcIdentitiesEditDialog.py	Fri Nov 01 15:48:48 2013 +0100
+++ b/Network/IRC/IrcIdentitiesEditDialog.py	Sun Nov 03 15:58:22 2013 +0100
@@ -90,7 +90,7 @@
         """
         Private slot to update the status of the identity related buttons.
         """
-        enable = (self.identitiesCombo.currentText() != 
+        enable = (self.identitiesCombo.currentText() !=
                   IrcIdentity.DefaultIdentityDisplay)
         self.renameButton.setEnabled(enable)
         self.deleteButton.setEnabled(enable)
@@ -327,7 +327,7 @@
         for networkName in self.__manager.getNetworkNames():
             inUse = (
                 self.__manager.getNetwork(networkName).getIdentityName() ==
-                    currentIdentity)
+                currentIdentity)
             if inUse:
                 break
         
--- a/Network/IRC/IrcNetworkEditDialog.py	Fri Nov 01 15:48:48 2013 +0100
+++ b/Network/IRC/IrcNetworkEditDialog.py	Sun Nov 03 15:58:22 2013 +0100
@@ -188,7 +188,7 @@
                 self.trUtf8("Delete Channel"),
                 self.trUtf8(
                     """Do you really want to delete channel <b>{0}</b>?""")
-                    .format(itm.text(0)))
+                .format(itm.text(0)))
             if res:
                 self.__network.deleteChannel(itm.text(0))
                 
--- a/Network/IRC/IrcNetworkListDialog.py	Fri Nov 01 15:48:48 2013 +0100
+++ b/Network/IRC/IrcNetworkListDialog.py	Sun Nov 03 15:58:22 2013 +0100
@@ -83,7 +83,7 @@
         if identityName == IrcIdentity.DefaultIdentityName:
             identityName = IrcIdentity.DefaultIdentityDisplay
         autoConnect = self.trUtf8("Yes") if network.autoConnect() \
-                      else self.trUtf8("No")
+            else self.trUtf8("No")
         
         QTreeWidgetItem(
             itm,
@@ -165,7 +165,7 @@
                 self.trUtf8("Delete Irc Network"),
                 self.trUtf8(
                     """Do you really want to delete IRC network <b>{0}</b>?""")
-                    .format(networkName))
+                .format(networkName))
             if res:
                 index = self.networksList.indexOfTopLevelItem(itm)
                 self.networksList.takeTopLevelItem(index)
--- a/Network/IRC/IrcNetworkWidget.py	Fri Nov 01 15:48:48 2013 +0100
+++ b/Network/IRC/IrcNetworkWidget.py	Sun Nov 03 15:58:22 2013 +0100
@@ -375,7 +375,7 @@
                 "",
                 self.trUtf8(
                     "HTML Files (*.{0});;Text Files (*.txt);;All Files (*)")
-                    .format(htmlExtension),
+                .format(htmlExtension),
                 None,
                 E5FileDialog.Options(E5FileDialog.DontConfirmOverwrite))
             if fname:
@@ -410,8 +410,8 @@
                         self.trUtf8("Error saving Messages"),
                         self.trUtf8(
                             """<p>The messages contents could not be written"""
-                            """ to <b>{0}</b></p><p>Reason: {1}</p>""")\
-                            .format(fname, str(err)))
+                            """ to <b>{0}</b></p><p>Reason: {1}</p>""")
+                        .format(fname, str(err)))
     
     def __initMessagesMenu(self):
         """
--- a/Network/IRC/IrcUtilities.py	Fri Nov 01 15:48:48 2013 +0100
+++ b/Network/IRC/IrcUtilities.py	Sun Nov 03 15:58:22 2013 +0100
@@ -115,8 +115,8 @@
                         tag = '<span style="background-color:{0};color={1}">'\
                             .format(Preferences.getIrc(
                                 "IrcColor{0}".format(int(colors[0]))),
-                                    Preferences.getIrc(
-                                "IrcColor{0}".format(int(colors[1]))))
+                                Preferences.getIrc(
+                                    "IrcColor{0}".format(int(colors[1]))))
                     else:
                         # background only
                         tag = '<span style="background-color:{0}">'.format(
--- a/Network/IRC/IrcWidget.py	Fri Nov 01 15:48:48 2013 +0100
+++ b/Network/IRC/IrcWidget.py	Sun Nov 03 15:58:22 2013 +0100
@@ -243,8 +243,8 @@
                     self.trUtf8("Disconnect from Server"),
                     self.trUtf8("""<p>Do you really want to disconnect from"""
                                 """ <b>{0}</b>?</p><p>All channels will be"""
-                                """ closed.</p>""")\
-                        .format(self.__server.getName()))
+                                """ closed.</p>""")
+                    .format(self.__server.getName()))
             if ok:
                 self.networkWidget.addServerMessage(
                     self.trUtf8("Info"),
@@ -600,7 +600,7 @@
             else:
                 self.networkWidget.addMessage(
                     self.trUtf8("User {0} is now known as {1}.").format(
-                    oldNick, newNick))
+                        oldNick, newNick))
             return True
         elif name == "ERROR":
             self.networkWidget.addErrorMessage(
@@ -675,18 +675,18 @@
             parts = message.strip().split()
             message = self.trUtf8(
                 "Server {0} (Version {1}), User-Modes: {2},"
-                " Channel-Modes: {3}").format(
-                    parts[1], parts[2], parts[3], parts[4])
+                " Channel-Modes: {3}")\
+                .format(parts[1], parts[2], parts[3], parts[4])
         elif code == 265:
             parts = message.strip().split()
             message = self.trUtf8(
                 "Current users on {0}: {1}, max. {2}").format(
-                    server, parts[1], parts[2])
+                server, parts[1], parts[2])
         elif code == 266:
             parts = message.strip().split()
             message = self.trUtf8(
                 "Current users on the network: {0}, max. {1}").format(
-                    parts[1], parts[2])
+                parts[1], parts[2])
         elif code == 305:
             message = self.trUtf8("You are no longer marked as being away.")
         elif code == 306:
@@ -801,8 +801,8 @@
                     """Could not connect to {0} (port {1}) using an SSL"""
                     """ encrypted connection. Either the server does not"""
                     """ support SSL (did you use the correct port?) or"""
-                    """ you rejected the certificate.""").format(
-                self.__server.getName(), self.__server.getPort()))
+                    """ you rejected the certificate.""")
+                .format(self.__server.getName(), self.__server.getPort()))
             self.__socket.close()
         else:
             if defaultChanged:
@@ -814,8 +814,8 @@
                     self.trUtf8(
                         """The SSL certificate for the server {0} (port {1})"""
                         """ failed the authenticity check. SSL errors"""
-                        """ were accepted by you.""").format(
-                    self.__server.getName(), self.__server.getPort()))
+                        """ were accepted by you.""")
+                    .format(self.__server.getName(), self.__server.getPort()))
             if self.__connectionState == IrcWidget.ServerConnecting:
                 self.__socket.ignoreSslErrors()
     
@@ -893,8 +893,8 @@
                 self.networkWidget.addServerMessage(
                     self.trUtf8("CTCP"),
                     self.trUtf8(
-                        "Received unknown CTCP-{0} request from {1}.").format(
-                    ctcpRequest, match.group(1)))
+                        "Received unknown CTCP-{0} request from {1}.")
+                    .format(ctcpRequest, match.group(1)))
             return True
         
         return False
@@ -908,7 +908,7 @@
             self.channelsWidget.setTabText(
                 index,
                 self.trUtf8("{0} ({1})", "channel name, users count").format(
-                channel.name(), channel.getUsersCount()))
+                    channel.name(), channel.getUsersCount()))
     
     def __handleNickInUseLogin(self):
         """
@@ -924,8 +924,8 @@
                 self.trUtf8("Critical"),
                 self.trUtf8(
                     "No nickname acceptable to the server configured"
-                    " for <b>{0}</b>. Disconnecting...").format(
-                        self.__userName),
+                    " for <b>{0}</b>. Disconnecting...")
+                .format(self.__userName),
                 filterMsg=False)
             self.__connectNetwork("", False, silent=True)
             self.__nickName = ""
--- a/PluginManager/PluginInfoDialog.py	Fri Nov 01 15:48:48 2013 +0100
+++ b/PluginManager/PluginInfoDialog.py	Sun Nov 03 15:58:22 2013 +0100
@@ -95,7 +95,7 @@
         """
         itm = self.pluginList.itemAt(coord)
         if itm is not None:
-            autoactivate = (itm.text(self.__autoActivateColumn) == 
+            autoactivate = (itm.text(self.__autoActivateColumn) ==
                             self.trUtf8("Yes"))
             if itm.text(self.__activeColumn) == self.trUtf8("Yes"):
                 self.__activateAct.setEnabled(False)
--- a/PluginManager/PluginInstallDialog.py	Fri Nov 01 15:48:48 2013 +0100
+++ b/PluginManager/PluginInstallDialog.py	Sun Nov 03 15:58:22 2013 +0100
@@ -148,7 +148,7 @@
                         self.destinationCombo.currentText(),
                         self.destinationCombo.itemData(
                             self.destinationCombo.currentIndex())
-                )
+                        )
             self.summaryEdit.setPlainText(msg)
     
     @pyqtSlot()
@@ -350,7 +350,7 @@
                 self.trUtf8(
                     """<p>The plugin module <b>{0}</b> does not contain """
                     """a 'packageName' attribute. Aborting...</p>""")\
-                    .format(pluginFileName), \
+                .format(pluginFileName), \
                 False
         
         if pyqtApi < 2:
@@ -358,7 +358,7 @@
                 self.trUtf8(
                     """<p>The plugin module <b>{0}</b> does not conform"""
                     """ with the PyQt v2 API. Aborting...</p>""")\
-                    .format(pluginFileName), \
+                .format(pluginFileName), \
                 False
         
         # check, if it is a plugin, that collides with others
@@ -385,7 +385,7 @@
             activatePlugin = \
                 not self.__pluginManager.isPluginLoaded(
                     installedPluginName) or \
-                (self.__pluginManager.isPluginLoaded(installedPluginName) and \
+                (self.__pluginManager.isPluginLoaded(installedPluginName) and
                  self.__pluginManager.isPluginActive(installedPluginName))
             # try to unload a plugin with the same name
             self.__pluginManager.unloadPlugin(installedPluginName)
--- a/PluginManager/PluginManager.py	Fri Nov 01 15:48:48 2013 +0100
+++ b/PluginManager/PluginManager.py	Sun Nov 03 15:58:22 2013 +0100
@@ -82,7 +82,7 @@
         self.pluginDirs = {
             "eric5": os.path.join(getConfig('ericDir'), "Plugins"),
             "global": os.path.join(Utilities.getPythonModulesDirectory(),
-                                    "eric5plugins"),
+                                   "eric5plugins"),
             "user": os.path.join(Utilities.getConfigDir(), "eric5plugins"),
         }
         self.__priorityOrder = ["eric5", "global", "user"]
@@ -125,7 +125,7 @@
         Public method to finalize the setup of the plugin manager.
         """
         for module in list(self.__onDemandInactiveModules.values()) + \
-                      list(self.__onDemandActiveModules.values()):
+                list(self.__onDemandActiveModules.values()):
             if hasattr(module, "moduleSetup"):
                 module.moduleSetup()
         
@@ -163,7 +163,7 @@
                 except IOError:
                     return (
                         False,
-                        self.trUtf8("Could not create a package for {0}.")\
+                        self.trUtf8("Could not create a package for {0}.")
                             .format(self.__develPluginFile))
         
         if Preferences.getPluginManager("ActivateExternal"):
@@ -223,7 +223,7 @@
             self.__foundUserModules = \
                 self.getPluginModules(self.pluginDirs["user"])
         
-        return len(self.__foundCoreModules + self.__foundGlobalModules + \
+        return len(self.__foundCoreModules + self.__foundGlobalModules +
                    self.__foundUserModules) > 0
     
     def getPluginModules(self, pluginPath):
@@ -233,7 +233,7 @@
         @param pluginPath name of the path to search (string)
         @return list of plugin module names (list of string)
         """
-        pluginFiles = [f[:-3] for f in os.listdir(pluginPath) \
+        pluginFiles = [f[:-3] for f in os.listdir(pluginPath)
                        if self.isValidPluginName(f)]
         return pluginFiles[:]
     
@@ -771,7 +771,7 @@
         
         for name, module in \
             list(self.__onDemandActiveModules.items()) + \
-            list(self.__onDemandInactiveModules.items()):
+                list(self.__onDemandInactiveModules.items()):
             if getattr(module, "pluginType") == type_ and \
                getattr(module, "error", "") == "":
                 plugin_name = getattr(module, "pluginTypename")
@@ -797,7 +797,7 @@
         """
         for modname, module in \
             list(self.__onDemandActiveModules.items()) + \
-            list(self.__onDemandInactiveModules.items()):
+                list(self.__onDemandInactiveModules.items()):
             if getattr(module, "pluginType") == type_ and \
                getattr(module, "pluginTypename") == name:
                 if hasattr(module, "previewPix"):
@@ -817,7 +817,7 @@
         apis = []
         
         for module in list(self.__activeModules.values()) + \
-                      list(self.__onDemandActiveModules.values()):
+                list(self.__onDemandActiveModules.values()):
             if hasattr(module, "apiFiles"):
                 apis.extend(module.apiFiles(language))
         
@@ -860,13 +860,13 @@
         infos = []
         
         for module in list(self.__activeModules.values()) + \
-                      list(self.__inactiveModules.values()):
+                list(self.__inactiveModules.values()):
             if hasattr(module, "exeDisplayDataList"):
                 infos.extend(module.exeDisplayDataList())
             elif hasattr(module, "exeDisplayData"):
                 infos.append(module.exeDisplayData())
         for module in list(self.__onDemandActiveModules.values()) + \
-                      list(self.__onDemandInactiveModules.values()):
+                list(self.__onDemandInactiveModules.values()):
             if hasattr(module, "exeDisplayDataList"):
                 infos.extend(module.exeDisplayDataList())
             elif hasattr(module, "exeDisplayData"):
@@ -908,8 +908,8 @@
         """
         configData = {}
         for module in list(self.__activeModules.values()) + \
-                      list(self.__onDemandActiveModules.values()) + \
-                      list(self.__onDemandInactiveModules.values()):
+            list(self.__onDemandActiveModules.values()) + \
+                list(self.__onDemandInactiveModules.values()):
             if hasattr(module, 'getConfigData'):
                 configData.update(module.getConfigData())
         return configData
@@ -922,9 +922,9 @@
         @return flag indicating, if the plugin is loaded (boolean)
         """
         return pluginName in self.__activeModules or \
-               pluginName in self.__inactiveModules or \
-               pluginName in self.__onDemandActiveModules or \
-               pluginName in self.__onDemandInactiveModules
+            pluginName in self.__inactiveModules or \
+            pluginName in self.__onDemandActiveModules or \
+            pluginName in self.__onDemandInactiveModules
         
     def isPluginActive(self, pluginName):
         """
@@ -934,7 +934,7 @@
         @return flag indicating, if the plugin is active (boolean)
         """
         return pluginName in self.__activeModules or \
-               pluginName in self.__onDemandActiveModules
+            pluginName in self.__onDemandActiveModules
     
     ###########################################################################
     ## Specialized plugin module handling methods below
@@ -960,7 +960,7 @@
         
         for name, module in \
             list(self.__onDemandActiveModules.items()) + \
-            list(self.__onDemandInactiveModules.items()):
+                list(self.__onDemandInactiveModules.items()):
             if getattr(module, "pluginType") == "version_control":
                 if hasattr(module, "getVcsSystemIndicator"):
                     res = module.getVcsSystemIndicator()
@@ -1007,7 +1007,7 @@
                                 """ <b>{0}</b> could not be created. Please"""
                                 """ configure it via the configuration"""
                                 """ dialog.</p><p>Reason: {1}</p>""")
-                                .format(downloadDir, str(err)))
+                            .format(downloadDir, str(err)))
                         downloadDir = ""
         
         Preferences.setPluginManager("DownloadPath", downloadDir)
--- a/PluginManager/PluginRepositoryDialog.py	Fri Nov 01 15:48:48 2013 +0100
+++ b/PluginManager/PluginRepositoryDialog.py	Sun Nov 03 15:58:22 2013 +0100
@@ -172,7 +172,7 @@
         
         self.urlEdit.setText(current.data(0, urlRole) or "")
         self.descriptionEdit.setPlainText(
-            current.data(0, descrRole) and \
+            current.data(0, descrRole) and
             self.__formatDescription(current.data(0, descrRole)) or "")
         self.authorEdit.setText(current.data(0, authorRole) or "")
     
@@ -337,15 +337,15 @@
                     self,
                     self.trUtf8("Read plugins repository file"),
                     self.trUtf8("<p>The plugins repository file <b>{0}</b> "
-                                "could not be read. Select Update</p>")\
-                        .format(self.pluginRepositoryFile))
+                                "could not be read. Select Update</p>")
+                    .format(self.pluginRepositoryFile))
         else:
             self.__repositoryMissing = True
             QTreeWidgetItem(
                 self.repositoryList,
                 ["", self.trUtf8(
                     "No plugin repository file available.\nSelect Update.")
-                ])
+                 ])
             self.repositoryList.resizeColumnToContents(1)
     
     def __downloadFile(self, url, filename, doneMethod=None):
--- a/PluginManager/PluginUninstallDialog.py	Fri Nov 01 15:48:48 2013 +0100
+++ b/PluginManager/PluginUninstallDialog.py	Sun Nov 03 15:58:22 2013 +0100
@@ -71,8 +71,7 @@
         
         @param index index of the selected item (integer)
         """
-        pluginDirectory = self.pluginDirectoryCombo\
-                .itemData(index)
+        pluginDirectory = self.pluginDirectoryCombo.itemData(index)
         pluginNames = sorted(self.__pluginManager.getPluginModules(
             pluginDirectory))
         self.pluginNameCombo.clear()
@@ -97,10 +96,10 @@
         @return flag indicating success (boolean)
         """
         pluginDirectory = self.pluginDirectoryCombo\
-                .itemData(self.pluginDirectoryCombo.currentIndex())
+            .itemData(self.pluginDirectoryCombo.currentIndex())
         pluginName = self.pluginNameCombo.currentText()
         pluginFile = self.pluginNameCombo\
-                .itemData(self.pluginNameCombo.currentIndex())
+            .itemData(self.pluginNameCombo.currentIndex())
         
         if not self.__pluginManager.unloadPlugin(pluginName):
             E5MessageBox.critical(
@@ -134,7 +133,7 @@
         internalPackages = []
         if hasattr(module, "internalPackages"):
             # it is a comma separated string
-            internalPackages = [p.strip() for p in 
+            internalPackages = [p.strip() for p in
                                 module.internalPackages.split(",")]
         del module
         
@@ -185,7 +184,7 @@
                     self.trUtf8("Plugin Uninstallation"),
                     self.trUtf8(
                         """<p>The plugin <b>{0}</b> was uninstalled"""
-                        """ successfully from {1}.</p>""")\
+                        """ successfully from {1}.</p>""")
                     .format(pluginName, pluginDirectory))
                 return True
         
@@ -194,8 +193,8 @@
             self.trUtf8("Plugin Uninstallation"),
             self.trUtf8(
                 """<p>The plugin <b>{0}</b> was uninstalled successfully"""
-                """ from {1}.</p>""")\
-                .format(pluginName, pluginDirectory))
+                """ from {1}.</p>""")
+            .format(pluginName, pluginDirectory))
         return True
 
 
--- a/Plugins/AboutPlugin/AboutDialog.py	Fri Nov 01 15:48:48 2013 +0100
+++ b/Plugins/AboutPlugin/AboutDialog.py	Sun Nov 03 15:58:22 2013 +0100
@@ -727,7 +727,8 @@
 Program, unless a warranty or assumption of liability accompanies a
 copy of the Program in return for a fee.
 
-                     END OF TERMS AND CONDITIONS""".format(UI.Info.Copyright)
+                     END OF TERMS AND CONDITIONS""" \
+.format(UI.Info.Copyright)                  # __IGNORE_WARNING__
 
 
 class AboutDialog(QDialog, Ui_AboutDialog):
--- a/Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleChecker.py	Fri Nov 01 15:48:48 2013 +0100
+++ b/Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleChecker.py	Sun Nov 03 15:58:22 2013 +0100
@@ -59,8 +59,7 @@
         interpreter = Preferences.getDebugger("PythonInterpreter")
         if interpreter == "" or not Utilities.isExecutable(interpreter):
             self.errors.append(
-                (filename, 1, 1,
-                 QCoreApplication.translate(
+                (filename, 1, 1, QCoreApplication.translate(
                     "CodeStyleCheckerPy2",
                     "Python2 interpreter not configured.")))
             return
@@ -93,8 +92,8 @@
         if finished:
             output = \
                 str(proc.readAllStandardOutput(),
-                        Preferences.getSystem("IOEncoding"),
-                        'replace').splitlines()
+                    Preferences.getSystem("IOEncoding"),
+                    'replace').splitlines()
             if output[0] == "ERROR":
                 self.errors.append((filename, 1, 1, output[2]))
                 return
@@ -133,7 +132,6 @@
                 index += 1
         else:
             self.errors.append(
-                (filename, 1, 1,
-                 QCoreApplication.translate(
+                (filename, 1, 1, QCoreApplication.translate(
                     "CodeStyleCheckerPy2",
                     "Python2 interpreter did not finish within 15s.")))
--- a/Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py	Fri Nov 01 15:48:48 2013 +0100
+++ b/Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py	Sun Nov 03 15:58:22 2013 +0100
@@ -132,7 +132,7 @@
         """
         self.resultList.sortItems(self.resultList.sortColumn(),
                                   self.resultList.header().sortIndicatorOrder()
-                                 )
+                                  )
     
     def __createResultItem(self, file, line, pos, message, fixed, autofixing):
         """
@@ -348,10 +348,10 @@
                     [f for f in files
                      if not fnmatch.fnmatch(f, filter.strip())]
         
-        py3files = [f for f in files \
+        py3files = [f for f in files
                     if f.endswith(
                         tuple(Preferences.getPython("Python3Extensions")))]
-        py2files = [f for f in files \
+        py2files = [f for f in files
                     if f.endswith(
                         tuple(Preferences.getPython("PythonExtensions")))]
         
@@ -398,8 +398,8 @@
                         self.noResults = False
                         self.__createResultItem(
                             file, 1, 1,
-                            self.trUtf8("Error: {0}").format(str(msg))\
-                                .rstrip()[1:-1], False, False)
+                            self.trUtf8("Error: {0}").format(str(msg))
+                            .rstrip()[1:-1], False, False)
                         progress += 1
                         continue
                     
@@ -416,10 +416,10 @@
                     if ("FileType" in flags and
                         flags["FileType"] in ["Python", "Python2"]) or \
                        file in py2files or \
-                       (ext in [".py", ".pyw"] and \
-                        Preferences.getProject("DeterminePyFromProject") and \
-                        self.__project.isOpen() and \
-                        self.__project.isProjectFile(file) and \
+                       (ext in [".py", ".pyw"] and
+                        Preferences.getProject("DeterminePyFromProject") and
+                        self.__project.isOpen() and
+                        self.__project.isProjectFile(file) and
                         self.__project.getProjectLanguage() in ["Python",
                                                                 "Python2"]):
                         from .CodeStyleChecker import CodeStyleCheckerPy2
@@ -436,12 +436,12 @@
                         stats.update(report.counters)
                     else:
                         if includeMessages:
-                            select = [s.strip() for s in 
+                            select = [s.strip() for s in
                                       includeMessages.split(',') if s.strip()]
                         else:
                             select = []
                         if excludeMessages:
-                            ignore = [i.strip() for i in 
+                            ignore = [i.strip() for i in
                                       excludeMessages.split(',') if i.strip()]
                         else:
                             ignore = []
@@ -685,7 +685,8 @@
                 citm = itm.child(cindex)
                 lineno = citm.data(0, self.lineRole)
                 message = citm.data(0, self.messageRole)
-                editor.toggleFlakesWarning(lineno, True, message)
+                editor.toggleFlakesWarning(
+                    lineno, True, message, warningType=editor.WarningStyle)
         
         # go through the list again to clear warning markers for files,
         # that are ok
@@ -825,7 +826,7 @@
             fixesDict[filename].append((
                 (itm.data(0, self.lineRole),
                  itm.data(0, self.positionRole),
-                 "{0} {1}".format(itm.data(0, self.codeRole), 
+                 "{0} {1}".format(itm.data(0, self.codeRole),
                                   itm.data(0, self.messageRole))),
                 itm
             ))
--- a/Plugins/CheckerPlugins/CodeStyleChecker/DocStyleChecker.py	Fri Nov 01 15:48:48 2013 +0100
+++ b/Plugins/CheckerPlugins/CodeStyleChecker/DocStyleChecker.py	Sun Nov 03 15:58:22 2013 +0100
@@ -709,7 +709,7 @@
                         endLine = classContext.start() + end[0]
                         contexts.append(DocStyleContext(
                             self.__source[startLine:endLine],
-                                          startLine, "def"))
+                            startLine, "def"))
                 except StopIteration:
                     pass
             self.__methodsCache = contexts
--- a/Plugins/CheckerPlugins/SyntaxChecker/SyntaxCheckerDialog.py	Fri Nov 01 15:48:48 2013 +0100
+++ b/Plugins/CheckerPlugins/SyntaxChecker/SyntaxCheckerDialog.py	Sun Nov 03 15:58:22 2013 +0100
@@ -68,7 +68,7 @@
         """
         self.resultList.sortItems(self.resultList.sortColumn(),
                                   self.resultList.header().sortIndicatorOrder()
-                                 )
+                                  )
         
     def __createResultItem(self, file, line, index, error, sourcecode,
                            isWarning=False):
@@ -180,8 +180,8 @@
                         self.noResults = False
                         self.__createResultItem(
                             file, 1, 0,
-                            self.trUtf8("Error: {0}").format(str(msg))\
-                                .rstrip()[1:-1], "")
+                            self.trUtf8("Error: {0}").format(str(msg))
+                            .rstrip()[1:-1], "")
                         progress += 1
                         continue
                 
@@ -190,7 +190,7 @@
                 if "FileType" in flags:
                     isPy2 = flags["FileType"] in ["Python", "Python2"]
                 elif (Preferences.getProject("DeterminePyFromProject") and \
-                    self.__project.isOpen() and \
+                    self.__project.isOpen() and
                     self.__project.isProjectFile(file)):
                         isPy2 = self.__project.getProjectLanguage() in \
                             ["Python", "Python2"]
--- a/Plugins/CheckerPlugins/Tabnanny/Tabnanny.py	Fri Nov 01 15:48:48 2013 +0100
+++ b/Plugins/CheckerPlugins/Tabnanny/Tabnanny.py	Sun Nov 03 15:58:22 2013 +0100
@@ -270,8 +270,8 @@
         for ts in range(1, n + 1):
             if self.indent_level(ts) != other.indent_level(ts):
                 a.append((ts,
-                           self.indent_level(ts),
-                           other.indent_level(ts)))
+                         self.indent_level(ts),
+                         other.indent_level(ts)))
         return a
 
     # Return True iff self.indent_level(t) < other.indent_level(t)
@@ -328,8 +328,8 @@
         for ts in range(1, n + 1):
             if self.indent_level(ts) >= other.indent_level(ts):
                 a.append((ts,
-                           self.indent_level(ts),
-                           other.indent_level(ts)))
+                         self.indent_level(ts),
+                         other.indent_level(ts)))
         return a
 
 
--- a/Plugins/PluginAbout.py	Fri Nov 01 15:48:48 2013 +0100
+++ b/Plugins/PluginAbout.py	Sun Nov 03 15:58:22 2013 +0100
@@ -85,7 +85,7 @@
         self.aboutAct.setWhatsThis(self.trUtf8(
             """<b>About {0}</b>"""
             """<p>Display some information about this software.</p>"""
-                             ).format(UI.Info.Program))
+        ).format(UI.Info.Program))
         self.aboutAct.triggered[()].connect(self.__about)
         self.aboutAct.setMenuRole(QAction.AboutRole)
         acts.append(self.aboutAct)
--- a/Plugins/PluginEricapi.py	Fri Nov 01 15:48:48 2013 +0100
+++ b/Plugins/PluginEricapi.py	Sun Nov 03 15:58:22 2013 +0100
@@ -32,8 +32,8 @@
 packageName = "__core__"
 shortDescription = "Show the Ericapi dialogs."
 longDescription = """This plugin implements the Ericapi dialogs.""" \
- """ Ericapi is used to generate a QScintilla API file for Python and Ruby"""\
- """ projects."""
+    """ Ericapi is used to generate a QScintilla API file for Python and""" \
+    """ Ruby projects."""
 pyqtApi = 2
 # End-Of-Header
 
@@ -136,8 +136,8 @@
         if menuName == "Apidoc":
             if self.__projectAct is not None:
                 self.__projectAct.setEnabled(
-                    e5App().getObject("Project").getProjectLanguage() in \
-                        ["Python", "Python2", "Python3", "Ruby"])
+                    e5App().getObject("Project").getProjectLanguage() in
+                    ["Python", "Python2", "Python3", "Ruby"])
     
     def __doEricapi(self):
         """
--- a/Plugins/PluginEricdoc.py	Fri Nov 01 15:48:48 2013 +0100
+++ b/Plugins/PluginEricdoc.py	Sun Nov 03 15:58:22 2013 +0100
@@ -32,8 +32,8 @@
 packageName = "__core__"
 shortDescription = "Show the Ericdoc dialogs."
 longDescription = """This plugin implements the Ericdoc dialogs.""" \
- """ Ericdoc is used to generate a source code documentation""" \
- """ for Python and Ruby projects."""
+    """ Ericdoc is used to generate a source code documentation""" \
+    """ for Python and Ruby projects."""
 pyqtApi = 2
 # End-Of-Header
 
@@ -171,8 +171,8 @@
         if menuName == "Apidoc":
             if self.__projectAct is not None:
                 self.__projectAct.setEnabled(
-                    e5App().getObject("Project").getProjectLanguage() in \
-                        ["Python", "Python2", "Python3", "Ruby"])
+                    e5App().getObject("Project").getProjectLanguage() in
+                    ["Python", "Python2", "Python3", "Ruby"])
     
     def __doEricdoc(self):
         """
--- a/Plugins/PluginSyntaxChecker.py	Fri Nov 01 15:48:48 2013 +0100
+++ b/Plugins/PluginSyntaxChecker.py	Sun Nov 03 15:58:22 2013 +0100
@@ -29,7 +29,8 @@
 packageName = "__core__"
 shortDescription = "Show the Syntax Checker dialog."
 longDescription = """This plugin implements the Syntax Checker dialog.""" \
- """ Syntax Checker is used to check Python source files for correct syntax."""
+    """ Syntax Checker is used to check Python source files for correct""" \
+    """ syntax."""
 pyqtApi = 2
 # End-Of-Header
 
@@ -92,8 +93,8 @@
             self.trUtf8('&Syntax...'), 0, 0,
             self, "")
         self.__editorAct.setWhatsThis(self.trUtf8(
-                """<b>Check Syntax...</b>"""
-                """<p>This checks Python files for syntax errors.</p>"""
+            """<b>Check Syntax...</b>"""
+            """<p>This checks Python files for syntax errors.</p>"""
         ))
         self.__editorAct.triggered[()].connect(self.__editorSyntaxCheck)
         
@@ -150,8 +151,8 @@
         """
         if menuName == "Checks" and self.__projectAct is not None:
             self.__projectAct.setEnabled(
-                e5App().getObject("Project").getProjectLanguage() in \
-                    ["Python3", "Python2", "Python"])
+                e5App().getObject("Project").getProjectLanguage() in
+                ["Python3", "Python2", "Python"])
     
     def __projectBrowserShowMenu(self, menuName, menu):
         """
@@ -186,11 +187,11 @@
         project = e5App().getObject("Project")
         project.saveAllScripts()
         ppath = project.getProjectPath()
-        files = [os.path.join(ppath, file) \
-                 for file in project.pdata["SOURCES"] \
+        files = [os.path.join(ppath, file)
+                 for file in project.pdata["SOURCES"]
                  if file.endswith(
-                    tuple(Preferences.getPython("Python3Extensions")) +
-                    tuple(Preferences.getPython("PythonExtensions")))]
+                     tuple(Preferences.getPython("Python3Extensions")) +
+                     tuple(Preferences.getPython("PythonExtensions")))]
         
         from CheckerPlugins.SyntaxChecker.SyntaxCheckerDialog import \
             SyntaxCheckerDialog
--- a/Plugins/PluginTabnanny.py	Fri Nov 01 15:48:48 2013 +0100
+++ b/Plugins/PluginTabnanny.py	Sun Nov 03 15:58:22 2013 +0100
@@ -29,7 +29,8 @@
 packageName = "__core__"
 shortDescription = "Show the Tabnanny dialog."
 longDescription = """This plugin implements the Tabnanny dialog.""" \
- """ Tabnanny is used to check Python source files for correct indentations."""
+    """ Tabnanny is used to check Python source files for correct""" \
+    """ indentations."""
 pyqtApi = 2
 # End-Of-Header
 
@@ -152,8 +153,8 @@
         """
         if menuName == "Checks" and self.__projectAct is not None:
             self.__projectAct.setEnabled(
-                e5App().getObject("Project").getProjectLanguage() in \
-                    ["Python3", "Python2", "Python"])
+                e5App().getObject("Project").getProjectLanguage() in
+                ["Python3", "Python2", "Python"])
     
     def __projectBrowserShowMenu(self, menuName, menu):
         """
@@ -189,11 +190,11 @@
         project = e5App().getObject("Project")
         project.saveAllScripts()
         ppath = project.getProjectPath()
-        files = [os.path.join(ppath, file) \
-                 for file in project.pdata["SOURCES"] \
+        files = [os.path.join(ppath, file)
+                 for file in project.pdata["SOURCES"]
                  if file.endswith(
-                    tuple(Preferences.getPython("Python3Extensions")) +
-                    tuple(Preferences.getPython("PythonExtensions")))]
+                     tuple(Preferences.getPython("Python3Extensions")) +
+                     tuple(Preferences.getPython("PythonExtensions")))]
         
         from CheckerPlugins.Tabnanny.TabnannyDialog import TabnannyDialog
         self.__projectTabnannyDialog = TabnannyDialog()
--- a/Plugins/PluginVcsMercurial.py	Fri Nov 01 15:48:48 2013 +0100
+++ b/Plugins/PluginVcsMercurial.py	Sun Nov 03 15:58:22 2013 +0100
@@ -127,11 +127,11 @@
         data
     """
     return {
-        "zzz_mercurialPage": \
-            [QApplication.translate("VcsMercurialPlugin", "Mercurial"),
-             os.path.join("VcsPlugins", "vcsMercurial", "icons",
-                          "preferences-mercurial.png"),
-             createConfigurationPage, "vcsPage", None],
+        "zzz_mercurialPage":
+        [QApplication.translate("VcsMercurialPlugin", "Mercurial"),
+            os.path.join("VcsPlugins", "vcsMercurial", "icons",
+                         "preferences-mercurial.png"),
+            createConfigurationPage, "vcsPage", None],
     }
 
 
--- a/Plugins/PluginVcsPySvn.py	Fri Nov 01 15:48:48 2013 +0100
+++ b/Plugins/PluginVcsPySvn.py	Sun Nov 03 15:58:22 2013 +0100
@@ -121,11 +121,11 @@
     data
     """
     return {
-        "zzz_subversionPage": \
-            [QApplication.translate("VcsPySvnPlugin", "Subversion"),
-             os.path.join("VcsPlugins", "vcsPySvn", "icons",
-                          "preferences-subversion.png"),
-             createConfigurationPage, "vcsPage", None],
+        "zzz_subversionPage":
+        [QApplication.translate("VcsPySvnPlugin", "Subversion"),
+         os.path.join("VcsPlugins", "vcsPySvn", "icons",
+                      "preferences-subversion.png"),
+         createConfigurationPage, "vcsPage", None],
     }
 
 
--- a/Plugins/PluginVcsSubversion.py	Fri Nov 01 15:48:48 2013 +0100
+++ b/Plugins/PluginVcsSubversion.py	Sun Nov 03 15:58:22 2013 +0100
@@ -128,11 +128,11 @@
     data
     """
     return {
-        "zzz_subversionPage": \
-            [QApplication.translate("VcsSubversionPlugin", "Subversion"),
-             os.path.join("VcsPlugins", "vcsSubversion", "icons",
-                          "preferences-subversion.png"),
-             createConfigurationPage, "vcsPage", None],
+        "zzz_subversionPage":
+        [QApplication.translate("VcsSubversionPlugin", "Subversion"),
+         os.path.join("VcsPlugins", "vcsSubversion", "icons",
+                      "preferences-subversion.png"),
+         createConfigurationPage, "vcsPage", None],
     }
     
 
--- a/Plugins/PluginWizardE5MessageBox.py	Fri Nov 01 15:48:48 2013 +0100
+++ b/Plugins/PluginWizardE5MessageBox.py	Sun Nov 03 15:58:22 2013 +0100
@@ -71,8 +71,8 @@
         """
         self.action = E5Action(
             self.trUtf8('E5MessageBox Wizard'),
-             self.trUtf8('&E5MessageBox Wizard...'), 0, 0, self,
-             'wizards_e5messagebox')
+            self.trUtf8('&E5MessageBox Wizard...'), 0, 0, self,
+            'wizards_e5messagebox')
         self.action.setStatusTip(self.trUtf8('E5MessageBox Wizard'))
         self.action.setWhatsThis(self.trUtf8(
             """<b>E5MessageBox Wizard</b>"""
@@ -119,7 +119,7 @@
         """
         editor = e5App().getObject("ViewManager").activeWindow()
         
-        if editor == None:
+        if editor is None:
                 E5MessageBox.critical(
                     self.__ui,
                     self.trUtf8('No current editor'),
--- a/Plugins/PluginWizardPyRegExp.py	Fri Nov 01 15:48:48 2013 +0100
+++ b/Plugins/PluginWizardPyRegExp.py	Sun Nov 03 15:58:22 2013 +0100
@@ -119,7 +119,7 @@
         """
         editor = e5App().getObject("ViewManager").activeWindow()
         
-        if editor == None:
+        if editor is None:
             E5MessageBox.critical(
                 self.__ui,
                 self.trUtf8('No current editor'),
--- a/Plugins/PluginWizardQColorDialog.py	Fri Nov 01 15:48:48 2013 +0100
+++ b/Plugins/PluginWizardQColorDialog.py	Sun Nov 03 15:58:22 2013 +0100
@@ -119,7 +119,7 @@
         """
         editor = e5App().getObject("ViewManager").activeWindow()
         
-        if editor == None:
+        if editor is None:
             E5MessageBox.critical(
                 self.__ui,
                 self.trUtf8('No current editor'),
--- a/Plugins/PluginWizardQFileDialog.py	Fri Nov 01 15:48:48 2013 +0100
+++ b/Plugins/PluginWizardQFileDialog.py	Sun Nov 03 15:58:22 2013 +0100
@@ -119,7 +119,7 @@
         """
         editor = e5App().getObject("ViewManager").activeWindow()
         
-        if editor == None:
+        if editor is None:
             E5MessageBox.critical(
                 self.__ui,
                 self.trUtf8('No current editor'),
--- a/Plugins/PluginWizardQFontDialog.py	Fri Nov 01 15:48:48 2013 +0100
+++ b/Plugins/PluginWizardQFontDialog.py	Sun Nov 03 15:58:22 2013 +0100
@@ -119,7 +119,7 @@
         """
         editor = e5App().getObject("ViewManager").activeWindow()
         
-        if editor == None:
+        if editor is None:
             E5MessageBox.critical(
                 self.__ui,
                 self.trUtf8('No current editor'),
--- a/Plugins/PluginWizardQInputDialog.py	Fri Nov 01 15:48:48 2013 +0100
+++ b/Plugins/PluginWizardQInputDialog.py	Sun Nov 03 15:58:22 2013 +0100
@@ -119,7 +119,7 @@
         """
         editor = e5App().getObject("ViewManager").activeWindow()
         
-        if editor == None:
+        if editor is None:
             E5MessageBox.critical(
                 self.__ui,
                 self.trUtf8('No current editor'),
--- a/Plugins/PluginWizardQMessageBox.py	Fri Nov 01 15:48:48 2013 +0100
+++ b/Plugins/PluginWizardQMessageBox.py	Sun Nov 03 15:58:22 2013 +0100
@@ -119,7 +119,7 @@
         """
         editor = e5App().getObject("ViewManager").activeWindow()
         
-        if editor == None:
+        if editor is None:
             E5MessageBox.critical(
                 self.__ui,
                 self.trUtf8('No current editor'),
--- a/Plugins/PluginWizardQRegExp.py	Fri Nov 01 15:48:48 2013 +0100
+++ b/Plugins/PluginWizardQRegExp.py	Sun Nov 03 15:58:22 2013 +0100
@@ -119,7 +119,7 @@
         """
         editor = e5App().getObject("ViewManager").activeWindow()
         
-        if editor == None:
+        if editor is None:
             E5MessageBox.critical(
                 self.__ui,
                 self.trUtf8('No current editor'),
--- a/Plugins/PluginWizardQRegularExpression.py	Fri Nov 01 15:48:48 2013 +0100
+++ b/Plugins/PluginWizardQRegularExpression.py	Sun Nov 03 15:58:22 2013 +0100
@@ -120,7 +120,7 @@
         """
         editor = e5App().getObject("ViewManager").activeWindow()
         
-        if editor == None:
+        if editor is None:
             E5MessageBox.critical(
                 self.__ui,
                 self.trUtf8('No current editor'),
--- a/Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkRenameDialog.py	Fri Nov 01 15:48:48 2013 +0100
+++ b/Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkRenameDialog.py	Sun Nov 03 15:58:22 2013 +0100
@@ -38,7 +38,7 @@
         Private slot to update the UI.
         """
         self.buttonBox.button(QDialogButtonBox.Ok).setEnabled(
-            self.nameEdit.text() != "" and \
+            self.nameEdit.text() != "" and
             self.bookmarkCombo.currentText() != ""
         )
     
--- a/Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarksInOutDialog.py	Fri Nov 01 15:48:48 2013 +0100
+++ b/Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarksInOutDialog.py	Sun Nov 03 15:58:22 2013 +0100
@@ -254,10 +254,10 @@
         @param line output line to be processed (string)
         """
         if line.startswith(" "):
-            l = line.strip().split()
-            changeset = l[-1]
-            del l[-1]
-            name = " ".join(l)
+            li = line.strip().split()
+            changeset = li[-1]
+            del li[-1]
+            name = " ".join(li)
             self.__generateItem(changeset, name)
     
     def __readStderr(self):
--- a/Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarksListDialog.py	Fri Nov 01 15:48:48 2013 +0100
+++ b/Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarksListDialog.py	Sun Nov 03 15:58:22 2013 +0100
@@ -243,17 +243,17 @@
         
         @param line output line to be processed (string)
         """
-        l = line.split()
-        if l[-1][0] in "1234567890":
+        li = line.split()
+        if li[-1][0] in "1234567890":
             # last element is a rev:changeset
-            rev, changeset = l[-1].split(":", 1)
-            del l[-1]
-            if l[0] == "*":
+            rev, changeset = li[-1].split(":", 1)
+            del li[-1]
+            if li[0] == "*":
                 status = "current"
-                del l[0]
+                del li[0]
             else:
                 status = ""
-            name = " ".join(l)
+            name = " ".join(li)
             self.__generateItem(rev, changeset, status, name)
             if self.__bookmarksList is not None:
                 self.__bookmarksList.append(name)
--- a/Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py	Fri Nov 01 15:48:48 2013 +0100
+++ b/Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py	Sun Nov 03 15:58:22 2013 +0100
@@ -91,13 +91,13 @@
         
         self.bookmarksList = []
         for line in output.splitlines():
-            l = line.strip().split()
-            if l[-1][0] in "1234567890":
+            li = line.strip().split()
+            if li[-1][0] in "1234567890":
                 # last element is a rev:changeset
-                del l[-1]
-                if l[0] == "*":
-                    del l[0]
-                name = " ".join(l)
+                del li[-1]
+                if li[0] == "*":
+                    del li[0]
+                name = " ".join(li)
                 self.bookmarksList.append(name)
         
         return self.bookmarksList[:]
@@ -288,9 +288,9 @@
         
         for line in output.splitlines():
             if line.startswith(" "):
-                l = line.strip().split()
-                del l[-1]
-                name = " ".join(l)
+                li = line.strip().split()
+                del li[-1]
+                name = " ".join(li)
                 bookmarksList.append(name)
         
         return bookmarksList
@@ -323,7 +323,7 @@
             args.append(bookmark)
             
             dia = HgDialog(self.trUtf8(
-                    'Pulling bookmark from a remote Mercurial repository'),
+                'Pulling bookmark from a remote Mercurial repository'),
                 self.vcs)
             res = dia.startProcess(args, repodir)
             if res:
@@ -357,7 +357,7 @@
             args.append(bookmark)
             
             dia = HgDialog(self.trUtf8(
-                    'Pushing bookmark to a remote Mercurial repository'),
+                'Pushing bookmark to a remote Mercurial repository'),
                 self.vcs)
             res = dia.startProcess(args, repodir)
             if res:
--- a/Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.py	Fri Nov 01 15:48:48 2013 +0100
+++ b/Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.py	Sun Nov 03 15:58:22 2013 +0100
@@ -244,12 +244,12 @@
         
         @param line output line to be processed (string)
         """
-        l = line.split()
-        if l[-1][0] in "1234567890":
+        li = line.split()
+        if li[-1][0] in "1234567890":
             # last element is a rev:changeset
-            rev, changeset = l[-1].split(":", 1)
-            del l[-1]
-            signature = " ".join(l)
+            rev, changeset = li[-1].split(":", 1)
+            del li[-1]
+            signature = " ".join(li)
             self.__generateItem(rev, changeset, signature)
     
     def __readStderr(self):
--- a/Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.py	Fri Nov 01 15:48:48 2013 +0100
+++ b/Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.py	Sun Nov 03 15:58:22 2013 +0100
@@ -180,4 +180,4 @@
                 date,
                 self.userEdit.text(),
                 msg
-        )
+                )
--- a/Plugins/VcsPlugins/vcsMercurial/HgClient.py	Fri Nov 01 15:48:48 2013 +0100
+++ b/Plugins/VcsPlugins/vcsMercurial/HgClient.py	Sun Nov 03 15:58:22 2013 +0100
@@ -86,9 +86,9 @@
         serverStarted = self.__server.waitForStarted(5000)
         if not serverStarted:
             return False, self.trUtf8(
-                    'The process {0} could not be started. '
-                    'Ensure, that it is in the search path.'
-                ).format('hg')
+                'The process {0} could not be started. '
+                'Ensure, that it is in the search path.'
+            ).format('hg')
         
         self.__server.setReadChannel(QProcess.StandardOutput)
         ok, error = self.__readHello()
--- a/Plugins/VcsPlugins/vcsMercurial/HgDialog.py	Fri Nov 01 15:48:48 2013 +0100
+++ b/Plugins/VcsPlugins/vcsMercurial/HgDialog.py	Sun Nov 03 15:58:22 2013 +0100
@@ -125,8 +125,8 @@
         if args[0] in ["fetch", "qpush", "qpop", "qgoto", "rebase",
                        "transplant", "update", "import", "revert",
                        "graft"] or \
-           (args[0] in ["pull", "unbundle"] and \
-            ("--update" in args[1:] or "--rebase" in args[1:])):
+           (args[0] in ["pull", "unbundle"] and
+                ("--update" in args[1:] or "--rebase" in args[1:])):
             self.__updateCommand = True
         else:
             self.__updateCommand = False
--- a/Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py	Fri Nov 01 15:48:48 2013 +0100
+++ b/Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py	Sun Nov 03 15:58:22 2013 +0100
@@ -319,8 +319,8 @@
         
         while self.process.canReadLine():
             line = str(self.process.readLine(),
-                        Preferences.getSystem("IOEncoding"),
-                        'replace')
+                       Preferences.getSystem("IOEncoding"),
+                       'replace')
             self.__processOutputLine(line)
     
     def __readStderr(self):
@@ -447,7 +447,7 @@
                 self.trUtf8(
                     '<p>The patch file <b>{0}</b> could not be saved.'
                     '<br>Reason: {1}</p>')
-                    .format(fname, str(why)))
+                .format(fname, str(why)))
     
     def on_passwordCheckBox_toggled(self, isOn):
         """
--- a/Plugins/VcsPlugins/vcsMercurial/HgGraftDialog.py	Fri Nov 01 15:48:48 2013 +0100
+++ b/Plugins/VcsPlugins/vcsMercurial/HgGraftDialog.py	Sun Nov 03 15:58:22 2013 +0100
@@ -50,7 +50,7 @@
         enable = self.revisionsEdit.toPlainText() != ""
         if self.userGroup.isChecked():
             enable = enable and \
-                (self.currentUserCheckBox.isChecked() or \
+                (self.currentUserCheckBox.isChecked() or
                  self.userEdit.text() != "")
         
         self.buttonBox.button(QDialogButtonBox.Ok).setEnabled(enable)
--- a/Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py	Fri Nov 01 15:48:48 2013 +0100
+++ b/Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py	Sun Nov 03 15:58:22 2013 +0100
@@ -16,7 +16,7 @@
 import os
 
 from PyQt4.QtCore import pyqtSlot, Qt, QDate, QProcess, QTimer, QRegExp, \
-     QSize, QPoint
+    QSize, QPoint
 from PyQt4.QtGui import QDialog, QDialogButtonBox, QHeaderView, \
     QTreeWidgetItem, QApplication, QCursor, QLineEdit, QColor, \
     QPixmap, QPainter, QPen, QBrush, QIcon
@@ -939,8 +939,8 @@
         
         while self.process.canReadLine():
             line = str(self.process.readLine(),
-                        Preferences.getSystem("IOEncoding"),
-                        'replace')
+                       Preferences.getSystem("IOEncoding"),
+                       'replace')
             self.buf.append(line)
     
     def __readStderr(self):
@@ -952,8 +952,8 @@
         """
         if self.process is not None:
             s = str(self.process.readAllStandardError(),
-                     Preferences.getSystem("IOEncoding"),
-                     'replace')
+                    Preferences.getSystem("IOEncoding"),
+                    'replace')
             self.__showError(s)
     
     def __showError(self, out):
@@ -1047,8 +1047,8 @@
             
             # step 2: set the status of the phase button
             if public == 0 and \
-               ((secret > 0 and draft == 0) or \
-                (secret == 0 and draft > 0)):
+               ((secret > 0 and draft == 0) or
+                    (secret == 0 and draft > 0)):
                 self.phaseButton.setEnabled(True)
             else:
                 self.phaseButton.setEnabled(False)
@@ -1259,8 +1259,8 @@
                 topItem = self.logTree.topLevelItem(topIndex)
                 if topItem.text(self.DateColumn) <= to_ and \
                    topItem.text(self.DateColumn) >= from_ and \
-                   (branch == self.__allBranchesFilter or \
-                    topItem.text(self.BranchColumn) in \
+                   (branch == self.__allBranchesFilter or
+                    topItem.text(self.BranchColumn) in
                         [branch, closedBranch]) and \
                    searchRx.indexIn(topItem.text(fieldIndex)) > -1:
                     topItem.setHidden(False)
--- a/Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py	Fri Nov 01 15:48:48 2013 +0100
+++ b/Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py	Sun Nov 03 15:58:22 2013 +0100
@@ -284,7 +284,7 @@
         self.contents.clear()
         
         if not self.logEntries:
-            self.errors.append(self.trUtf8("No log available for '{0}'")\
+            self.errors.append(self.trUtf8("No log available for '{0}'")
                                .format(self.filename))
             self.errorGroup.show()
             return
@@ -362,19 +362,19 @@
                                     Utilities.html_encode(fileCopies[f]))
                     else:
                         html += self.trUtf8('Added {0}<br />\n')\
-                                .format(Utilities.html_encode(f))
+                            .format(Utilities.html_encode(f))
             
             if entry["files_mods"]:
                 html += '<br />\n'
                 for f in entry["files_mods"].strip().split(", "):
                     html += self.trUtf8('Modified {0}<br />\n')\
-                            .format(Utilities.html_encode(f))
+                        .format(Utilities.html_encode(f))
             
             if entry["file_dels"]:
                 html += '<br />\n'
                 for f in entry["file_dels"].strip().split(", "):
                     html += self.trUtf8('Deleted {0}<br />\n')\
-                            .format(Utilities.html_encode(f))
+                        .format(Utilities.html_encode(f))
             
             html += '</p>{0}<br/>\n'.format(80 * "=")
         
@@ -394,8 +394,8 @@
         
         while self.process.canReadLine():
             s = str(self.process.readLine(),
-                        Preferences.getSystem("IOEncoding"),
-                        'replace')
+                    Preferences.getSystem("IOEncoding"),
+                    'replace')
             self.__processOutputLine(s)
     
     def __processOutputLine(self, line):
@@ -417,8 +417,8 @@
             if key == "change":
                 self.endInitialText = True
             if key in ("change", "branches", "tags", "parents", "user",
-                        "date", "file_copies", "file_adds", "files_mods",
-                        "file_dels", "bookmarks", "phase"):
+                       "date", "file_copies", "file_adds", "files_mods",
+                       "file_dels", "bookmarks", "phase"):
                 self.lastLogEntry[key] = value.strip()
             elif key == "description":
                 self.lastLogEntry[key] = [value.strip()]
@@ -437,8 +437,8 @@
         """
         if self.process is not None:
             s = str(self.process.readAllStandardError(),
-                     Preferences.getSystem("IOEncoding"),
-                     'replace')
+                    Preferences.getSystem("IOEncoding"),
+                    'replace')
             self.__showError(s)
     
     def __showError(self, out):
--- a/Plugins/VcsPlugins/vcsMercurial/HgMultiRevisionSelectionDialog.py	Fri Nov 01 15:48:48 2013 +0100
+++ b/Plugins/VcsPlugins/vcsMercurial/HgMultiRevisionSelectionDialog.py	Sun Nov 03 15:58:22 2013 +0100
@@ -17,7 +17,7 @@
 
 
 class HgMultiRevisionSelectionDialog(
-    QDialog, Ui_HgMultiRevisionSelectionDialog):
+        QDialog, Ui_HgMultiRevisionSelectionDialog):
     """
     Class implementing a dialog to select revisions.
     """
--- a/Plugins/VcsPlugins/vcsMercurial/HgNewProjectOptionsDialog.py	Fri Nov 01 15:48:48 2013 +0100
+++ b/Plugins/VcsPlugins/vcsMercurial/HgNewProjectOptionsDialog.py	Sun Nov 03 15:58:22 2013 +0100
@@ -55,8 +55,9 @@
         self.networkPath = "localhost/"
         self.localProtocol = True
         
-        self.vcsProjectDirEdit.setText(Utilities.toNativeSeparators(
-            Preferences.getMultiProject("Workspace") or \
+        self.vcsProjectDirEdit.setText(
+            Utilities.toNativeSeparators(
+                Preferences.getMultiProject("Workspace") or
                 Utilities.getHomeDir()))
     
     @pyqtSlot()
--- a/Plugins/VcsPlugins/vcsMercurial/HgServeDialog.py	Fri Nov 01 15:48:48 2013 +0100
+++ b/Plugins/VcsPlugins/vcsMercurial/HgServeDialog.py	Sun Nov 03 15:58:22 2013 +0100
@@ -199,8 +199,8 @@
         """
         if self.process is not None:
             s = str(self.process.readAllStandardOutput(),
-                     Preferences.getSystem("IOEncoding"),
-                     'replace')
+                    Preferences.getSystem("IOEncoding"),
+                    'replace')
             self.__appendText(s, False)
     
     def __readStderr(self):
@@ -211,8 +211,8 @@
         """
         if self.process is not None:
             s = str(self.process.readAllStandardError(),
-                     Preferences.getSystem("IOEncoding"),
-                     'replace')
+                    Preferences.getSystem("IOEncoding"),
+                    'replace')
             self.__appendText(s, True)
     
     def __appendText(self, txt, error=False):
--- a/Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py	Fri Nov 01 15:48:48 2013 +0100
+++ b/Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py	Sun Nov 03 15:58:22 2013 +0100
@@ -595,7 +595,7 @@
         if self.__mq:
             self.vcs.vcsCommit(self.dname, "", mq=True)
         else:
-            names = [os.path.join(self.dname, itm.text(self.__pathColumn)) \
+            names = [os.path.join(self.dname, itm.text(self.__pathColumn))
                      for itm in self.__getCommitableItems()]
             if not names:
                 E5MessageBox.information(
@@ -635,7 +635,7 @@
         """
         Private slot to handle the Add context menu entry.
         """
-        names = [os.path.join(self.dname, itm.text(self.__pathColumn)) \
+        names = [os.path.join(self.dname, itm.text(self.__pathColumn))
                  for itm in self.__getUnversionedItems()]
         if not names:
             E5MessageBox.information(
@@ -657,7 +657,7 @@
         """
         Private slot to handle the Remove context menu entry.
         """
-        names = [os.path.join(self.dname, itm.text(self.__pathColumn)) \
+        names = [os.path.join(self.dname, itm.text(self.__pathColumn))
                  for itm in self.__getMissingItems()]
         if not names:
             E5MessageBox.information(
@@ -674,7 +674,7 @@
         """
         Private slot to handle the Revert context menu entry.
         """
-        names = [os.path.join(self.dname, itm.text(self.__pathColumn)) \
+        names = [os.path.join(self.dname, itm.text(self.__pathColumn))
                  for itm in self.__getModifiedItems()]
         if not names:
             E5MessageBox.information(
--- a/Plugins/VcsPlugins/vcsMercurial/HgStatusMonitorThread.py	Fri Nov 01 15:48:48 2013 +0100
+++ b/Plugins/VcsPlugins/vcsMercurial/HgStatusMonitorThread.py	Sun Nov 03 15:58:22 2013 +0100
@@ -160,7 +160,7 @@
         self.reportedStates = states
         
         return True, \
-               self.trUtf8("Mercurial status checked successfully")
+            self.trUtf8("Mercurial status checked successfully")
     
     def _shutdown(self):
         """
--- a/Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py	Fri Nov 01 15:48:48 2013 +0100
+++ b/Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py	Sun Nov 03 15:58:22 2013 +0100
@@ -423,19 +423,19 @@
                 if infoDict["remote"] == (0, 0, 0, 0):
                     rinfo = self.trUtf8("synched")
                 else:
-                    l = []
+                    li = []
                     if infoDict["remote"][0]:
-                        l.append(self.trUtf8("1 or more incoming"))
+                        li.append(self.trUtf8("1 or more incoming"))
                     if infoDict["remote"][1]:
-                        l.append(self.trUtf8("{0} outgoing")\
-                                 .format(infoDict["remote"][1]))
+                        li.append(self.trUtf8("{0} outgoing")
+                                  .format(infoDict["remote"][1]))
                     if infoDict["remote"][2]:
-                        l.append(self.trUtf8("%n incoming bookmark(s)", "",
-                                 infoDict["remote"][2]))
+                        li.append(self.trUtf8("%n incoming bookmark(s)", "",
+                                  infoDict["remote"][2]))
                     if infoDict["remote"][3]:
-                        l.append(self.trUtf8("%n outgoing bookmark(s)", "",
-                                 infoDict["remote"][3]))
-                    rinfo = "<br/>".join(l)
+                        li.append(self.trUtf8("%n outgoing bookmark(s)", "",
+                                  infoDict["remote"][3]))
+                    rinfo = "<br/>".join(li)
                 info.append(self.trUtf8(
                     "<tr><td><b>Remote Status</b></td><td>{0}</td></tr>")
                     .format(rinfo))
@@ -443,14 +443,14 @@
                 if infoDict["mq"] == (0, 0):
                     qinfo = self.trUtf8("empty queue")
                 else:
-                    l = []
+                    li = []
                     if infoDict["mq"][0]:
-                        l.append(self.trUtf8("{0} applied")
-                                 .format(infoDict["mq"][0]))
+                        li.append(self.trUtf8("{0} applied")
+                                  .format(infoDict["mq"][0]))
                     if infoDict["mq"][1]:
-                        l.append(self.trUtf8("{0} unapplied")
-                                 .format(infoDict["mq"][1]))
-                    qinfo = "<br/>".join(l)
+                        li.append(self.trUtf8("{0} unapplied")
+                                  .format(infoDict["mq"][1]))
+                    qinfo = "<br/>".join(li)
                 info.append(self.trUtf8(
                     "<tr><td><b>Queues Status</b></td><td>{0}</td></tr>")
                     .format(qinfo))
--- a/Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py	Fri Nov 01 15:48:48 2013 +0100
+++ b/Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py	Sun Nov 03 15:58:22 2013 +0100
@@ -251,23 +251,23 @@
         
         @param line output line to be processed (string)
         """
-        l = line.split()
-        if l[-1][0] in "1234567890":
+        li = line.split()
+        if li[-1][0] in "1234567890":
             # last element is a rev:changeset
             if self.tagsMode:
                 status = ""
             else:
                 status = self.trUtf8("active")
-            rev, changeset = l[-1].split(":", 1)
-            del l[-1]
+            rev, changeset = li[-1].split(":", 1)
+            del li[-1]
         else:
             if self.tagsMode:
                 status = self.trUtf8("yes")
             else:
-                status = l[-1][1:-1]
-            rev, changeset = l[-2].split(":", 1)
-            del l[-2:]
-        name = " ".join(l)
+                status = li[-1][1:-1]
+            rev, changeset = li[-2].split(":", 1)
+            del li[-2:]
+        name = " ".join(li)
         self.__generateItem(rev, changeset, status, name)
         if name not in ["tip", "default"]:
             if self.tagsList is not None:
--- a/Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py	Fri Nov 01 15:48:48 2013 +0100
+++ b/Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py	Sun Nov 03 15:58:22 2013 +0100
@@ -269,13 +269,13 @@
         self.vcsMenuActions.append(act)
         menu.addSeparator()
         menu.addAction(self.trUtf8('Select all local file entries'),
-                        self.browser.selectLocalEntries)
+                       self.browser.selectLocalEntries)
         menu.addAction(self.trUtf8('Select all versioned file entries'),
-                        self.browser.selectVCSEntries)
+                       self.browser.selectVCSEntries)
         menu.addAction(self.trUtf8('Select all local directory entries'),
-                        self.browser.selectLocalDirEntries)
+                       self.browser.selectLocalDirEntries)
         menu.addAction(self.trUtf8('Select all versioned directory entries'),
-                        self.browser.selectVCSDirEntries)
+                       self.browser.selectVCSDirEntries)
         menu.addSeparator()
         
         mainMenu.addSeparator()
@@ -349,13 +349,13 @@
         self.vcsMultiMenuActions.append(act)
         menu.addSeparator()
         menu.addAction(self.trUtf8('Select all local file entries'),
-                        self.browser.selectLocalEntries)
+                       self.browser.selectLocalEntries)
         menu.addAction(self.trUtf8('Select all versioned file entries'),
-                        self.browser.selectVCSEntries)
+                       self.browser.selectVCSEntries)
         menu.addAction(self.trUtf8('Select all local directory entries'),
-                        self.browser.selectLocalDirEntries)
+                       self.browser.selectLocalDirEntries)
         menu.addAction(self.trUtf8('Select all versioned directory entries'),
-                        self.browser.selectVCSDirEntries)
+                       self.browser.selectVCSDirEntries)
         menu.addSeparator()
         
         mainMenu.addSeparator()
@@ -381,13 +381,13 @@
         menu.addSeparator()
         
         menu.addAction(self.trUtf8('Select all local file entries'),
-                        self.browser.selectLocalEntries)
+                       self.browser.selectLocalEntries)
         menu.addAction(self.trUtf8('Select all versioned file entries'),
-                        self.browser.selectVCSEntries)
+                       self.browser.selectVCSEntries)
         menu.addAction(self.trUtf8('Select all local directory entries'),
-                        self.browser.selectLocalDirEntries)
+                       self.browser.selectLocalDirEntries)
         menu.addAction(self.trUtf8('Select all versioned directory entries'),
-                        self.browser.selectVCSDirEntries)
+                       self.browser.selectVCSDirEntries)
         menu.addSeparator()
         
         mainMenu.addSeparator()
@@ -472,13 +472,13 @@
         self.vcsDirMenuActions.append(act)
         menu.addSeparator()
         menu.addAction(self.trUtf8('Select all local file entries'),
-                        self.browser.selectLocalEntries)
+                       self.browser.selectLocalEntries)
         menu.addAction(self.trUtf8('Select all versioned file entries'),
-                        self.browser.selectVCSEntries)
+                       self.browser.selectVCSEntries)
         menu.addAction(self.trUtf8('Select all local directory entries'),
-                        self.browser.selectLocalDirEntries)
+                       self.browser.selectLocalDirEntries)
         menu.addAction(self.trUtf8('Select all versioned directory entries'),
-                        self.browser.selectVCSDirEntries)
+                       self.browser.selectVCSDirEntries)
         menu.addSeparator()
         
         mainMenu.addSeparator()
@@ -549,13 +549,13 @@
         self.vcsDirMultiMenuActions.append(act)
         menu.addSeparator()
         menu.addAction(self.trUtf8('Select all local file entries'),
-                        self.browser.selectLocalEntries)
+                       self.browser.selectLocalEntries)
         menu.addAction(self.trUtf8('Select all versioned file entries'),
-                        self.browser.selectVCSEntries)
+                       self.browser.selectVCSEntries)
         menu.addAction(self.trUtf8('Select all local directory entries'),
-                        self.browser.selectLocalDirEntries)
+                       self.browser.selectLocalDirEntries)
         menu.addAction(self.trUtf8('Select all versioned directory entries'),
-                        self.browser.selectVCSDirEntries)
+                       self.browser.selectVCSDirEntries)
         menu.addSeparator()
         
         mainMenu.addSeparator()
@@ -699,7 +699,7 @@
         else:
             items = self.browser.getSelectedItems()
             names = [itm.fileName() for itm in items]
-            files = [self.browser.project.getRelativePath(name) \
+            files = [self.browser.project.getRelativePath(name)
                      for name in names]
             
             dlg = DeleteFilesConfirmationDialog(
--- a/Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py	Fri Nov 01 15:48:48 2013 +0100
+++ b/Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py	Sun Nov 03 15:58:22 2013 +0100
@@ -321,10 +321,10 @@
         self.actions.append(self.vcsStatusAct)
         
         self.hgSummaryAct = E5Action(
-                self.trUtf8('Show Summary'),
-                UI.PixmapCache.getIcon("vcsSummary.png"),
-                self.trUtf8('Show summary...'),
-                0, 0, self, 'mercurial_summary')
+            self.trUtf8('Show Summary'),
+            UI.PixmapCache.getIcon("vcsSummary.png"),
+            self.trUtf8('Show summary...'),
+            0, 0, self, 'mercurial_summary')
         self.hgSummaryAct.setStatusTip(self.trUtf8(
             'Show summary information of the working directory status'
         ))
--- a/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py	Fri Nov 01 15:48:48 2013 +0100
+++ b/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py	Sun Nov 03 15:58:22 2013 +0100
@@ -83,7 +83,7 @@
                 self.trUtf8("""The guards list has been changed."""
                             """ Shall the changes be applied?"""),
                 E5MessageBox.StandardButtons(
-                    E5MessageBox.Apply | \
+                    E5MessageBox.Apply |
                     E5MessageBox.Discard),
                 E5MessageBox.Apply)
             if res == E5MessageBox.Apply:
@@ -126,7 +126,7 @@
                 self.trUtf8("""The guards list has been changed."""
                             """ Shall the changes be applied?"""),
                 E5MessageBox.StandardButtons(
-                    E5MessageBox.Apply | \
+                    E5MessageBox.Apply |
                     E5MessageBox.Discard),
                 E5MessageBox.Apply)
             if res == E5MessageBox.Apply:
@@ -318,8 +318,8 @@
                     self,
                     self.trUtf8("Apply Guard Definitions"),
                     self.trUtf8("""<p>The defined guards could not be"""
-                                """ applied.</p><p>Reason: {0}</p>""")\
-                        .format(error))
+                                """ applied.</p><p>Reason: {0}</p>""")
+                    .format(error))
             else:
                             self.__dirtyList = False
                             self.on_patchSelector_activated(
--- a/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py	Fri Nov 01 15:48:48 2013 +0100
+++ b/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py	Sun Nov 03 15:58:22 2013 +0100
@@ -358,17 +358,17 @@
         if self.__mode == "qtop":
             self.__markTopItem(line)
         else:
-            l = line.split(": ", 1)
-            if len(l) == 1:
-                data, summary = l[0][:-1], ""
+            li = line.split(": ", 1)
+            if len(li) == 1:
+                data, summary = li[0][:-1], ""
             else:
-                data, summary = l[0], l[1]
-            l = data.split(None, 2)
-            if len(l) == 2:
+                data, summary = li[0], li[1]
+            li = data.split(None, 2)
+            if len(li) == 2:
                 # missing entry
-                index, status, name = -1, l[0], l[1]
-            elif len(l) == 3:
-                index, status, name = l[:3]
+                index, status, name = -1, li[0], li[1]
+            elif len(li) == 3:
+                index, status, name = li[:3]
             else:
                 return
             self.__generateItem(index, status, name, summary)
--- a/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesNewPatchDialog.py	Fri Nov 01 15:48:48 2013 +0100
+++ b/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesNewPatchDialog.py	Sun Nov 03 15:58:22 2013 +0100
@@ -60,10 +60,10 @@
             enable = self.messageEdit.toPlainText() != ""
         else:
             enable = self.nameEdit.text() != "" and \
-                     self.messageEdit.toPlainText() != ""
+                self.messageEdit.toPlainText() != ""
         if self.userGroup.isChecked():
             enable = enable and \
-                (self.currentUserCheckBox.isChecked() or \
+                (self.currentUserCheckBox.isChecked() or
                  self.userEdit.text() != "")
         
         self.buttonBox.button(QDialogButtonBox.Ok).setEnabled(enable)
--- a/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py	Fri Nov 01 15:48:48 2013 +0100
+++ b/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py	Sun Nov 03 15:58:22 2013 +0100
@@ -123,11 +123,11 @@
         
         for line in output.splitlines():
             if withSummary:
-                l = line.strip().split(": ")
-                if len(l) == 1:
-                    patch, summary = l[0][:-1], ""
+                li = line.strip().split(": ")
+                if len(li) == 1:
+                    patch, summary = li[0][:-1], ""
                 else:
-                    patch, summary = l[0], l[1]
+                    patch, summary = li[0], li[1]
                 patchesList.append("{0}@@{1}".format(patch, summary))
             else:
                 patchesList.append(line.strip())
@@ -251,7 +251,7 @@
         dlg = HgQueuesNewPatchDialog(HgQueuesNewPatchDialog.NEW_MODE)
         if dlg.exec_() == QDialog.Accepted:
             name, message, (userData, currentUser, userName), \
-            (dateData, currentDate, dateStr) = dlg.getData()
+                (dateData, currentDate, dateStr) = dlg.getData()
             
             args = []
             args.append("qnew")
@@ -303,7 +303,7 @@
                                          currentMessage)
             if dlg.exec_() == QDialog.Accepted:
                 name, message, (userData, currentUser, userName), \
-                (dateData, currentDate, dateStr) = dlg.getData()
+                    (dateData, currentDate, dateStr) = dlg.getData()
                 if message != "" and message != currentMessage:
                     args.append("--message")
                     args.append(message)
--- a/Plugins/VcsPlugins/vcsMercurial/RebaseExtension/ProjectHelper.py	Fri Nov 01 15:48:48 2013 +0100
+++ b/Plugins/VcsPlugins/vcsMercurial/RebaseExtension/ProjectHelper.py	Sun Nov 03 15:58:22 2013 +0100
@@ -49,9 +49,9 @@
         self.actions.append(self.hgRebaseAct)
         
         self.hgRebaseContinueAct = E5Action(
-                self.trUtf8('Continue Rebase Session'),
-                self.trUtf8('Continue Rebase Session'),
-                0, 0, self, 'mercurial_rebase_continue')
+            self.trUtf8('Continue Rebase Session'),
+            self.trUtf8('Continue Rebase Session'),
+            0, 0, self, 'mercurial_rebase_continue')
         self.hgRebaseContinueAct.setStatusTip(self.trUtf8(
             'Continue the last rebase session after repair'
         ))
@@ -63,9 +63,9 @@
         self.actions.append(self.hgRebaseContinueAct)
         
         self.hgRebaseAbortAct = E5Action(
-                self.trUtf8('Abort Rebase Session'),
-                self.trUtf8('Abort Rebase Session'),
-                0, 0, self, 'mercurial_rebase_abort')
+            self.trUtf8('Abort Rebase Session'),
+            self.trUtf8('Abort Rebase Session'),
+            0, 0, self, 'mercurial_rebase_abort')
         self.hgRebaseAbortAct.setStatusTip(self.trUtf8(
             'Abort the last rebase session'
         ))
--- a/Plugins/VcsPlugins/vcsMercurial/TransplantExtension/ProjectHelper.py	Fri Nov 01 15:48:48 2013 +0100
+++ b/Plugins/VcsPlugins/vcsMercurial/TransplantExtension/ProjectHelper.py	Sun Nov 03 15:58:22 2013 +0100
@@ -65,9 +65,9 @@
         self.actions.append(self.hgTransplantAct)
         
         self.hgTransplantContinueAct = E5Action(
-                self.trUtf8('Continue Transplant Session'),
-                self.trUtf8('Continue Transplant Session'),
-                0, 0, self, 'mercurial_transplant_continue')
+            self.trUtf8('Continue Transplant Session'),
+            self.trUtf8('Continue Transplant Session'),
+            0, 0, self, 'mercurial_transplant_continue')
         self.hgTransplantContinueAct.setStatusTip(self.trUtf8(
             'Continue the last transplant session after repair'
         ))
--- a/Plugins/VcsPlugins/vcsMercurial/TransplantExtension/TransplantDialog.py	Fri Nov 01 15:48:48 2013 +0100
+++ b/Plugins/VcsPlugins/vcsMercurial/TransplantExtension/TransplantDialog.py	Sun Nov 03 15:58:22 2013 +0100
@@ -96,7 +96,7 @@
         Private slot to update the state of the OK button.
         """
         self.buttonBox.button(QDialogButtonBox.Ok).setEnabled(
-            self.revisionsEdit.toPlainText() != "" or 
+            self.revisionsEdit.toPlainText() != "" or
             self.allCheckBox.isChecked())
     
     @pyqtSlot()
--- a/Plugins/VcsPlugins/vcsMercurial/hg.py	Fri Nov 01 15:48:48 2013 +0100
+++ b/Plugins/VcsPlugins/vcsMercurial/hg.py	Sun Nov 03 15:58:22 2013 +0100
@@ -817,12 +817,12 @@
         from .HgMultiRevisionSelectionDialog import \
             HgMultiRevisionSelectionDialog
         dlg = HgMultiRevisionSelectionDialog(
-                self.hgGetTagsList(repodir),
-                self.hgGetBranchesList(repodir),
-                bookmarksList,
-                emptyRevsOk=True,
-                showLimit=True,
-                limitDefault=self.getPlugin().getPreferences("LogLimit"))
+            self.hgGetTagsList(repodir),
+            self.hgGetBranchesList(repodir),
+            bookmarksList,
+            emptyRevsOk=True,
+            showLimit=True,
+            limitDefault=self.getPlugin().getPreferences("LogLimit"))
         if dlg.exec_() == QDialog.Accepted:
             revs, noEntries = dlg.getRevisions()
             from .HgLogDialog import HgLogDialog
@@ -1362,28 +1362,28 @@
                 info.append(QApplication.translate(
                     "mercurial",
                     """<tr><td><b>Parent #{0}</b></td><td></td></tr>\n"""
-                    """<tr><td><b>Changeset</b></td><td>{1}</td></tr>""")\
+                    """<tr><td><b>Changeset</b></td><td>{1}</td></tr>""")
                     .format(index, changeset))
                 if tags:
                     info.append(QApplication.translate(
                         "mercurial",
-                        """<tr><td><b>Tags</b></td><td>{0}</td></tr>""")\
+                        """<tr><td><b>Tags</b></td><td>{0}</td></tr>""")
                         .format('<br/>'.join(tags.split())))
                 if bookmarks:
                     info.append(QApplication.translate(
                         "mercurial",
-                        """<tr><td><b>Bookmarks</b></td><td>{0}</td></tr>""")\
+                        """<tr><td><b>Bookmarks</b></td><td>{0}</td></tr>""")
                         .format('<br/>'.join(bookmarks.split())))
                 if branches:
                     info.append(QApplication.translate(
                         "mercurial",
-                        """<tr><td><b>Branches</b></td><td>{0}</td></tr>""")\
+                        """<tr><td><b>Branches</b></td><td>{0}</td></tr>""")
                         .format('<br/>'.join(branches.split())))
                 info.append(QApplication.translate(
                     "mercurial",
                     """<tr><td><b>Last author</b></td><td>{0}</td></tr>\n"""
                     """<tr><td><b>Committed date</b></td><td>{1}</td></tr>\n"""
-                    """<tr><td><b>Committed time</b></td><td>{2}</td></tr>""")\
+                    """<tr><td><b>Committed time</b></td><td>{2}</td></tr>""")
                     .format(author, cdate, ctime))
                 infoBlock.append("\n".join(info))
         if infoBlock:
@@ -1424,7 +1424,7 @@
             """<tr><td><b>URL</b></td><td>{1}</td></tr>\n"""
             """{2}"""
             """</table></p>\n"""
-            ).format(self.versionStr, url, infoStr)
+        ).format(self.versionStr, url, infoStr)
 
     ###########################################################################
     ## Private Mercurial specific methods are below.
@@ -1547,13 +1547,13 @@
         if output:
             self.tagsList = []
             for line in output.splitlines():
-                l = line.strip().split()
-                if l[-1][0] in "1234567890":
+                li = line.strip().split()
+                if li[-1][0] in "1234567890":
                     # last element is a rev:changeset
-                    del l[-1]
+                    del li[-1]
                 else:
-                    del l[-2:]
-                name = " ".join(l)
+                    del li[-2:]
+                name = " ".join(li)
                 if name not in ["tip", "default"]:
                     self.tagsList.append(name)
         
@@ -1589,13 +1589,13 @@
         if output:
             self.branchesList = []
             for line in output.splitlines():
-                l = line.strip().split()
-                if l[-1][0] in "1234567890":
+                li = line.strip().split()
+                if li[-1][0] in "1234567890":
                     # last element is a rev:changeset
-                    del l[-1]
+                    del li[-1]
                 else:
-                    del l[-2:]
-                name = " ".join(l)
+                    del li[-2:]
+                name = " ".join(li)
                 if name not in ["tip", "default"]:
                     self.branchesList.append(name)
         
@@ -1820,7 +1820,7 @@
                     self.trUtf8("Mercurial Side-by-Side Difference"),
                     self.trUtf8(
                         """<p>The file <b>{0}</b> could not be read.</p>""")
-                        .format(name))
+                    .format(name))
                 return
         
         if self.sbsDiff is None:
@@ -2020,34 +2020,34 @@
                         """<tr><td><b>Tip</b></td><td></td></tr>\n"""))
                 info.append(QApplication.translate(
                     "mercurial",
-                    """<tr><td><b>Changeset</b></td><td>{0}</td></tr>""")\
+                    """<tr><td><b>Changeset</b></td><td>{0}</td></tr>""")
                     .format(changeset))
                 if tags:
                     info.append(QApplication.translate(
                         "mercurial",
-                        """<tr><td><b>Tags</b></td><td>{0}</td></tr>""")\
+                        """<tr><td><b>Tags</b></td><td>{0}</td></tr>""")
                         .format('<br/>'.join(tags.split())))
                 if bookmarks:
                     info.append(QApplication.translate(
                         "mercurial",
-                        """<tr><td><b>Bookmarks</b></td><td>{0}</td></tr>""")\
+                        """<tr><td><b>Bookmarks</b></td><td>{0}</td></tr>""")
                         .format('<br/>'.join(bookmarks.split())))
                 if branches:
                     info.append(QApplication.translate(
                         "mercurial",
-                        """<tr><td><b>Branches</b></td><td>{0}</td></tr>""")\
+                        """<tr><td><b>Branches</b></td><td>{0}</td></tr>""")
                         .format('<br/>'.join(branches.split())))
                 if parents:
                     info.append(QApplication.translate(
                         "mercurial",
-                        """<tr><td><b>Parents</b></td><td>{0}</td></tr>""")\
+                        """<tr><td><b>Parents</b></td><td>{0}</td></tr>""")
                         .format('<br/>'.join(parents.split())))
                 info.append(QApplication.translate(
                     "mercurial",
                     """<tr><td><b>Last author</b></td><td>{0}</td></tr>\n"""
                     """<tr><td><b>Committed date</b></td><td>{1}</td></tr>\n"""
                     """<tr><td><b>Committed time</b></td><td>{2}</td></tr>\n"""
-                    """</table></p>""")\
+                    """</table></p>""")
                     .format(author, cdate, ctime))
             
             dlg = VcsRepositoryInfoDialog(None, "\n".join(info))
@@ -2922,7 +2922,7 @@
         dlg = HgGraftDialog(self, revs)
         if dlg.exec_() == QDialog.Accepted:
             revs, (userData, currentUser, userName), \
-            (dateData, currentDate, dateStr), log, dryrun = dlg.getData()
+                (dateData, currentDate, dateStr), log, dryrun = dlg.getData()
             
             args = []
             args.append("graft")
@@ -3067,7 +3067,7 @@
                         self.trUtf8(
                             """<p>The sub-repositories file .hgsub could not"""
                             """ be read.</p><p>Reason: {0}</p>""")
-                            .format(str(err)))
+                        .format(str(err)))
                     return
                 
                 if entry in contents:
@@ -3096,7 +3096,7 @@
                     self.trUtf8(
                         """<p>The sub-repositories file .hgsub could not"""
                         """ be written to.</p><p>Reason: {0}</p>""")
-                        .format(str(err)))
+                    .format(str(err)))
                 return
             
             if needsAdd:
@@ -3128,7 +3128,7 @@
                 self.trUtf8("Remove Sub-repositories"),
                 self.trUtf8("""<p>The sub-repositories file .hgsub could not"""
                             """ be read.</p><p>Reason: {0}</p>""")
-                            .format(str(err)))
+                .format(str(err)))
             return
         
         from .HgRemoveSubrepositoriesDialog import \
@@ -3148,7 +3148,7 @@
                     self.trUtf8(
                         """<p>The sub-repositories file .hgsub could not"""
                         """ be written to.</p><p>Reason: {0}</p>""")
-                        .format(str(err)))
+                    .format(str(err)))
                 return
             
             if deleteSubrepos:
--- a/Plugins/VcsPlugins/vcsPySvn/SvnConst.py	Fri Nov 01 15:48:48 2013 +0100
+++ b/Plugins/VcsPlugins/vcsPySvn/SvnConst.py	Sun Nov 03 15:58:22 2013 +0100
@@ -14,45 +14,45 @@
 import pysvn
 
 svnNotifyActionMap = {
-    pysvn.wc_notify_action.add: \
-        QT_TRANSLATE_NOOP('Subversion', 'Add'),
-    pysvn.wc_notify_action.commit_added: \
-        QT_TRANSLATE_NOOP('Subversion', 'Add'),
-    pysvn.wc_notify_action.commit_deleted: \
-        QT_TRANSLATE_NOOP('Subversion', 'Delete'),
-    pysvn.wc_notify_action.commit_modified: \
-        QT_TRANSLATE_NOOP('Subversion', 'Modify'),
+    pysvn.wc_notify_action.add:
+    QT_TRANSLATE_NOOP('Subversion', 'Add'),
+    pysvn.wc_notify_action.commit_added:
+    QT_TRANSLATE_NOOP('Subversion', 'Add'),
+    pysvn.wc_notify_action.commit_deleted:
+    QT_TRANSLATE_NOOP('Subversion', 'Delete'),
+    pysvn.wc_notify_action.commit_modified:
+    QT_TRANSLATE_NOOP('Subversion', 'Modify'),
     pysvn.wc_notify_action.commit_postfix_txdelta: None,
-    pysvn.wc_notify_action.commit_replaced: \
-        QT_TRANSLATE_NOOP('Subversion', 'Replace'),
-    pysvn.wc_notify_action.copy: \
-        QT_TRANSLATE_NOOP('Subversion', 'Copy'),
-    pysvn.wc_notify_action.delete: \
-        QT_TRANSLATE_NOOP('Subversion', 'Delete'),
-    pysvn.wc_notify_action.failed_revert: \
-        QT_TRANSLATE_NOOP('Subversion', 'Failed revert'),
-    pysvn.wc_notify_action.resolved: \
-        QT_TRANSLATE_NOOP('Subversion', 'Resolve'),
-    pysvn.wc_notify_action.restore: \
-        QT_TRANSLATE_NOOP('Subversion', 'Restore'),
-    pysvn.wc_notify_action.revert: \
-        QT_TRANSLATE_NOOP('Subversion', 'Revert'),
-    pysvn.wc_notify_action.skip: \
-        QT_TRANSLATE_NOOP('Subversion', 'Skip'),
+    pysvn.wc_notify_action.commit_replaced:
+    QT_TRANSLATE_NOOP('Subversion', 'Replace'),
+    pysvn.wc_notify_action.copy:
+    QT_TRANSLATE_NOOP('Subversion', 'Copy'),
+    pysvn.wc_notify_action.delete:
+    QT_TRANSLATE_NOOP('Subversion', 'Delete'),
+    pysvn.wc_notify_action.failed_revert:
+    QT_TRANSLATE_NOOP('Subversion', 'Failed revert'),
+    pysvn.wc_notify_action.resolved:
+    QT_TRANSLATE_NOOP('Subversion', 'Resolve'),
+    pysvn.wc_notify_action.restore:
+    QT_TRANSLATE_NOOP('Subversion', 'Restore'),
+    pysvn.wc_notify_action.revert:
+    QT_TRANSLATE_NOOP('Subversion', 'Revert'),
+    pysvn.wc_notify_action.skip:
+    QT_TRANSLATE_NOOP('Subversion', 'Skip'),
     pysvn.wc_notify_action.status_completed: None,
-    pysvn.wc_notify_action.status_external: \
-        QT_TRANSLATE_NOOP('Subversion', 'External'),
-    pysvn.wc_notify_action.update_add: \
-        QT_TRANSLATE_NOOP('Subversion', 'Add'),
+    pysvn.wc_notify_action.status_external:
+    QT_TRANSLATE_NOOP('Subversion', 'External'),
+    pysvn.wc_notify_action.update_add:
+    QT_TRANSLATE_NOOP('Subversion', 'Add'),
     pysvn.wc_notify_action.update_completed: None,
-    pysvn.wc_notify_action.update_delete: \
-        QT_TRANSLATE_NOOP('Subversion', 'Delete'),
-    pysvn.wc_notify_action.update_external: \
-        QT_TRANSLATE_NOOP('Subversion', 'External'),
-    pysvn.wc_notify_action.update_update: \
-        QT_TRANSLATE_NOOP('Subversion', 'Update'),
-    pysvn.wc_notify_action.annotate_revision: \
-        QT_TRANSLATE_NOOP('Subversion', 'Annotate'),
+    pysvn.wc_notify_action.update_delete:
+    QT_TRANSLATE_NOOP('Subversion', 'Delete'),
+    pysvn.wc_notify_action.update_external:
+    QT_TRANSLATE_NOOP('Subversion', 'External'),
+    pysvn.wc_notify_action.update_update:
+    QT_TRANSLATE_NOOP('Subversion', 'Update'),
+    pysvn.wc_notify_action.annotate_revision:
+    QT_TRANSLATE_NOOP('Subversion', 'Annotate'),
 }
 if hasattr(pysvn.wc_notify_action, 'locked'):
     svnNotifyActionMap[pysvn.wc_notify_action.locked] = \
@@ -72,32 +72,32 @@
         QT_TRANSLATE_NOOP('Subversion', 'Changelist moved')
 
 svnStatusMap = {
-    pysvn.wc_status_kind.added: \
-        QT_TRANSLATE_NOOP('Subversion', 'added'),
-    pysvn.wc_status_kind.conflicted: \
-        QT_TRANSLATE_NOOP('Subversion', 'conflict'),
-    pysvn.wc_status_kind.deleted: \
-        QT_TRANSLATE_NOOP('Subversion', 'deleted'),
-    pysvn.wc_status_kind.external: \
-        QT_TRANSLATE_NOOP('Subversion', 'external'),
-    pysvn.wc_status_kind.ignored: \
-        QT_TRANSLATE_NOOP('Subversion', 'ignored'),
-    pysvn.wc_status_kind.incomplete: \
-        QT_TRANSLATE_NOOP('Subversion', 'incomplete'),
-    pysvn.wc_status_kind.missing: \
-        QT_TRANSLATE_NOOP('Subversion', 'missing'),
-    pysvn.wc_status_kind.merged: \
-        QT_TRANSLATE_NOOP('Subversion', 'merged'),
-    pysvn.wc_status_kind.modified: \
-        QT_TRANSLATE_NOOP('Subversion', 'modified'),
-    pysvn.wc_status_kind.none: \
-        QT_TRANSLATE_NOOP('Subversion', 'normal'),
-    pysvn.wc_status_kind.normal: \
-        QT_TRANSLATE_NOOP('Subversion', 'normal'),
-    pysvn.wc_status_kind.obstructed: \
-        QT_TRANSLATE_NOOP('Subversion', 'type error'),
-    pysvn.wc_status_kind.replaced: \
-        QT_TRANSLATE_NOOP('Subversion', 'replaced'),
-    pysvn.wc_status_kind.unversioned: \
-        QT_TRANSLATE_NOOP('Subversion', 'unversioned'),
+    pysvn.wc_status_kind.added:
+    QT_TRANSLATE_NOOP('Subversion', 'added'),
+    pysvn.wc_status_kind.conflicted:
+    QT_TRANSLATE_NOOP('Subversion', 'conflict'),
+    pysvn.wc_status_kind.deleted:
+    QT_TRANSLATE_NOOP('Subversion', 'deleted'),
+    pysvn.wc_status_kind.external:
+    QT_TRANSLATE_NOOP('Subversion', 'external'),
+    pysvn.wc_status_kind.ignored:
+    QT_TRANSLATE_NOOP('Subversion', 'ignored'),
+    pysvn.wc_status_kind.incomplete:
+    QT_TRANSLATE_NOOP('Subversion', 'incomplete'),
+    pysvn.wc_status_kind.missing:
+    QT_TRANSLATE_NOOP('Subversion', 'missing'),
+    pysvn.wc_status_kind.merged:
+    QT_TRANSLATE_NOOP('Subversion', 'merged'),
+    pysvn.wc_status_kind.modified:
+    QT_TRANSLATE_NOOP('Subversion', 'modified'),
+    pysvn.wc_status_kind.none:
+    QT_TRANSLATE_NOOP('Subversion', 'normal'),
+    pysvn.wc_status_kind.normal:
+    QT_TRANSLATE_NOOP('Subversion', 'normal'),
+    pysvn.wc_status_kind.obstructed:
+    QT_TRANSLATE_NOOP('Subversion', 'type error'),
+    pysvn.wc_status_kind.replaced:
+    QT_TRANSLATE_NOOP('Subversion', 'replaced'),
+    pysvn.wc_status_kind.unversioned:
+    QT_TRANSLATE_NOOP('Subversion', 'unversioned'),
 }
--- a/Plugins/VcsPlugins/vcsPySvn/SvnDialog.py	Fri Nov 01 15:48:48 2013 +0100
+++ b/Plugins/VcsPlugins/vcsPySvn/SvnDialog.py	Sun Nov 03 15:58:22 2013 +0100
@@ -78,8 +78,8 @@
             msg = self.trUtf8("Revision {0}.\n").format(
                 eventDict["revision"].number)
         elif eventDict["path"] != "" and \
-             eventDict["action"] in svnNotifyActionMap and \
-             svnNotifyActionMap[eventDict["action"]] is not None:
+            eventDict["action"] in svnNotifyActionMap and \
+                svnNotifyActionMap[eventDict["action"]] is not None:
             mime = eventDict["mime_type"] == "application/octet-stream" and \
                 self.trUtf8(" (binary)") or ""
             msg = self.trUtf8("{0} {1}{2}\n")\
--- a/Plugins/VcsPlugins/vcsPySvn/SvnDialogMixin.py	Fri Nov 01 15:48:48 2013 +0100
+++ b/Plugins/VcsPlugins/vcsPySvn/SvnDialogMixin.py	Sun Nov 03 15:58:22 2013 +0100
@@ -105,7 +105,7 @@
                         """<tr><td>Valid from:</td><td>{3}</td></tr>"""
                         """<tr><td>Valid until:</td><td>{4}</td></tr>"""
                         """<tr><td>Issuer name:</td><td>{5}</td></tr>"""
-                        """</table>""")\
+                        """</table>""")
                 .format(trust_dict["realm"],
                         trust_dict["hostname"],
                         trust_dict["finger_print"],
--- a/Plugins/VcsPlugins/vcsPySvn/SvnDiffDialog.py	Fri Nov 01 15:48:48 2013 +0100
+++ b/Plugins/VcsPlugins/vcsPySvn/SvnDiffDialog.py	Sun Nov 03 15:58:22 2013 +0100
@@ -445,7 +445,7 @@
                 self.trUtf8(
                     '<p>The patch file <b>{0}</b> could not be saved.'
                     '<br>Reason: {1}</p>')
-                    .format(fname, str(why)))
+                .format(fname, str(why)))
         
     def __showError(self, msg):
         """
--- a/Plugins/VcsPlugins/vcsPySvn/SvnInfoDialog.py	Fri Nov 01 15:48:48 2013 +0100
+++ b/Plugins/VcsPlugins/vcsPySvn/SvnInfoDialog.py	Sun Nov 03 15:58:22 2013 +0100
@@ -96,7 +96,7 @@
                         .format(formatTime(info['last_changed_date']))
                 if info['last_changed_rev'] and \
                         info['last_changed_rev'].kind == \
-                            pysvn.opt_revision_kind.number:
+                        pysvn.opt_revision_kind.number:
                     infoStr += self.trUtf8(
                         "<tr><td><b>Last changed revision:</b></td>"
                         "<td>{0}</td></tr>")\
@@ -123,8 +123,7 @@
                         "<td>{0}</td></tr>")\
                         .format(formatTime(lockInfo['creation_date']))
                     if lockInfo['expiration_date'] is not None:
-                        infoStr += \
-                            self.trUtf8(
+                        infoStr += self.trUtf8(
                             "<tr><td><b>Lock Expiration Date:</b></td>"
                             "<td>{0}</td></tr>")\
                             .format(formatTime(lockInfo['expiration_date']))
--- a/Plugins/VcsPlugins/vcsPySvn/SvnMergeDialog.py	Fri Nov 01 15:48:48 2013 +0100
+++ b/Plugins/VcsPlugins/vcsPySvn/SvnMergeDialog.py	Sun Nov 03 15:58:22 2013 +0100
@@ -55,14 +55,14 @@
         Private method used to enable/disable the OK-button.
         """
         self.okButton.setDisabled(
-            self.tag1Combo.currentText() == "" or \
-            self.tag2Combo.currentText() == "" or \
-            not ((self.rx_url.exactMatch(self.tag1Combo.currentText()) and \
-                  self.rx_url.exactMatch(self.tag2Combo.currentText())) or \
-                 (self.rx_rev.exactMatch(self.tag1Combo.currentText()) and \
+            self.tag1Combo.currentText() == "" or
+            self.tag2Combo.currentText() == "" or
+            not ((self.rx_url.exactMatch(self.tag1Combo.currentText()) and
+                  self.rx_url.exactMatch(self.tag2Combo.currentText())) or
+                 (self.rx_rev.exactMatch(self.tag1Combo.currentText()) and
                   self.rx_rev.exactMatch(self.tag2Combo.currentText()))
-                )
-            )
+                 )
+        )
         
     def on_tag1Combo_editTextChanged(self, text):
         """
--- a/Plugins/VcsPlugins/vcsPySvn/SvnNewProjectOptionsDialog.py	Fri Nov 01 15:48:48 2013 +0100
+++ b/Plugins/VcsPlugins/vcsPySvn/SvnNewProjectOptionsDialog.py	Sun Nov 03 15:58:22 2013 +0100
@@ -56,7 +56,7 @@
         self.localProtocol = True
         
         self.vcsProjectDirEdit.setText(Utilities.toNativeSeparators(
-            Preferences.getMultiProject("Workspace") or 
+            Preferences.getMultiProject("Workspace") or
             Utilities.getHomeDir()))
         
     @pyqtSlot()
--- a/Plugins/VcsPlugins/vcsPySvn/SvnRevisionSelectionDialog.py	Fri Nov 01 15:48:48 2013 +0100
+++ b/Plugins/VcsPlugins/vcsPySvn/SvnRevisionSelectionDialog.py	Sun Nov 03 15:58:22 2013 +0100
@@ -67,7 +67,7 @@
         elif dateButton.isChecked():
             return "{{{0}}}".format(
                 QDateTime(dateEdit.date(), timeEdit.time())
-                    .toString(Qt.ISODate))
+                .toString(Qt.ISODate))
         elif headButton.isChecked():
             return "HEAD"
         elif workingButton.isChecked():
--- a/Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py	Fri Nov 01 15:48:48 2013 +0100
+++ b/Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py	Sun Nov 03 15:58:22 2013 +0100
@@ -332,11 +332,11 @@
                     if file.repos_text_status != pysvn.wc_status_kind.none:
                         uptodate = uptodate and \
                             file.repos_text_status != \
-                                pysvn.wc_status_kind.modified
+                            pysvn.wc_status_kind.modified
                     if file.repos_prop_status != pysvn.wc_status_kind.none:
                         uptodate = uptodate and \
                             file.repos_prop_status != \
-                                pysvn.wc_status_kind.modified
+                            pysvn.wc_status_kind.modified
                     
                     lockState = " "
                     if file.entry is not None and \
@@ -349,8 +349,9 @@
                         elif lockState == " " and file.repos_lock is not None:
                             lockState = "O"
                         elif lockState == "L" and \
-                             file.repos_lock is not None and \
-                             file.entry.lock_token != file.repos_lock["token"]:
+                            file.repos_lock is not None and \
+                            file.entry.lock_token != \
+                                file.repos_lock["token"]:
                             lockState = "S"
                     
                     fpath = Utilities.normcasepath(
@@ -636,7 +637,7 @@
         """
         Private slot to handle the Add context menu entry.
         """
-        names = [os.path.join(self.dname, itm.text(self.__pathColumn)) \
+        names = [os.path.join(self.dname, itm.text(self.__pathColumn))
                  for itm in self.__getUnversionedItems()]
         if not names:
             E5MessageBox.information(
@@ -658,7 +659,7 @@
         """
         Private slot to handle the Revert context menu entry.
         """
-        names = [os.path.join(self.dname, itm.text(self.__pathColumn)) \
+        names = [os.path.join(self.dname, itm.text(self.__pathColumn))
                  for itm in self.__getModifiedItems()]
         if not names:
             E5MessageBox.information(
@@ -744,7 +745,7 @@
         """
         Private slot to handle the Lock context menu entry.
         """
-        names = [os.path.join(self.dname, itm.text(self.__pathColumn)) \
+        names = [os.path.join(self.dname, itm.text(self.__pathColumn))
                  for itm in self.__getLockActionItems(self.unlockedIndicators)]
         if not names:
             E5MessageBox.information(
@@ -761,7 +762,7 @@
         """
         Private slot to handle the Unlock context menu entry.
         """
-        names = [os.path.join(self.dname, itm.text(self.__pathColumn)) \
+        names = [os.path.join(self.dname, itm.text(self.__pathColumn))
                  for itm in self.__getLockActionItems(self.lockedIndicators)]
         if not names:
             E5MessageBox.information(
@@ -780,7 +781,7 @@
         """
         names = [os.path.join(self.dname, itm.text(self.__pathColumn))
                  for itm in self.__getLockActionItems(
-                    self.stealBreakLockIndicators)]
+                     self.stealBreakLockIndicators)]
         if not names:
             E5MessageBox.information(
                 self,
@@ -798,7 +799,7 @@
         """
         names = [os.path.join(self.dname, itm.text(self.__pathColumn))
                  for itm in self.__getLockActionItems(
-