diff --git a/python/plugins/processing/gui/ConfigDialog.py b/python/plugins/processing/gui/ConfigDialog.py index d2776b7dca05..b01604198630 100644 --- a/python/plugins/processing/gui/ConfigDialog.py +++ b/python/plugins/processing/gui/ConfigDialog.py @@ -278,7 +278,6 @@ def accept(self): self.tr('Wrong value for parameter "%s":\n\n%s' % (setting.description, unicode(e)))) return setting.save(qsettings) - Processing.updateAlgsList() settingsWatcher.settingsChanged.emit() updateMenus() QApplication.restoreOverrideCursor() diff --git a/python/plugins/processing/modeler/ModelerDialog.py b/python/plugins/processing/modeler/ModelerDialog.py index 4329493979cb..ec266ac5a3a6 100644 --- a/python/plugins/processing/modeler/ModelerDialog.py +++ b/python/plugins/processing/modeler/ModelerDialog.py @@ -144,6 +144,7 @@ def _mimeDataInput(items): def _mimeDataAlgorithm(items): item = items[0] + mimeData = None if isinstance(item, TreeAlgorithmItem): mimeData = QMimeData() mimeData.setText(item.alg.commandLineName()) diff --git a/python/testing/__init__.py b/python/testing/__init__.py index defb3fadfbba..5eb885215f5d 100644 --- a/python/testing/__init__.py +++ b/python/testing/__init__.py @@ -31,7 +31,7 @@ import functools from qgis.PyQt.QtCore import QVariant -from qgis.core import QgsApplication, QgsFeatureRequest, QgsVectorLayer +from qgis.core import QgsApplication, QgsFeatureRequest try: from nose2.compat import unittest @@ -105,7 +105,7 @@ def assertLayersEqual(self, layer_expected, layer_result, **kwargs): attr_result = feats[1][field_expected.name()] field_result = [fld for fld in layer_expected.fields().toList() if fld.name() == field_expected.name()][0] try: - cmp = compare['fields'][field1.name()] + cmp = compare['fields'][field_expected.name()] except KeyError: try: cmp = compare['fields']['__all__'] @@ -225,6 +225,7 @@ def wrapper(*args, **kwargs): return realExpectedFailure + # Patch unittest unittest.TestCase = TestCase unittest.expectedFailure = expectedFailure