eric6/WebBrowser/Download/DownloadItem.py

changeset 7268
a28338eaf694
parent 7229
53054eb5b15a
child 7286
7eb04391adf7
child 7360
9190402e4505
--- a/eric6/WebBrowser/Download/DownloadItem.py	Wed Sep 25 18:37:35 2019 +0200
+++ b/eric6/WebBrowser/Download/DownloadItem.py	Wed Sep 25 18:48:22 2019 +0200
@@ -10,8 +10,9 @@
 
 import os
 
-from PyQt5.QtCore import pyqtSlot, pyqtSignal, Qt, QTime, QUrl, \
-    QStandardPaths, QFileInfo, QDateTime
+from PyQt5.QtCore import (
+    pyqtSlot, pyqtSignal, Qt, QTime, QUrl, QStandardPaths, QFileInfo, QDateTime
+)
 from PyQt5.QtGui import QPalette, QDesktopServices
 from PyQt5.QtWidgets import QWidget, QStyle, QDialog
 from PyQt5.QtWebEngineWidgets import QWebEngineDownloadItem
@@ -121,8 +122,10 @@
         self.datetimeLabel.hide()
         self.infoLabel.clear()
         self.progressBar.setValue(0)
-        if self.__downloadItem.state() == \
-           QWebEngineDownloadItem.DownloadRequested:
+        if (
+            self.__downloadItem.state() ==
+            QWebEngineDownloadItem.DownloadRequested
+        ):
             self.__getFileName()
             if not self.__fileName:
                 self.__downloadItem.cancel()
@@ -140,13 +143,15 @@
         if self.__gettingFileName:
             return
         
-        savePage = self.__downloadItem.type() == \
+        savePage = self.__downloadItem.type() == (
             QWebEngineDownloadItem.SavePage
+        )
         
         documentLocation = QStandardPaths.writableLocation(
             QStandardPaths.DocumentsLocation)
-        downloadDirectory = WebBrowserWindow\
-            .downloadManager().downloadDirectory()
+        downloadDirectory = (
+            WebBrowserWindow.downloadManager().downloadDirectory()
+        )
         
         if self.__fileName:
             fileName = self.__fileName
@@ -154,9 +159,8 @@
             self.__toDownload = True
             ask = False
         else:
-            defaultFileName, originalFileName = \
-                self.__saveFileName(
-                    documentLocation if savePage else downloadDirectory)
+            defaultFileName, originalFileName = self.__saveFileName(
+                documentLocation if savePage else downloadDirectory)
             fileName = defaultFileName
             self.__originalFileName = originalFileName
             ask = True
@@ -197,8 +201,10 @@
             
             tempLocation = QStandardPaths.writableLocation(
                 QStandardPaths.TempLocation)
-            fileName = tempLocation + '/' + \
+            fileName = (
+                tempLocation + '/' +
                 QFileInfo(fileName).completeBaseName()
+            )
             
             if ask and not self.__autoOpen:
                 self.__gettingFileName = True
@@ -229,8 +235,8 @@
         @type str
         """
         fileInfo = QFileInfo(fileName)
-        WebBrowserWindow.downloadManager()\
-            .setDownloadDirectory(fileInfo.absoluteDir().absolutePath())
+        WebBrowserWindow.downloadManager().setDownloadDirectory(
+            fileInfo.absoluteDir().absolutePath())
         self.filenameLabel.setText(fileInfo.fileName())
         
         self.__fileName = fileName
@@ -429,21 +435,25 @@
             if bytesTotal > 0:
                 remaining = timeString(timeRemaining)
             
-            info = self.tr("{0} of {1} ({2}/sec) {3}")\
-                .format(
-                    dataString(self.__bytesReceived),
-                    bytesTotal == -1 and self.tr("?") or
-                    dataString(bytesTotal),
-                    speedString(speed),
-                    remaining)
+            info = self.tr(
+                "{0} of {1} ({2}/sec) {3}"
+            ).format(
+                dataString(self.__bytesReceived),
+                bytesTotal == -1 and self.tr("?") or
+                dataString(bytesTotal),
+                speedString(speed),
+                remaining
+            )
         else:
             if self.__bytesReceived == bytesTotal or bytesTotal == -1:
-                info = self.tr("{0} downloaded")\
-                    .format(dataString(self.__bytesReceived))
+                info = self.tr(
+                    "{0} downloaded"
+                ).format(dataString(self.__bytesReceived))
             else:
-                info = self.tr("{0} of {1} - Stopped")\
-                    .format(dataString(self.__bytesReceived),
-                            dataString(bytesTotal))
+                info = self.tr(
+                    "{0} of {1} - Stopped"
+                ).format(dataString(self.__bytesReceived),
+                         dataString(bytesTotal))
         self.infoLabel.setText(info)
     
     def downloading(self):

eric ide

mercurial