Fixed a bunch of indentation issues.

Sat, 19 Oct 2013 14:05:26 +0200

author
Detlev Offenbach <detlev@die-offenbachs.de>
date
Sat, 19 Oct 2013 14:05:26 +0200
changeset 3035
36e9f388958b
parent 3034
7ce719013078
child 3036
30c81c9e88b8

Fixed a bunch of indentation issues.

E5Graphics/E5GraphicsView.py file | annotate | diff | comparison | revisions
E5Gui/E5Action.py file | annotate | diff | comparison | revisions
E5Gui/E5MainWindow.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/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
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/AdBlockRule.py file | annotate | diff | comparison | revisions
Helpviewer/AdBlock/AdBlockSubscription.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/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/HelpTabWidget.py file | annotate | diff | comparison | revisions
Helpviewer/HelpTocWidget.py file | annotate | diff | comparison | revisions
Helpviewer/HelpWebSearchWidget.py file | annotate | diff | comparison | revisions
Helpviewer/HelpWindow.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/OpenSearchEngine.py file | annotate | diff | comparison | revisions
Helpviewer/OpenSearch/OpenSearchEngineModel.py file | annotate | diff | comparison | revisions
Helpviewer/OpenSearch/OpenSearchReader.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/SyncManager.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
eric5.e4p file | annotate | diff | comparison | revisions
eric5.py file | annotate | diff | comparison | revisions
eric5_api.py file | annotate | diff | comparison | revisions
eric5_doc.py file | annotate | diff | comparison | revisions
--- a/E5Graphics/E5GraphicsView.py	Sat Oct 19 13:03:39 2013 +0200
+++ b/E5Graphics/E5GraphicsView.py	Sat Oct 19 14:05:26 2013 +0200
@@ -320,10 +320,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	Sat Oct 19 13:03:39 2013 +0200
+++ b/E5Gui/E5Action.py	Sat Oct 19 14:05:26 2013 +0200
@@ -79,11 +79,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().__init__(parent)
--- a/E5Gui/E5MainWindow.py	Sat Oct 19 13:03:39 2013 +0200
+++ b/E5Gui/E5MainWindow.py	Sat Oct 19 14:05:26 2013 +0200
@@ -57,7 +57,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/E5ToolBarDialog.py	Sat Oct 19 13:03:39 2013 +0200
+++ b/E5Gui/E5ToolBarDialog.py	Sat Oct 19 14:05:26 2013 +0200
@@ -145,7 +145,7 @@
                     self.trUtf8(
                         """A toolbar with the name <b>{0}</b> already"""
                         """ exists.""")
-                        .format(name))
+                    .format(name))
                 return
             
             tbItem = E5ToolBarItem(None, [], False)
@@ -169,7 +169,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)
@@ -206,7 +206,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)
@@ -356,7 +356,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	Sat Oct 19 13:03:39 2013 +0200
+++ b/E5Gui/E5ToolBarManager.py	Sat Oct 19 14:05:26 2013 +0200
@@ -302,7 +302,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	Sat Oct 19 13:03:39 2013 +0200
+++ b/E5Network/E5Ftp.py	Sat Oct 19 14:05:26 2013 +0200
@@ -300,7 +300,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
@@ -308,14 +308,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)
@@ -334,6 +334,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	Sat Oct 19 13:03:39 2013 +0200
+++ b/E5Network/E5SslCertificatesDialog.py	Sat Oct 19 14:05:26 2013 +0200
@@ -66,7 +66,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)
@@ -157,7 +157,7 @@
                         """ normal security checks will be reinstantiated"""
                         """ and the server has to present a valid"""
                         """ certificate.</p>""")
