Mercurial Repositories > eric / file diff

--- a/eric6/WebBrowser/Download/DownloadItem.py	Sun Sep 01 19:58:00 2019 +0200
+++ b/eric6/WebBrowser/Download/DownloadItem.py	Mon Sep 02 18:50:38 2019 +0200
@@ -11,7 +11,7 @@
 
 import os
 
-from PyQt5.QtCore import pyqtSlot, pyqtSignal, PYQT_VERSION, Qt, QTime, QUrl, \
+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
@@ -26,8 +26,6 @@
 
 import UI.PixmapCache
 import Utilities.MimeTypes
-import Globals
-from Globals import qVersionTuple
 
 
 class DownloadItem(QWidget, Ui_DownloadItem):
@@ -143,15 +141,8 @@
         if self.__gettingFileName:
             return
         
-        if qVersionTuple() >= (5, 8, 0) and PYQT_VERSION >= 0x50800:
-            savePage = self.__downloadItem.type() == \
-                QWebEngineDownloadItem.SavePage
-        elif qVersionTuple() >= (5, 7, 0) and PYQT_VERSION >= 0x50700:
-            savePage = self.__downloadItem.savePageFormat() != \
-                QWebEngineDownloadItem.UnknownSaveFormat
-        else:
-            savePage = self.__downloadItem.path().lower().endswith(
-                (".mhtml", ".mht"))
+        savePage = self.__downloadItem.type() == \
+            QWebEngineDownloadItem.SavePage
         
         documentLocation = QStandardPaths.writableLocation(
             QStandardPaths.DocumentsLocation)
@@ -218,50 +209,6 @@
                     defaultFileName,
                     "")
                 self.__gettingFileName = False
-        else:
-            # save page file name and format selection for Qt < 5.8.0
-            self.__autoOpen = False
-            
-            filterList = [
-                self.tr("Web Archive (*.mhtml *.mht)"),
-                self.tr("HTML File (*.html *.htm)"),
-                self.tr("HTML File with all resources (*.html *.htm)"),
-            ]
-            extensionsList = [
-                # tuple of extensions for *nix and Windows
-                # keep in sync with filters list
-                (".mhtml", ".mht"),
-                (".html", ".htm"),
-                (".html", ".htm"),
-            ]
-            self.__gettingFileName = True
-            fileName, selectedFilter = E5FileDialog.getSaveFileNameAndFilter(
-                None,
-                self.tr("Save Web Page"),
-                defaultFileName,
-                ";;".join(filterList),
-                None)
-            self.__gettingFileName = False
-            if fileName:
-                index = filterList.index(selectedFilter)
-                if index == 0:
-                    self.__downloadItem.setSavePageFormat(
-                        QWebEngineDownloadItem.MimeHtmlSaveFormat)
-                elif index == 1:
-                    self.__downloadItem.setSavePageFormat(
-                        QWebEngineDownloadItem.SingleHtmlSaveFormat)
-                else:
-                    self.__downloadItem.setSavePageFormat(
-                        QWebEngineDownloadItem.CompleteHtmlSaveFormat)
-                extension = os.path.splitext(fileName)[1]
-                if not extension:
-                    # add the platform specific default extension
-                    if Globals.isWindowsPlatform():
-                        extensionsIndex = 1
-                    else:
-                        extensionsIndex = 0
-                    extensions = extensionsList[index]
-                    fileName += extensions[extensionsIndex]
         
         if not fileName:
             self.progressBar.setVisible(False)