Change to using aenum in place of stdlib enum, which simplifies code

Author: domdfcoding

domdf_python_tools/enums.py

@@ -24,39 +24,39 @@
 #  MA 02110-1301, USA.
 #
 
-from enum import Enum
+from aenum import Enum, IntEnum
 
 __all__ = ["IntEnum", "StrEnum"]
 
 
-class IntEnum(Enum):
-	"""
-	An Enum that can be converted into an integer
-	"""
-
-	def __int__(self):
-		return self.value
-
-	def __eq__(self, other):
-		if int(self) == other:
-			return True
-		else:
-			return super().__eq__(other)
+# class IntEnum(Enum):
+# 	"""
+# 	An Enum that can be converted into an integer
+# 	"""
+#
+# 	def __int__(self):
+# 		return self.value
+#
+# 	def __eq__(self, other):
+# 		if int(self) == other:
+# 			return True
+# 		else:
+# 			return super().__eq__(other)
 
 
-class StrEnum(Enum):
+class StrEnum(str, Enum):
 	"""
 	An Enum that can be converted into a string
 	"""
 
 	def __str__(self):
 		return self.value
-
-	def __repr__(self):
-		return self.value
-
-	def __eq__(self, other):
-		if str(self) == other:
-			return True
-		else:
-			return super().__eq__(other)
+	#
+	# def __repr__(self):
+	# 	return self.value
+
+	# def __eq__(self, other):
+	# 	if str(self) == other:
+	# 		return True
+	# 	else:
+	# 		return super().__eq__(other)

requirements.txt

@@ -1 +1,2 @@
-pydash>=4.7.4
+pydash>=4.7.4
+aenum >=2.2.3

tests/test_enums.py

@@ -23,8 +23,8 @@ def test_str_enum():
 	assert DramatisPersonae.Message == "a secret message"
 	assert DramatisPersonae.Alice != "An eavesdropper"
 	assert str(DramatisPersonae.Craig) == "A password cracker"
-	assert DramatisPersonae("The sender") == DramatisPersonae.Bob == repr(DramatisPersonae.Bob) == "The sender"
-
+	assert DramatisPersonae("The sender") == DramatisPersonae.Bob == "The sender"
+	assert repr(DramatisPersonae.Bob) == "<DramatisPersonae.Bob: 'The sender'>"
 
 class Numbers(enums.IntEnum):
 	One = 1
@@ -39,3 +39,4 @@ def test_int_enum():
 	assert Numbers.Two != 3
 	assert int(Numbers.Four) == 4
 	assert Numbers(5) == Numbers.Five == 5
+	assert isinstance(Numbers(5), int)