-                .format(itm.text(0)))
+            .format(itm.text(0)))
         if res:
             server = itm.text(1)
             cert = self.serversCertificatesTree.currentItem().data(
@@ -173,7 +173,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:
@@ -222,7 +222,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:
@@ -254,7 +254,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:
@@ -365,7 +365,7 @@
                 """<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)))
+            .format(itm.text(0)))
         if res:
             cert = self.caCertificatesTree.currentItem().data(0, self.CertRole)
             
@@ -412,7 +412,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)
             
@@ -478,7 +478,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"):
@@ -510,7 +510,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	Sat Oct 19 13:03:39 2013 +0200
+++ b/E5Network/E5SslErrorHandler.py	Sat Oct 19 14:05:26 2013 +0200
@@ -104,7 +104,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])
@@ -134,7 +134,7 @@
             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),
+            .format(server, errorString),
             icon=E5MessageBox.Warning)
         
         if ret:
@@ -150,7 +150,7 @@
                         """<p>Certificates:<br/>{0}<br/>"""
                         """Do you want to accept all these certificates?"""
                         """</p>""")
-                        .format("".join(certinfos)))
+                    .format("".join(certinfos)))
                 if caRet:
                     if server not in caMerge:
                         caMerge[server] = []
@@ -218,7 +218,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	Sat Oct 19 13:03:39 2013 +0200
+++ b/E5XML/DebuggerPropertiesWriter.py	Sat Oct 19 14:05:26 2013 +0200
@@ -44,12 +44,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	Sat Oct 19 13:03:39 2013 +0200
+++ b/E5XML/HighlightingStylesWriter.py	Sat Oct 19 14:05:26 2013 +0200
@@ -42,7 +42,7 @@
         self.writeDTD(
             '<!DOCTYPE HighlightingStyles SYSTEM'
             ' "HighlightingStyles-{0}.dtd">'.format(
-            highlightingStylesFileFormatVersion))
+                highlightingStylesFileFormatVersion))
         
         # add some generation comments
         self.writeComment(" Eric5 highlighting styles ")
--- a/E5XML/PluginRepositoryReader.py	Sat Oct 19 13:03:39 2013 +0200
+++ b/E5XML/PluginRepositoryReader.py	Sat Oct 19 14:05:26 2013 +0200
@@ -66,7 +66,7 @@
                       "author": "",
                       "version": "",
                       "filename": "",
-        }
+                      }
         pluginInfo["status"] = self.attribute("status", "unknown")
         
         while not self.atEnd():
--- a/E5XML/ProjectWriter.py	Sat Oct 19 13:03:39 2013 +0200
+++ b/E5XML/ProjectWriter.py	Sat Oct 19 14:05:26 2013 +0200
@@ -50,9 +50,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	Sat Oct 19 13:03:39 2013 +0200
+++ b/E5XML/TasksReader.py	Sat Oct 19 14:05:26 2013 +0200
@@ -80,7 +80,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	Sat Oct 19 13:03:39 2013 +0200
+++ b/E5XML/UserProjectWriter.py	Sat Oct 19 14:05:26 2013 +0200
@@ -44,7 +44,7 @@
         
         self.writeDTD(
             '<!DOCTYPE UserProject SYSTEM "UserProject-{0}.dtd">'.format(
-            userProjectFileFormatVersion))
+                userProjectFileFormatVersion))
         
         # add some generation comments
         self.writeComment(
--- a/E5XML/XMLStreamReaderBase.py	Sat Oct 19 13:03:39 2013 +0200
+++ b/E5XML/XMLStreamReaderBase.py	Sat Oct 19 14:05:26 2013 +0200
@@ -52,13 +52,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):
--- a/Globals/AppInfo.py	Sat Oct 19 13:03:39 2013 +0200
+++ b/Globals/AppInfo.py	Sat Oct 19 14:05:26 2013 +0200
@@ -31,4 +31,4 @@
         "description": description,
         "version": Version,
         "options": options
-        }
+    }
--- a/Graphics/ApplicationDiagramBuilder.py	Sat Oct 19 13:03:39 2013 +0200
+++ b/Graphics/ApplicationDiagramBuilder.py	Sat Oct 19 14:05:26 2013 +0200
@@ -246,8 +246,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	Sat Oct 19 13:03:39 2013 +0200
+++ b/Graphics/ImportsDiagramBuilder.py	Sat Oct 19 14:05:26 2013 +0200
@@ -76,11 +76,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))))
         
@@ -121,7 +121,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
         
@@ -247,8 +247,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	Sat Oct 19 13:03:39 2013 +0200
+++ b/Graphics/PackageDiagramBuilder.py	Sat Oct 19 14:05:26 2013 +0200
@@ -205,7 +205,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
@@ -221,7 +221,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
@@ -244,7 +244,7 @@
                     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:
@@ -423,10 +423,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	Sat Oct 19 13:03:39 2013 +0200
+++ b/Graphics/PixmapDiagram.py	Sat Oct 19 14:05:26 2013 +0200
@@ -232,7 +232,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):
         """
--- a/Graphics/SvgDiagram.py	Sat Oct 19 13:03:39 2013 +0200
+++ b/Graphics/SvgDiagram.py	Sat Oct 19 14:05:26 2013 +0200
@@ -201,8 +201,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):
         """
--- a/Graphics/UMLClassDiagramBuilder.py	Sat Oct 19 13:03:39 2013 +0200
+++ b/Graphics/UMLClassDiagramBuilder.py	Sat Oct 19 14:05:26 2013 +0200
@@ -105,8 +105,7 @@
                     cw = None
                 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)
@@ -275,10 +274,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	Sat Oct 19 13:03:39 2013 +0200
+++ b/Graphics/UMLDialog.py	Sat Oct 19 14:05:26 2013 +0200
@@ -372,9 +372,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	Sat Oct 19 13:03:39 2013 +0200
+++ b/Graphics/UMLGraphicsView.py	Sat Oct 19 14:05:26 2013 +0200
@@ -306,7 +306,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)
@@ -358,7 +358,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):
         """
