Mercurial Repositories > eric / changeset

--- a/eric6/WebBrowser/TabManager/TabManagerWidget.py	Wed Sep 25 18:52:40 2019 +0200
+++ b/eric6/WebBrowser/TabManager/TabManagerWidget.py	Wed Sep 25 19:00:09 2019 +0200
@@ -17,8 +17,9 @@
 import collections
 
 from PyQt5.QtCore import pyqtSignal, pyqtSlot, Qt, QPoint, QTimer, QRect
-from PyQt5.QtWidgets import QWidget, QVBoxLayout, QTreeWidget, \
-    QTreeWidgetItem, QMenu, QStyle, QAction
+from PyQt5.QtWidgets import (
+    QWidget, QVBoxLayout, QTreeWidget, QTreeWidgetItem, QMenu, QStyle, QAction
+)
 
 import E5Network
 from E5Network import E5TldExtractor
@@ -133,8 +134,10 @@
         
         for mainWin in browsersDict:
             for browser in browsersDict[mainWin]:
-                if not browser.url().isEmpty() and \
-                        not browser.url().scheme() == "eric":
+                if (
+                    not browser.url().isEmpty() and
+                    not browser.url().scheme() == "eric"
+                ):
                     bookmark = BookmarkNode(BookmarkNode.Bookmark)
                     bookmark.url = bytes(browser.url().toEncoded()).decode()
                     bookmark.title = browser.title()
@@ -180,8 +183,9 @@
             if host.lower().startswith("www."):
                 host = host[4:]
         else:
-            registeredDomain = \
+            registeredDomain = (
                 TabManagerWidget._tldExtractor.registrableDomain(host)
+            )
             if registeredDomain:
                 host = registeredDomain
         
@@ -393,8 +397,9 @@
             
             for row in range(winItem.childCount()):
                 tabItem = winItem.child(row)
-                if tabItem.data(0, TabManagerWidget.WebBrowserRole) in \
-                        selectedBrowsers:
+                if tabItem.data(0, TabManagerWidget.WebBrowserRole) in (
+                    selectedBrowsers
+                ):
                     tabItem.setCheckState(0, Qt.Checked)
         
         self.__tree.expandAll()
@@ -590,8 +595,7 @@
                     self.frameGeometry().width()):
                 x = windowFrameGeometry.right() + 1
             else:
-                x = windowFrameGeometry.x() - 1 \
-                    - self.frameGeometry().width()
+                x = windowFrameGeometry.x() - 1 - self.frameGeometry().width()
             
             newGeo = QRect(x, y, self.width(), window.height())
             self.setGeometry(newGeo)

--- a/eric6/WebBrowser/Tools/WebBrowserTools.py	Wed Sep 25 18:52:40 2019 +0200
+++ b/eric6/WebBrowser/Tools/WebBrowserTools.py	Wed Sep 25 19:00:09 2019 +0200
@@ -11,8 +11,9 @@
 import os
 import re
 
-from PyQt5.QtCore import QFile, QByteArray, QUrl, QCoreApplication, QBuffer, \
-    QIODevice
+from PyQt5.QtCore import (
+    QFile, QByteArray, QUrl, QCoreApplication, QBuffer, QIODevice
+)
 from PyQt5.QtGui import QPixmap
 
 
@@ -84,8 +85,9 @@
         if index == -1:
             tmpFileName += appendString
         else:
-            tmpFileName = tmpFileName[:index] + appendString + \
-                tmpFileName[index:]
+            tmpFileName = (
+                tmpFileName[:index] + appendString + tmpFileName[index:]
+            )
         i += 1
     
     return tmpFileName
@@ -120,16 +122,18 @@
     @param name name to be sanitized (string)
     @return sanitized name (string)
     """
-    return name\
-        .replace("/", "_")\
-        .replace("\\", "")\
-        .replace(":", "")\
-        .replace("*", "")\
-        .replace("?", "")\
-        .replace('"', "")\
-        .replace("<", "")\
-        .replace(">", "")\
+    return (
+        name
+        .replace("/", "_")
+        .replace("\\", "")
+        .replace(":", "")
+        .replace("*", "")
+        .replace("?", "")
+        .replace('"', "")
+        .replace("<", "")
+        .replace(">", "")
         .replace("|", "")
+    )
 
 
 def pixmapFromByteArray(data):

--- a/eric6/WebBrowser/Tools/WebIconLoader.py	Wed Sep 25 18:52:40 2019 +0200
+++ b/eric6/WebBrowser/Tools/WebIconLoader.py	Wed Sep 25 19:00:09 2019 +0200
@@ -34,8 +34,9 @@
         """
         super(WebIconLoader, self).__init__(parent)
         
