Merge 3906485 into dca1f2b

seanbudd · web-flow · commit b2f3ec5b6cca · 2022-09-21T15:38:59.000+10:00
diff --git a/source/config/__init__.py b/source/config/__init__.py
@@ -38,7 +38,13 @@
 	_transformSpec_AddFeatureFlagDefault,
 	_validateConfig_featureFlag,
 )
-from typing import Any, Dict, List, Optional, Set
+from typing import (
+	Any,
+	Dict,
+	List,
+	Optional,
+	Set,
+)
 import NVDAState
 
 
@@ -1056,6 +1062,7 @@ def __init__(self, validationFuncName):
 	# the default value, used when config is missing.
 	default = None  # converted to the appropriate type
 
+
 class AggregatedSection(object):
 	"""A view of a section of configuration which aggregates settings from all active profiles.
 	"""
@@ -1068,6 +1075,11 @@ def __init__(self, manager, path, spec, profiles):
 		self.profiles = profiles
 		self._cache = {}
 
+	@staticmethod
+	def _isSection(val: Any) -> bool:
+		"""Checks if a given value or spec is a section a config profile."""
+		return isinstance(val, dict)
+
 	def __getitem__(self, key, checkValidity=True):
 		# Try the cache first.
 		try:
@@ -1082,7 +1094,7 @@ def __getitem__(self, key, checkValidity=True):
 
 		spec = self._spec.get(key)
 		foundSection = False
-		if isinstance(spec, dict):
+		if self._isSection(spec):
 			foundSection = True
 
 		# Walk through the profiles looking for the key.
@@ -1095,7 +1107,7 @@ def __getitem__(self, key, checkValidity=True):
 				# Indicate that this key doesn't exist in this profile.
 				subProfiles.append(None)
 				continue
-			if isinstance(val, dict):
+			if self._isSection(val):
 				foundSection = True
 				subProfiles.append(val)
 			else:
@@ -1208,11 +1220,10 @@ def dict(self):
 
 	def __setitem__(self, key, val):
 		spec = self._spec.get(key) if self.spec else None
-		if isinstance(spec, dict) and not isinstance(val, dict):
+		if self._isSection(spec) and not self._isSection(val):
 			raise ValueError("Value must be a section")
 
-		if isinstance(spec, dict) or isinstance(val, dict):
-			# The value is a section.
+		if self._isSection(spec) or self._isSection(val):
 			# Update the profile.
 			updateSect = self._getUpdateSection()
 			updateSect[key] = val
@@ -1243,8 +1254,13 @@ def __setitem__(self, key, val):
 		except KeyError:
 			pass
 		else:
-			if val == curVal:
-				# The value isn't different, so there's nothing to do.
+			if self._isSection(val) or self._isSection(curVal):
+				# If value is a section, continue to update
+				pass
+			elif str(val) == str(curVal):
+				# Check str comparison as this is what is written to the config.
+				# If the value is unchanged, do not update
+				# or mark the profile as dirty.
 				return
 
 		# Set this value in the most recently activated profile.