--- a/Helpviewer/AdBlock/AdBlockBlockedNetworkReply.py	Sat Oct 19 13:03:39 2013 +0200
+++ b/Helpviewer/AdBlock/AdBlockBlockedNetworkReply.py	Sat Oct 19 14:05:26 2013 +0200
@@ -32,7 +32,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	Sat Oct 19 13:03:39 2013 +0200
+++ b/Helpviewer/AdBlock/AdBlockDialog.py	Sat Oct 19 14:05:26 2013 +0200
@@ -110,11 +110,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()
@@ -213,8 +213,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	Sat Oct 19 13:03:39 2013 +0200
+++ b/Helpviewer/AdBlock/AdBlockIcon.py	Sat Oct 19 14:05:26 2013 +0200
@@ -166,7 +166,7 @@
         import Helpviewer.HelpWindow
         return urlHost and \
             Helpviewer.HelpWindow.HelpWindow.adBlockManager()\
-                .isHostExcepted(urlHost)
+            .isHostExcepted(urlHost)
     
     def currentChanged(self):
         """
--- a/Helpviewer/AdBlock/AdBlockRule.py	Sat Oct 19 13:03:39 2013 +0200
+++ b/Helpviewer/AdBlock/AdBlockRule.py	Sat Oct 19 14:05:26 2013 +0200
@@ -197,7 +197,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	Sat Oct 19 13:03:39 2013 +0200
+++ b/Helpviewer/AdBlock/AdBlockSubscription.py	Sat Oct 19 14:05:26 2013 +0200
@@ -270,7 +270,7 @@
                     self.trUtf8("Load subscription rules"),
                     self.trUtf8(
                         """Unable to open adblock file '{0}' for reading.""")
-                        .format(fileName))
+                    .format(fileName))
             else:
                 textStream = QTextStream(f)
                 header = textStream.readLine(1024)
@@ -280,7 +280,7 @@
                         self.trUtf8("Load subscription rules"),
                         self.trUtf8("""AdBlock file '{0}' does not start"""
                                     """ with [Adblock.""")
-                            .format(fileName))
+                        .format(fileName))
                     f.close()
                     f.remove()
                     self.__lastUpdate = QDateTime()
@@ -379,7 +379,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
@@ -401,7 +401,7 @@
                 self.trUtf8("Downloading subscription rules"),
                 self.trUtf8(
                     """Unable to open adblock file '{0}' for writing.""")
-                    .file(fileName))
+                .file(fileName))
             return
         f.write(response)
         f.close()
@@ -457,8 +457,8 @@
                     """Found: {1}<br/>"""
                     """Calculated: {2}<br/>"""
                     """Use it anyway?</p>""")
-                    .format(self.__title, expectedChecksum,
-                            calculatedChecksum))
+                .format(self.__title, expectedChecksum,
+                        calculatedChecksum))
             return res
     
     def saveRules(self):
@@ -476,7 +476,7 @@
                 self.trUtf8("Saving subscription rules"),
                 self.trUtf8(
                     """Unable to open adblock file '{0}' for writing.""")
-                    .format(fileName))
+                .format(fileName))
             return
         
         textStream = QTextStream(f)
--- a/Helpviewer/Bookmarks/BookmarksManager.py	Sat Oct 19 13:03:39 2013 +0200
+++ b/Helpviewer/Bookmarks/BookmarksManager.py	Sat Oct 19 14:05:26 2013 +0200
@@ -140,9 +140,9 @@
                 self.trUtf8(
                     """Error when loading bookmarks on line {0},"""
                     """ column {1}:\n {2}""")
-                    .format(reader.lineNumber(),
-                            reader.columnNumber(),
-                            reader.errorString()))
+                .format(reader.lineNumber(),
+                        reader.columnNumber(),
+                        reader.errorString()))
         
         others = []
         for index in range(
@@ -205,7 +205,7 @@
                 None,
                 self.trUtf8("Saving Bookmarks"),
                 self.trUtf8("""Error saving bookmarks to <b>{0}</b>.""")
-                    .format(bookmarkFile))
+                .format(bookmarkFile))
         
         # restore localized titles
         self.__menu.title = self.trUtf8(BOOKMARKMENU)
@@ -391,7 +391,7 @@
                 None,
                 self.trUtf8("Exporting Bookmarks"),
                 self.trUtf8("""Error exporting bookmarks to <b>{0}</b>.""")
-                    .format(fileName))
+                .format(fileName))
     
     def __convertFromOldBookmarks(self):
         """
--- a/Helpviewer/Bookmarks/BookmarksMenu.py	Sat Oct 19 13:03:39 2013 +0200
+++ b/Helpviewer/Bookmarks/BookmarksMenu.py	Sat Oct 19 14:05:26 2013 +0200
@@ -235,7 +235,7 @@
             .bookmarksManager()
         self.setModel(self.__bookmarksManager.bookmarksModel())
         self.setRootIndex(self.__bookmarksManager.bookmarksModel()
-                            .nodeIndex(self.__bookmarksManager.menu()))
+                          .nodeIndex(self.__bookmarksManager.menu()))
         
         # initial actions
         for act in self.__initialActions:
--- a/Helpviewer/Bookmarks/BookmarksModel.py	Sat Oct 19 13:03:39 2013 +0200
+++ b/Helpviewer/Bookmarks/BookmarksModel.py	Sat Oct 19 14:05:26 2013 +0200
@@ -192,7 +192,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	Sat Oct 19 13:03:39 2013 +0200
+++ b/Helpviewer/ClosedTabsManager.py	Sat Oct 19 14:05:26 2013 +0200
@@ -35,8 +35,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	Sat Oct 19 13:03:39 2013 +0200
+++ b/Helpviewer/CookieJar/CookieExceptionsModel.py	Sat Oct 19 14:05:26 2013 +0200
@@ -124,8 +124,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	Sat Oct 19 13:03:39 2013 +0200
+++ b/Helpviewer/CookieJar/CookieJar.py	Sat Oct 19 14:05:26 2013 +0200
@@ -243,11 +243,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
--- a/Helpviewer/Download/DownloadItem.py	Sat Oct 19 13:03:39 2013 +0200
+++ b/Helpviewer/Download/DownloadItem.py	Sat Oct 19 14:05:26 2013 +0200
@@ -555,7 +555,7 @@
                 .format(
                     dataString(self.__bytesReceived),
                     bytesTotal == -1 and self.trUtf8("?")
-                                     or dataString(bytesTotal),
+                    or dataString(bytesTotal),
                     dataString(int(speed)),
                     remaining)
         else:
@@ -566,7 +566,7 @@
                                 encoding="ascii"),
                             str(self.__md5Hash.result().toHex(),
                                 encoding="ascii")
-                    )
+                            )
             else:
                 info = self.trUtf8("{0} of {1} - Stopped")\
                     .format(dataString(self.__bytesReceived),
--- a/Helpviewer/GreaseMonkey/GreaseMonkeyAddScriptDialog.py	Sat Oct 19 13:03:39 2013 +0200
+++ b/Helpviewer/GreaseMonkey/GreaseMonkeyAddScriptDialog.py	Sat Oct 19 14:05:26 2013 +0200
@@ -55,7 +55,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	Sat Oct 19 13:03:39 2013 +0200
+++ b/Helpviewer/GreaseMonkey/GreaseMonkeyConfiguration/GreaseMonkeyConfigurationDialog.py	Sat Oct 19 14:05:26 2013 +0200
@@ -19,7 +19,7 @@
 
 
 class GreaseMonkeyConfigurationDialog(
-    QDialog, Ui_GreaseMonkeyConfigurationDialog):
+        QDialog, Ui_GreaseMonkeyConfigurationDialog):
     """
     Class implementing the GreaseMonkey scripts configuration dialog.
     """
@@ -148,7 +148,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	Sat Oct 19 13:03:39 2013 +0200
+++ b/Helpviewer/GreaseMonkey/GreaseMonkeyConfiguration/GreaseMonkeyConfigurationListDelegate.py	Sat Oct 19 14:05:26 2013 +0200
@@ -79,7 +79,7 @@
         
         leftPos = self.__padding
         rightPos = opt.rect.right() - self.__padding - \
-                   GreaseMonkeyConfigurationListDelegate.RemoveIconSize
+            GreaseMonkeyConfigurationListDelegate.RemoveIconSize
         
         # Draw background
         style.drawPrimitive(QStyle.PE_PanelItemViewItem, opt, painter, widget)
@@ -180,9 +180,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	Sat Oct 19 13:03:39 2013 +0200
+++ b/Helpviewer/GreaseMonkey/GreaseMonkeyConfiguration/GreaseMonkeyConfigurationScriptInfoDialog.py	Sat Oct 19 14:05:26 2013 +0200
@@ -19,7 +19,7 @@
 
 
 class GreaseMonkeyConfigurationScriptInfoDialog(
-    QDialog, Ui_GreaseMonkeyConfigurationScriptInfoDialog):
+        QDialog, Ui_GreaseMonkeyConfigurationScriptInfoDialog):
     """
     Class implementing a dialog to show GreaseMonkey script information.
     """