-        networkManager = \
+        networkManager = (
             WebBrowser.WebBrowserWindow.WebBrowserWindow.networkManager()
+        )
         self.__reply = networkManager.get(QNetworkRequest(url))
         self.__reply.finished.connect(self.__finished)
     

--- a/eric6/WebBrowser/Tools/WebIconProvider.py	Wed Sep 25 18:52:40 2019 +0200
+++ b/eric6/WebBrowser/Tools/WebIconProvider.py	Wed Sep 25 19:00:09 2019 +0200
@@ -11,8 +11,9 @@
 import json
 import os
 
-from PyQt5.QtCore import pyqtSignal, QObject, QByteArray, QBuffer, QIODevice, \
-    QUrl
+from PyQt5.QtCore import (
+    pyqtSignal, QObject, QByteArray, QBuffer, QIODevice, QUrl
+)
 from PyQt5.QtGui import QIcon, QPixmap, QImage
 from PyQt5.QtWidgets import QDialog
 

--- a/eric6/WebBrowser/UrlBar/BookmarkInfoDialog.py	Wed Sep 25 18:52:40 2019 +0200
+++ b/eric6/WebBrowser/UrlBar/BookmarkInfoDialog.py	Wed Sep 25 19:00:09 2019 +0200
@@ -54,17 +54,19 @@
         Private slot to remove the current bookmark.
         """
         import WebBrowser.WebBrowserWindow
-        WebBrowser.WebBrowserWindow.WebBrowserWindow.bookmarksManager()\
-            .removeBookmark(self.__bookmark)
+        (WebBrowser.WebBrowserWindow.WebBrowserWindow.bookmarksManager()
+            .removeBookmark(self.__bookmark))
         self.close()
     
     def accept(self):
         """
         Public slot handling the acceptance of the dialog.
         """
-        if self.__bookmark is not None and \
-           self.titleEdit.text() != self.__bookmark.title:
+        if (
+            self.__bookmark is not None and
+            self.titleEdit.text() != self.__bookmark.title
+        ):
             import WebBrowser.WebBrowserWindow
-            WebBrowser.WebBrowserWindow.WebBrowserWindow.bookmarksManager()\
-                .setTitle(self.__bookmark, self.titleEdit.text())
+            (WebBrowser.WebBrowserWindow.WebBrowserWindow.bookmarksManager()
+                .setTitle(self.__bookmark, self.titleEdit.text()))
         self.close()

--- a/eric6/WebBrowser/UrlBar/FavIconLabel.py	Wed Sep 25 18:52:40 2019 +0200
+++ b/eric6/WebBrowser/UrlBar/FavIconLabel.py	Wed Sep 25 19:00:09 2019 +0200
@@ -86,10 +86,12 @@
         
         @param evt reference to the mouse event (QMouseEvent)
         """
-        if evt.button() == Qt.LeftButton and \
-           (evt.pos() - self.__dragStartPos).manhattanLength() > \
-                QApplication.startDragDistance() and \
-           self.__browser is not None:
+        if (
+            evt.button() == Qt.LeftButton and
+            ((evt.pos() - self.__dragStartPos).manhattanLength() >
+                QApplication.startDragDistance()) and
+            self.__browser is not None
+        ):
             drag = QDrag(self)
             mimeData = QMimeData()
             title = self.__browser.title()

--- a/eric6/WebBrowser/UrlBar/UrlBar.py	Wed Sep 25 18:52:40 2019 +0200
+++ b/eric6/WebBrowser/UrlBar/UrlBar.py	Wed Sep 25 19:00:09 2019 +0200
@@ -144,8 +144,7 @@
             for bookmark in bookmarks:
                 manager.setTimestamp(bookmark, BookmarkNode.TsVisited,
                                      QDateTime.currentDateTime())
-        elif self.__mw.speedDial()\
-                .pageForUrl(self.__browser.url()).url != "":
+        elif self.__mw.speedDial().pageForUrl(self.__browser.url()).url != "":
             self.__bookmarkButton.setIcon(self.__bmActiveIcon)
         else:
             self.__bookmarkButton.setIcon(self.__bmInactiveIcon)
@@ -187,8 +186,9 @@
         """
         Private slot to show a dialog with some bookmark info.
         """
