Updated bdict to allow for True, None and False keys/values

Author: domdfcoding

domdf_python_tools/utils.py

@@ -196,6 +196,9 @@ class bdict(dict):
 	If an attempt is made to add a key or value that already exists in the
 		dictionary a ValueError will be raised
 	
+	Keys or values of "None", "True" and "False" will be stored internally as
+		"_None" "_True" and "_False" respectively
+	
 	Based on https://stackoverflow.com/a/1063393 by https://stackoverflow.com/users/9493/brian
 	"""
 
@@ -214,10 +217,61 @@ def __setitem__(self, key, val):
 				raise ValueError(f"The key '{key}' is already present in the dictionary")
 			if val in self and self[val] != key:
 				raise ValueError(f"The key '{val}' is already present in the dictionary")
-				
+		
+		if key is None:
+			key = "_None"
+		if val is None:
+			val = "_None"
+		
+		if isinstance(key, bool):
+			if key:
+				key = "_True"
+			else:
+				key = "_False"
+		
+		if isinstance(val, bool):
+			if val:
+				val = "_True"
+			else:
+				val = "_False"
+		
 		dict.__setitem__(self, key, val)
 		dict.__setitem__(self, val, key)
 
 	def __delitem__(self, key):
 		dict.__delitem__(self, self[key])
 		dict.__delitem__(self, key)
+	
+	def __getitem__(self, key):
+		if key is None:
+			key = "_None"
+		
+		if isinstance(key, bool):
+			if key:
+				key = "_True"
+			else:
+				key = "_False"
+		
+		val = dict.__getitem__(self, key)
+
+		if val == "_None":
+			return None
+		elif val == "_True":
+			return True
+		elif val == "_False":
+			return False
+		else:
+			return val
+	
+	def __contains__(self, key):
+		print("Contains")
+		if key is None:
+			key = "_None"
+		
+		if isinstance(key, bool):
+			if key:
+				key = "_True"
+			else:
+				key = "_False"
+		
+		return dict.__contains__(self, key)

tests/test_utils.py

@@ -113,3 +113,30 @@ def test_bdict_errors():
 		new_dict["Value1"] = 1234
 	new_dict["Key1"] = "Value1"
 	new_dict["Value1"] = "Key1"
+
+
+def test_bdict_bool():
+	new_dict = bdict(N=None, T=True, F=False)
+	
+	print(new_dict)
+	
+	assert None in new_dict
+	assert True in new_dict
+	assert True in new_dict
+	
+	assert isinstance(new_dict["T"], bool) and new_dict["T"]
+	assert isinstance(new_dict["F"], bool) and not new_dict["F"]
+	
+	assert new_dict[True] == "T"
+	assert new_dict[False] == "F"
+	assert new_dict[None] == "N"
+	
+	assert "_None" in new_dict
+	assert new_dict["_None"] == "N"
+	
+	# Test for pyMHDAC
+	new_dict_2 = bdict(Unspecified=0, _None=1, GC=2, LC=3, CE=4)
+	
+	assert None in new_dict_2
+	
+	assert new_dict_2[None] == 1