--- a/Helpviewer/GreaseMonkey/GreaseMonkeyDownloader.py	Sat Oct 19 13:03:39 2013 +0200
+++ b/Helpviewer/GreaseMonkey/GreaseMonkeyDownloader.py	Sat Oct 19 14:05:26 2013 +0200
@@ -72,7 +72,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)
@@ -123,7 +123,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)
@@ -167,7 +167,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	Sat Oct 19 13:03:39 2013 +0200
+++ b/Helpviewer/GreaseMonkey/GreaseMonkeyManager.py	Sat Oct 19 14:05:26 2013 +0200
@@ -250,7 +250,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	Sat Oct 19 13:03:39 2013 +0200
+++ b/Helpviewer/HelpBrowserWV.py	Sat Oct 19 14:05:26 2013 +0200
@@ -250,7 +250,7 @@
         """
         try:
             if extension in [QWebPage.ErrorPageExtension,
-                              QWebPage.ChooseMultipleFilesExtension]:
+                             QWebPage.ChooseMultipleFilesExtension]:
                 return True
         except AttributeError:
             pass
@@ -336,13 +336,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"):
@@ -558,7 +558,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:
@@ -824,7 +824,7 @@
                     self.trUtf8("eric5 Web Browser"),
                     self.trUtf8(
                         """<p>The file <b>{0}</b> does not exist.</p>""")
-                        .format(name.toLocalFile()))
+                    .format(name.toLocalFile()))
                 return
 
             if name.toLocalFile().endswith(".pdf") or \
@@ -1193,7 +1193,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
@@ -1347,9 +1347,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):
         """
@@ -1938,13 +1938,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"):
@@ -1953,7 +1953,7 @@
         html = html.replace("@H1@", reply.errorString().encode("utf8"))
         html = html.replace(
             "@H2@", self.trUtf8("When connecting to: {0}.")
-                .format(urlString).encode("utf8"))
+            .format(urlString).encode("utf8"))
         html = html.replace(
             "@LI-1@",
             self.trUtf8("Check the address for errors such as "
@@ -2009,8 +2009,8 @@
                 """<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),
+            .format(self.__dataString(securityOrigin.databaseQuota()),
+                    databaseName),
             yesDefault=True)
         if res:
             newQuota, ok = QInputDialog.getInt(
@@ -2251,7 +2251,7 @@
             # 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/atom+xml"):
                 continue
             
             title = linkElement.attribute("title")
--- a/Helpviewer/HelpDocsInstaller.py	Sat Oct 19 13:03:39 2013 +0200
+++ b/Helpviewer/HelpDocsInstaller.py	Sat Oct 19 14:05:26 2013 +0200
@@ -150,7 +150,7 @@
                         self.trUtf8(
                             """<p>The file <b>{0}</b> could not be"""
                             """ registered. <br/>Reason: {1}</p>""")
-                            .format(fi.absoluteFilePath, engine.error())
+                        .format(fi.absoluteFilePath, engine.error())
                     )
                     return False
                 
@@ -211,7 +211,7 @@
                         self.trUtf8(
                             """<p>The file <b>{0}</b> could not be"""
                             """ registered. <br/>Reason: {1}</p>""")
-                            .format(fi.absoluteFilePath, engine.error())
+                        .format(fi.absoluteFilePath, engine.error())
                     )
                     return False
                 
--- a/Helpviewer/HelpIndexWidget.py	Sat Oct 19 13:03:39 2013 +0200
+++ b/Helpviewer/HelpIndexWidget.py	Sat Oct 19 14:05:26 2013 +0200
@@ -136,7 +136,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()
@@ -160,7 +160,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/HelpTabWidget.py	Sat Oct 19 13:03:39 2013 +0200
+++ b/Helpviewer/HelpTabWidget.py	Sat Oct 19 14:05:26 2013 +0200
@@ -261,7 +261,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):
--- a/Helpviewer/HelpTocWidget.py	Sat Oct 19 13:03:39 2013 +0200
+++ b/Helpviewer/HelpTocWidget.py	Sat Oct 19 14:05:26 2013 +0200
@@ -101,7 +101,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/HelpWebSearchWidget.py	Sat Oct 19 13:03:39 2013 +0200
+++ b/Helpviewer/HelpWebSearchWidget.py	Sat Oct 19 14:05:26 2013 +0200
@@ -114,7 +114,7 @@
         """
         if not self.__suggestions or \
            (self.__model.rowCount() > 0 and
-            self.__model.item(0) != self.__suggestionsItem):
+                self.__model.item(0) != self.__suggestionsItem):
             self.__model.clear()
             self.__suggestionsItem = None
         else:
@@ -371,7 +371,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()
     
@@ -380,7 +380,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	Sat Oct 19 13:03:39 2013 +0200
+++ b/Helpviewer/HelpWindow.py	Sat Oct 19 14:05:26 2013 +0200
@@ -428,8 +428,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)
@@ -443,8 +443,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)
@@ -458,9 +458,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)
@@ -475,9 +475,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)
@@ -492,8 +492,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)
@@ -507,8 +507,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)
@@ -540,8 +540,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(
@@ -555,8 +555,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(
@@ -571,8 +571,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)
@@ -600,10 +600,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(
@@ -632,8 +632,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(
@@ -647,9 +647,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(
@@ -665,8 +665,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:
@@ -684,9 +684,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)
@@ -752,8 +752,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)
@@ -767,8 +767,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)
@@ -782,8 +782,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)
@@ -828,10 +828,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(
@@ -860,10 +860,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(
@@ -875,11 +875,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)
@@ -925,8 +925,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)
@@ -941,8 +941,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)
@@ -957,8 +957,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)
@@ -988,10 +988,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(
@@ -1180,7 +1180,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"""
@@ -1195,10 +1195,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)
@@ -1209,10 +1209,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)
@@ -1223,10 +1223,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(
@@ -1254,10 +1254,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(
@@ -1269,10 +1269,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(
@@ -1336,10 +1336,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)
@@ -1420,10 +1420,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(
@@ -1470,10 +1470,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(
@@ -1985,7 +1985,7 @@
                         "PDF Files (*.pdf);;"
                         "CHM Files (*.chm);;"
                         "All Files (*)"
-            ))
+                        ))
         if fn:
             if Utilities.isWindowsPlatform():
                 url = "file:///" + Utilities.fromNativeSeparators(fn)
@@ -2005,7 +2005,7 @@
                         "PDF Files (*.pdf);;"
                         "CHM Files (*.chm);;"
                         "All Files (*)"
-            ))
+                        ))
         if fn:
             if Utilities.isWindowsPlatform():
                 url = "file:///" + Utilities.fromNativeSeparators(fn)
@@ -3644,7 +3644,7 @@
         @return style sheet (QUrl)
         """
         userStyle = self.adBlockManager().elementHidingRules() + \
-                    "{display:none !important;}"
+            "{display:none !important;}"
         
         if styleSheetFile:
             try:
--- a/Helpviewer/History/HistoryManager.py	Sat Oct 19 13:03:39 2013 +0200
+++ b/Helpviewer/History/HistoryManager.py	Sat Oct 19 14:05:26 2013 +0200
@@ -351,8 +351,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 = ""
@@ -388,7 +388,7 @@
                 self.trUtf8(
                     """<p>Unable to open history file <b>{0}</b>.<br/>"""
                     """Reason: {1}</p>""")
-                    .format(historyFile.fileName, historyFile.errorString()))
+                .format(historyFile.fileName, historyFile.errorString()))
             return
         
         history = []