-        from .BookmarkActionSelectionDialog import \
+        from .BookmarkActionSelectionDialog import (
             BookmarkActionSelectionDialog
+        )
         url = self.__browser.url()
         dlg = BookmarkActionSelectionDialog(url)
         if dlg.exec_() == QDialog.Accepted:
@@ -196,8 +196,9 @@
             if action == BookmarkActionSelectionDialog.AddBookmark:
                 self.__browser.addBookmark()
             elif action == BookmarkActionSelectionDialog.EditBookmark:
-                bookmark = self.__mw.bookmarksManager()\
-                    .bookmarkForUrl(url)
+                bookmark = (
+                    self.__mw.bookmarksManager().bookmarkForUrl(url)
+                )
                 from .BookmarkInfoDialog import BookmarkInfoDialog
                 dlg = BookmarkInfoDialog(bookmark, self.__browser)
                 dlg.exec_()
@@ -321,8 +322,10 @@
             return
         
         currentText = self.text().strip()
-        if evt.key() in [Qt.Key_Enter, Qt.Key_Return] and \
-           not currentText.lower().startswith("http://"):
+        if (
+            evt.key() in [Qt.Key_Enter, Qt.Key_Return] and
+            not currentText.lower().startswith(("http://", "https://"))
+        ):
             append = ""
             if evt.modifiers() == Qt.KeyboardModifiers(Qt.ControlModifier):
                 append = ".com"
