diff --git a/python/core/additions/qgssettingsentry.py b/python/core/additions/qgssettingsentry.py index 4b119a69d180..f327208a274c 100644 --- a/python/core/additions/qgssettingsentry.py +++ b/python/core/additions/qgssettingsentry.py @@ -53,7 +53,7 @@ def __init__(self, key, pluginName, defaultValue, description=str(), options=Qgi defaultValueStr = self.__metaEnum.valueToKey(defaultValue) self.__enumFlagClass = defaultValue.__class__ - if type(pluginName) == str: + if isinstance(pluginName, str): parent = QgsSettingsTree.createPluginTreeNode(pluginName) else: parent = pluginName @@ -127,7 +127,7 @@ def setValue(self, value, dynamicKeyPart: (list, str) = None): QgsLogger.debug("Invalid enum/flag value '{0}'.".format(value)) return False - if type(dynamicKeyPart) == str: + if isinstance(dynamicKeyPart, str): dynamicKeyPart = [dynamicKeyPart] elif dynamicKeyPart is None: dynamicKeyPart = [] diff --git a/python/pyplugin_installer/version_compare.py b/python/pyplugin_installer/version_compare.py index 2342741550de..008238961709 100644 --- a/python/pyplugin_installer/version_compare.py +++ b/python/pyplugin_installer/version_compare.py @@ -161,7 +161,7 @@ def compareVersions(a, b): def splitVersion(s): """ split string into 2 or 3 numerical segments """ - if not s or type(s) != str: + if not s or not isinstance(s, str): return None l = str(s).split('.') for c in l: diff --git a/tests/src/python/test_qgsgeometry.py b/tests/src/python/test_qgsgeometry.py index 0e8ac58b783d..543aec829039 100644 --- a/tests/src/python/test_qgsgeometry.py +++ b/tests/src/python/test_qgsgeometry.py @@ -2638,14 +2638,14 @@ def circle_curvepolygon(): message += ' failed' message_with_wkt = message + f'\nOriginal geom: {geoms[t].asWkt()}' if type(parts[t]) is list: - if type(parts[t][0]) == QgsPointXY: + if isinstance(parts[t][0], QgsPointXY): self.assertEqual(geoms[t].addPointsXY(parts[t], geom_type), expected_result, message_with_wkt) - elif type(parts[t][0]) == QgsPoint: + elif isinstance(parts[t][0], QgsPoint): self.assertEqual(geoms[t].addPoints(parts[t]), expected_result, message_with_wkt) else: self.fail(message_with_wkt + '\n could not detect what Python method to use for add part') else: - if type(parts[t]) == QgsGeometry: + if isinstance(parts[t], QgsGeometry): self.assertEqual(geoms[t].addPartGeometry(parts[t]), expected_result, message) else: self.assertEqual(geoms[t].addPart(parts[t], geom_type), expected_result, message_with_wkt)