@@ -468,7 +468,7 @@
                 self.trUtf8(
                     """<p>Unable to open history file <b>{0}</b>.<br/>"""
                     """Reason: {1}</p>""")
-                    .format(f.fileName(), f.errorString()))
+                .format(f.fileName(), f.errorString()))
             return
         
         for index in range(first, -1, -1):
@@ -491,8 +491,8 @@
                     self.trUtf8(
                         """<p>Error removing old history file <b>{0}</b>."""
                         """<br/>Reason: {1}</p>""")
-                        .format(historyFile.fileName(),
-                                historyFile.errorString()))
+                    .format(historyFile.fileName(),
+                            historyFile.errorString()))
             if not f.copy(historyFile.fileName()):
                 E5MessageBox.warning(
                     None,
@@ -500,7 +500,7 @@
                     self.trUtf8(
                         """<p>Error moving new history file over old one """
                         """(<b>{0}</b>).<br/>Reason: {1}</p>""")
-                        .format(historyFile.fileName(), f.errorString()))
+                    .format(historyFile.fileName(), f.errorString()))
         self.historySaved.emit()
         try:
             self.__lastSavedUrl = self.__history[0].url
--- a/Helpviewer/History/HistoryMenu.py	Sat Oct 19 13:03:39 2013 +0200
+++ b/Helpviewer/History/HistoryMenu.py	Sat Oct 19 14:05:26 2013 +0200
@@ -293,12 +293,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):
         """
@@ -447,12 +447,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/OpenSearchEngine.py	Sat Oct 19 13:03:39 2013 +0200
+++ b/Helpviewer/OpenSearch/OpenSearchEngine.py	Sat Oct 19 14:05:26 2013 +0200
@@ -192,8 +192,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	Sat Oct 19 13:03:39 2013 +0200
+++ b/Helpviewer/OpenSearch/OpenSearchEngineModel.py	Sat Oct 19 14:05:26 2013 +0200
@@ -131,7 +131,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/OpenSearchReader.py	Sat Oct 19 13:03:39 2013 +0200
+++ b/Helpviewer/OpenSearch/OpenSearchReader.py	Sat Oct 19 14:05:26 2013 +0200
@@ -102,8 +102,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/Passwords/PasswordManager.py	Sat Oct 19 13:03:39 2013 +0200
+++ b/Helpviewer/Passwords/PasswordManager.py	Sat Oct 19 14:05:26 2013 +0200
@@ -167,9 +167,9 @@
                     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()))
+                    .format(reader.lineNumber(),
+                            reader.columnNumber(),
+                            reader.errorString()))
         
         self.__loaded = True
     
@@ -194,7 +194,7 @@
                     self.trUtf8("""<p>Login data could not be loaded """
                                 """from <b>{0}</b></p>"""
                                 """<p>Reason: {1}</p>""")
-                        .format(loginFile, str(err)))
+                    .format(loginFile, str(err)))
                 return
             
             data = []
@@ -220,7 +220,7 @@
                                     """<p>Login data could not be loaded """
                                     """from <b>{0}</b></p>"""
                                     """<p>Reason: Wrong input format</p>""")
-                                    .format(loginFile))
+                                .format(loginFile))
                             return
                         self.__logins[data[0]] = (data[1], data[2])
                         data = []
@@ -413,7 +413,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:
--- a/Helpviewer/QtHelpDocumentationDialog.py	Sat Oct 19 13:03:39 2013 +0200
+++ b/Helpviewer/QtHelpDocumentationDialog.py	Sat Oct 19 14:05:26 2013 +0200
@@ -81,7 +81,7 @@
                     self.trUtf8("Add Documentation"),
                     self.trUtf8(
                         """The namespace <b>{0}</b> is already registered.""")
-                        .format(ns)
+                    .format(ns)
                 )
                 continue
             
@@ -142,7 +142,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	Sat Oct 19 13:03:39 2013 +0200
+++ b/Helpviewer/SiteInfo/SiteInfoDialog.py	Sat Oct 19 14:05:26 2013 +0200
@@ -92,7 +92,7 @@
         # 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 sslInfo[0].isValid())):
             self.securityLabel.setStyleSheet(SiteInfoDialog.okStyle)
             self.securityLabel.setText('<b>Connection is encrypted.</b>')
             if SSL:
@@ -272,7 +272,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	Sat Oct 19 13:03:39 2013 +0200
+++ b/Helpviewer/SpeedDial/Page.py	Sat Oct 19 14:05:26 2013 +0200
@@ -32,4 +32,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	Sat Oct 19 13:03:39 2013 +0200
+++ b/Helpviewer/Sync/DirectorySyncHandler.py	Sat Oct 19 14:05:26 2013 +0200
@@ -180,7 +180,7 @@
             self.__initialSyncFile(
                 "bookmarks",
                 Helpviewer.HelpWindow.HelpWindow.bookmarksManager()
-                    .getFileName())
+                .getFileName())
         
         QCoreApplication.processEvents()
         # History
@@ -188,7 +188,7 @@
             self.__initialSyncFile(
                 "history",
                 Helpviewer.HelpWindow.HelpWindow.historyManager()
-                    .getFileName())
+                .getFileName())
         
         QCoreApplication.processEvents()
         # Passwords
@@ -196,7 +196,7 @@
             self.__initialSyncFile(
                 "passwords",
                 Helpviewer.HelpWindow.HelpWindow.passwordManager()
-                    .getFileName())
+                .getFileName())
         
         QCoreApplication.processEvents()
         # User Agent Settings
@@ -204,7 +204,7 @@
             self.__initialSyncFile(
                 "useragents",
                 Helpviewer.HelpWindow.HelpWindow.userAgentsManager()
-                    .getFileName())
+                .getFileName())
         
         QCoreApplication.processEvents()
         # Speed Dial Settings
--- a/Helpviewer/Sync/FtpSyncHandler.py	Sat Oct 19 13:03:39 2013 +0200
+++ b/Helpviewer/Sync/FtpSyncHandler.py	Sat Oct 19 14:05:26 2013 +0200
@@ -281,28 +281,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/SyncManager.py	Sat Oct 19 13:03:39 2013 +0200
+++ b/Helpviewer/Sync/SyncManager.py	Sat Oct 19 14:05:26 2013 +0200
@@ -182,7 +182,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/UrlBar.py	Sat Oct 19 13:03:39 2013 +0200
+++ b/Helpviewer/UrlBar/UrlBar.py	Sat Oct 19 14:05:26 2013 +0200
@@ -154,7 +154,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)
@@ -259,7 +259,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_()
--- a/Helpviewer/UserAgent/UserAgentManager.py	Sat Oct 19 13:03:39 2013 +0200
+++ b/Helpviewer/UserAgent/UserAgentManager.py	Sat Oct 19 14:05:26 2013 +0200
@@ -89,9 +89,9 @@
                     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()))
+                    .format(reader.lineNumber(),
+                            reader.columnNumber(),
+                            reader.errorString()))
         
         self.__loaded = True
     
@@ -116,7 +116,7 @@
                     self.trUtf8("""<p>User agent data could not be loaded """
                                 """from <b>{0}</b></p>"""
                                 """<p>Reason: {1}</p>""")
-                        .format(agentFile, str(err)))
+                    .format(agentFile, str(err)))
                 return
             
             for line in lines.splitlines():
--- a/Helpviewer/UserAgent/UserAgentMenu.py	Sat Oct 19 13:03:39 2013 +0200
+++ b/Helpviewer/UserAgent/UserAgentMenu.py	Sat Oct 19 14:05:26 2013 +0200
@@ -182,6 +182,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	Sat Oct 19 13:03:39 2013 +0200
+++ b/Helpviewer/VirusTotalApi.py	Sat Oct 19 14:05:26 2013 +0200
@@ -82,7 +82,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):
@@ -142,7 +142,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	Sat Oct 19 13:03:39 2013 +0200
+++ b/Helpviewer/WebPlugins/ClickToFlash/ClickToFlash.py	Sat Oct 19 14:05:26 2013 +0200
@@ -314,5 +314,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	Sat Oct 19 13:03:39 2013 +0200
+++ b/Helpviewer/WebPlugins/ClickToFlash/ClickToFlashPlugin.py	Sat Oct 19 14:05:26 2013 +0200
@@ -148,8 +148,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/eric5.e4p	Sat Oct 19 13:03:39 2013 +0200
+++ b/eric5.e4p	Sat Oct 19 14:05:26 2013 +0200
@@ -1929,7 +1929,7 @@
               <string>ExcludeMessages</string>
             </key>
             <value>
-              <string>E24, D, W293, N802, N803, N807, N808, N821,E12</string>
+              <string>E24, D, W293, N802, N803, N807, N808, N821</string>
             </value>
             <key>
               <string>FixCodes</string>
--- a/eric5.py	Sat Oct 19 13:03:39 2013 +0200
+++ b/eric5.py	Sat Oct 19 14:05:26 2013 +0200
@@ -99,7 +99,7 @@
         """An unhandled exception occurred. Please report the problem\n"""\
         """using the error reporting dialog or via email to <{0}>.\n"""\
         """A log has been written to "{1}".\n\nError information:\n""".format(
-        BugAddress, logFile)
+            BugAddress, logFile)
     timeString = time.strftime("%Y-%m-%d, %H:%M:%S")
     
     versionInfo = "\n{0}\n{1}".format(
--- a/eric5_api.py	Sat Oct 19 13:03:39 2013 +0200
+++ b/eric5_api.py	Sat Oct 19 14:05:26 2013 +0200
@@ -87,17 +87,21 @@
     """
     Function to show the version information.
     """
-    print("""eric5_api  {0}
-
-Eric5 API generator.
-
-Copyright (c) 2004 - 2013 Detlev Offenbach <detlev@die-offenbachs.de>
-This is free software; see the LICENSE.GPL3 for copying conditions.
-There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A
-PARTICULAR PURPOSE.""".format(Version))
+    print(
+        """eric5_api  {0}\n"""
+        """\n"""
+        """Eric5 API generator.\n"""
+        """\n"""
+        """Copyright (c) 2004 - 2013 Detlev Offenbach"""
+        """ <detlev@die-offenbachs.de>\n"""
+        """This is free software; see the LICENSE.GPL3 for copying"""
+        """ conditions.\n"""
+        """There is NO warranty; not even for MERCHANTABILITY or FITNESS"""
+        """ FOR A\n"""
+        """PARTICULAR PURPOSE.""".format(Version))
     sys.exit(1)
 
-
+    
 def main():
     """
     Main entry point into the application.