@@ -403,7 +406,8 @@
         """
         threatInfo = self.__safeBrowsingLabel.getThreatInfo()
         if threatInfo:
-            from WebBrowser.SafeBrowsing.SafeBrowsingInfoWidget import \
+            from WebBrowser.SafeBrowsing.SafeBrowsingInfoWidget import (
                 SafeBrowsingInfoWidget
+            )
             widget = SafeBrowsingInfoWidget(threatInfo, self.__browser)
             widget.showAt(pos)

--- a/eric6/WebBrowser/UserAgent/UserAgentMenu.py	Wed Sep 25 18:52:40 2019 +0200
+++ b/eric6/WebBrowser/UserAgent/UserAgentMenu.py	Wed Sep 25 19:00:09 2019 +0200
@@ -9,8 +9,9 @@
 
 
 from PyQt5.QtCore import QXmlStreamReader, QFile, QIODevice
-from PyQt5.QtWidgets import QMenu, QAction, QActionGroup, QInputDialog, \
-    QLineEdit
+from PyQt5.QtWidgets import (
+    QMenu, QAction, QActionGroup, QInputDialog, QLineEdit
+)
 
 from E5Gui import E5MessageBox
 

--- a/eric6/WebBrowser/UserAgent/UserAgentReader.py	Wed Sep 25 18:52:40 2019 +0200
+++ b/eric6/WebBrowser/UserAgent/UserAgentReader.py	Wed Sep 25 19:00:09 2019 +0200
@@ -46,8 +46,10 @@
             self.readNext()
             if self.isStartElement():
                 version = self.attributes().value("version")
-                if self.name() == "UserAgents" and \
-                   (not version or version == "1.0"):
+                if (
+                    self.name() == "UserAgents" and
+                    (not version or version == "1.0")
+                ):
                     self.__readUserAgents()
                 else:
                     self.raiseError(QCoreApplication.translate(

--- a/eric6/WebBrowser/VirusTotal/VirusTotalApi.py	Wed Sep 25 18:52:40 2019 +0200
+++ b/eric6/WebBrowser/VirusTotal/VirusTotalApi.py	Wed Sep 25 19:00:09 2019 +0200
@@ -38,8 +38,9 @@
     urlScanReport = pyqtSignal(str)
     fileScanReport = pyqtSignal(str)
     
-    TestServiceKeyScanID = \
+    TestServiceKeyScanID = (
         "4feed2c2e352f105f6188efd1d5a558f24aee6971bdf96d5fdb19c197d6d3fad"
+    )
     
     ServiceResult_ItemQueued = -2
     ServiceResult_ItemNotPresent = 0
@@ -53,8 +54,9 @@
     GetFileReportPattern = "{0}://www.virustotal.com/vtapi/v2/file/report"
     ScanUrlPattern = "{0}://www.virustotal.com/vtapi/v2/url/scan"
     GetUrlReportPattern = "{0}://www.virustotal.com/vtapi/v2/url/report"
-    GetIpAddressReportPattern = \
+    GetIpAddressReportPattern = (
         "{0}://www.virustotal.com/vtapi/v2/ip-address/report"
+    )
     GetDomainReportPattern = "{0}://www.virustotal.com/vtapi/v2/domain/report"
     
     def __init__(self, parent=None):
@@ -119,8 +121,9 @@
             key, self.TestServiceKeyScanID).encode("utf-8"))
         
         import WebBrowser.WebBrowserWindow
-        nam = WebBrowser.WebBrowserWindow.WebBrowserWindow\
-            .networkManager()
+        nam = (
+            WebBrowser.WebBrowserWindow.WebBrowserWindow.networkManager()
+        )
         reply = nam.post(request, params)
         reply.finished.connect(
             lambda: self.__checkServiceKeyValidityFinished(reply))
@@ -161,8 +164,9 @@
             .encode("utf-8")).append(QUrl.toPercentEncoding(url.toString()))
         
         import WebBrowser.WebBrowserWindow
-        nam = WebBrowser.WebBrowserWindow.WebBrowserWindow\
-            .networkManager()
+        nam = (
+            WebBrowser.WebBrowserWindow.WebBrowserWindow.networkManager()
+        )
         reply = nam.post(request, params)
         reply.finished.connect(self.__submitUrlFinished)
         self.__replies.append(reply)
@@ -207,8 +211,9 @@
             .encode("utf-8"))
         
         import WebBrowser.WebBrowserWindow
-        nam = WebBrowser.WebBrowserWindow.WebBrowserWindow\
-            .networkManager()
+        nam = (
+            WebBrowser.WebBrowserWindow.WebBrowserWindow.networkManager()
+        )
         reply = nam.post(request, params)
         reply.finished.connect(self.__getUrlScanReportUrlFinished)
         self.__replies.append(reply)
@@ -242,8 +247,9 @@
             .encode("utf-8"))
         
         import WebBrowser.WebBrowserWindow
-        nam = WebBrowser.WebBrowserWindow.WebBrowserWindow\
-            .networkManager()
+        nam = (
+            WebBrowser.WebBrowserWindow.WebBrowserWindow.networkManager()
+        )
         reply = nam.post(request, params)
         reply.finished.connect(self.__getFileScanReportUrlFinished)
         self.__replies.append(reply)
@@ -282,8 +288,9 @@
         request = QNetworkRequest(url)
         
         import WebBrowser.WebBrowserWindow
-        nam = WebBrowser.WebBrowserWindow.WebBrowserWindow\
-            .networkManager()
+        nam = (
+            WebBrowser.WebBrowserWindow.WebBrowserWindow.networkManager()
+        )
         reply = nam.get(request)
         reply.finished.connect(self.__getIpAddressReportFinished)
         self.__replies.append(reply)
@@ -343,8 +350,9 @@
         request = QNetworkRequest(url)
         
         import WebBrowser.WebBrowserWindow
-        nam = WebBrowser.WebBrowserWindow.WebBrowserWindow\
-            .networkManager()
+        nam = (
+            WebBrowser.WebBrowserWindow.WebBrowserWindow.networkManager()
+        )
         reply = nam.get(request)
         reply.finished.connect(lambda: self.__getDomainReportFinished(reply))
         self.__replies.append(reply)
@@ -396,8 +404,9 @@
                 except KeyError:
                     whois = ""
                 
-                from .VirusTotalDomainReportDialog import \
+                from .VirusTotalDomainReportDialog import (
                     VirusTotalDomainReportDialog
+                )
                 self.__domainReportDlg = VirusTotalDomainReportDialog(
                     self.__lastDomain, resolutions, urls, subdomains,
                     bdCategory, tmCategory, wtsCategory, whois)

--- a/eric6/WebBrowser/ZoomManager/ZoomValuesDialog.py	Wed Sep 25 18:52:40 2019 +0200
+++ b/eric6/WebBrowser/ZoomManager/ZoomValuesDialog.py	Wed Sep 25 19:00:09 2019 +0200
@@ -57,14 +57,14 @@
         """
         fm = QFontMetrics(QFont())
         for section in range(self.__zoomValuesModel.columnCount()):
-            header = self.zoomValuesTable.horizontalHeader()\
-                .sectionSizeHint(section)
+            header = self.zoomValuesTable.horizontalHeader().sectionSizeHint(
+                section)
             if section == 0:
                 header = fm.width("extraveryveryverylongsitename")
             elif section == 1:
                 header = fm.width("averagelongzoomvalue")
             buffer = fm.width("mm")
             header += buffer
-            self.zoomValuesTable.horizontalHeader()\
-                .resizeSection(section, header)
+            self.zoomValuesTable.horizontalHeader().resizeSection(
+                section, header)
         self.zoomValuesTable.horizontalHeader().setStretchLastSection(True)