Mercurial Repositories > Django Project / file diff

--- a/ProjectDjango/DjangoLoaddataDataDialog.py	Wed Dec 30 11:02:06 2020 +0100
+++ b/ProjectDjango/DjangoLoaddataDataDialog.py	Sat Apr 24 11:25:03 2021 +0200
@@ -7,6 +7,8 @@
 Module implementing a dialog to enter the data for the 'loaddata' command.
 """
 
+import contextlib
+
 from PyQt5.QtCore import pyqtSlot
 from PyQt5.QtWidgets import QDialog, QDialogButtonBox
 
@@ -29,16 +31,13 @@
         @param project reference to the Django project object
         @param parent reference to the parent widget (QWidget)
         """
-        super(DjangoLoaddataDataDialog, self).__init__(parent)
+        super().__init__(parent)
         self.setupUi(self)
         
         self.fixtureFileButton.setIcon(UI.PixmapCache.getIcon("open"))
         
         self.__project = project
         
-        if project.getDjangoVersion() < (1, 11, 0):
-            self.excludeBox.setEnabled(False)
-        
         self.buttonBox.button(QDialogButtonBox.Ok).setEnabled(False)
         
         msh = self.minimumSizeHint()
@@ -59,11 +58,9 @@
         Private slot to select a fixture file via a file selection dialog.
         """
         fileFilters = self.tr("JSON Files (*.json);;XML Files (*.xml);;")
-        try:
+        with contextlib.suppress(ImportError):
             import yaml     # __IGNORE_WARNING__
             fileFilters += self.tr("YAML Files (*.yaml);;")
-        except ImportError:
-            pass
         fileFilters += self.tr("All Files (*)")
         
         fixtureFiles = E5FileDialog.getOpenFileNames(