--- a/eric5_doc.py	Sat Oct 19 13:03:39 2013 +0200
+++ b/eric5_doc.py	Sat Oct 19 14:05:26 2013 +0200
@@ -122,14 +122,18 @@
     """
     Function to show the version information.
     """
-    print("""eric5_doc  {0}
-
-Eric5 API documentation generator.
-
-Copyright (c) 2003-2013 Detlev Offenbach <detlev@die-offenbachs.de>
-This is free software; see the LICENSE.GPL3 for copying conditions.
-There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A
-PARTICULAR PURPOSE.""".format(Version))
+    print(
+        """eric5_doc  {0}\n"""
+        """\n"""
+        """Eric5 API documentation generator.\n"""
+        """\n"""
+        """Copyright (c) 2003-2013 Detlev Offenbach"""
+        """ <detlev@die-offenbachs.de>\n"""
+        """This is free software; see the LICENSE.GPL3 for copying"""
+        """ conditions.\n"""
+        """There is NO warranty; not even for MERCHANTABILITY or FITNESS"""
+        """ FOR A\n"""
+        """PARTICULAR PURPOSE.""".format(Version))
     sys.exit(1)
 
 
@@ -153,7 +157,7 @@
              "create-qhp", "qhp-outdir=", "qhp-namespace=",
              "qhp-virtualfolder=", "qhp-filtername=", "qhp-filterattribs=",
              "qhp-title=", "create-qhc",
-            ])
+             ])
     except getopt.error:
         usage()
 
@@ -252,7 +256,7 @@
     if qtHelpCreation and \
        (qtHelpNamespace == "" or
         qtHelpFolder == "" or '/' in qtHelpFolder or
-        qtHelpTitle == ""):
+            qtHelpTitle == ""):
         usage()
     
     if qtHelpCreation:
@@ -298,7 +302,7 @@
                 except EnvironmentError:
                     sys.stderr.write(
                         "Could not create QtHelp output directory {0}.".format(
-                        qtHelpOutputDir))
+                            qtHelpOutputDir))
                     sys.exit(2)
         else:
             qtHelpOutputDir = os.getcwd()

eric ide

mercurial