Mercurial Repositories > eric / file diff

--- a/eric6/E5Gui/E5FileDialog.py	Sun Sep 01 19:58:00 2019 +0200
+++ b/eric6/E5Gui/E5FileDialog.py	Mon Sep 02 18:50:38 2019 +0200
@@ -10,7 +10,6 @@
 
 from __future__ import unicode_literals
 
-from PyQt5.QtCore import PYQT_VERSION_STR
 from PyQt5.QtWidgets import QFileDialog
 
 import Globals
@@ -62,12 +61,8 @@
         options = QFileDialog.Options()
     if Globals.isLinuxPlatform():
         options |= QFileDialog.DontUseNativeDialog
-    if PYQT_VERSION_STR >= "5.0.0":
-        return QFileDialog.getOpenFileName(
-            parent, caption, directory, filterStr, "", options)[0]
-    else:
-        return QFileDialog.getOpenFileName(
-            parent, caption, directory, filterStr, options)
+    return QFileDialog.getOpenFileName(
+        parent, caption, directory, filterStr, "", options)[0]
 
 
 def getOpenFileNameAndFilter(parent=None, caption="", directory="",
@@ -90,12 +85,8 @@
     if Globals.isLinuxPlatform():
         options |= QFileDialog.DontUseNativeDialog
     newfilter = __reorderFilter(filterStr, initialFilter)
-    if PYQT_VERSION_STR >= "5.0.0":
-        return QFileDialog.getOpenFileName(
-            parent, caption, directory, newfilter, initialFilter, options)
-    else:
-        return QFileDialog.getOpenFileNameAndFilter(
-            parent, caption, directory, newfilter, initialFilter, options)
+    return QFileDialog.getOpenFileName(
+        parent, caption, directory, newfilter, initialFilter, options)
 
 
 def getOpenFileNames(parent=None, caption="", directory="",
@@ -114,12 +105,8 @@
         options = QFileDialog.Options()
     if Globals.isLinuxPlatform():
         options |= QFileDialog.DontUseNativeDialog
-    if PYQT_VERSION_STR >= "5.0.0":
-        return QFileDialog.getOpenFileNames(
-            parent, caption, directory, filterStr, "", options)[0]
-    else:
-        return QFileDialog.getOpenFileNames(
-            parent, caption, directory, filterStr, options)
+    return QFileDialog.getOpenFileNames(
+        parent, caption, directory, filterStr, "", options)[0]
 
 
 def getOpenFileNamesAndFilter(parent=None, caption="", directory="",
@@ -143,12 +130,8 @@
     if Globals.isLinuxPlatform():
         options |= QFileDialog.DontUseNativeDialog
     newfilter = __reorderFilter(filterStr, initialFilter)
-    if PYQT_VERSION_STR >= "5.0.0":
-        return QFileDialog.getOpenFileNames(
-            parent, caption, directory, newfilter, initialFilter, options)
-    else:
-        return QFileDialog.getOpenFileNamesAndFilter(
-            parent, caption, directory, newfilter, initialFilter, options)
+    return QFileDialog.getOpenFileNames(
+        parent, caption, directory, newfilter, initialFilter, options)
 
 
 def getSaveFileName(parent=None, caption="", directory="",
@@ -167,12 +150,8 @@
         options = QFileDialog.Options()
     if Globals.isLinuxPlatform():
         options |= QFileDialog.DontUseNativeDialog
-    if PYQT_VERSION_STR >= "5.0.0":
-        return QFileDialog.getSaveFileName(
-            parent, caption, directory, filterStr, "", options)[0]
-    else:
-        return QFileDialog.getSaveFileName(
-            parent, caption, directory, filterStr, options)
+    return QFileDialog.getSaveFileName(
+        parent, caption, directory, filterStr, "", options)[0]
 
 
 def getSaveFileNameAndFilter(parent=None, caption="", directory="",
@@ -195,12 +174,8 @@
     if Globals.isLinuxPlatform():
         options |= QFileDialog.DontUseNativeDialog
     newfilter = __reorderFilter(filterStr, initialFilter)
-    if PYQT_VERSION_STR >= "5.0.0":
-        return QFileDialog.getSaveFileName(
-            parent, caption, directory, newfilter, initialFilter, options)
-    else:
-        return QFileDialog.getSaveFileNameAndFilter(
-            parent, caption, directory, newfilter, initialFilter, options)
+    return QFileDialog.getSaveFileName(
+        parent, caption, directory, newfilter, initialFilter, options)
 
 
 def getExistingDirectory(parent=None, caption="",