Fix bugs with UserFloat

Author: domdfcoding

domdf_python_tools/bases.py

@@ -367,7 +367,7 @@ def __index__(self) -> int:
 
 
 @prettify_docstrings
-class UserFloat(Real, SupportsRound):
+class UserFloat(Real):
 	"""
 	Class that simulates a float.
 
@@ -450,37 +450,37 @@ def __round__(self, ndigits: Optional[int] = None) -> Union[int, float]:  # type
 		return float(self).__round__(ndigits)
 
 	def __eq__(self, other: object) -> bool:
-		if isinstance(other, UserFloat):
+		if isinstance(other, UserFloat) and not isinstance(other, float):
 			return self._value == other._value
 		else:
 			return float(self).__eq__(other)
 
 	def __ne__(self, other: object) -> bool:
-		if isinstance(other, UserFloat):
+		if isinstance(other, UserFloat) and not isinstance(other, float):
 			return self._value != other._value
 		else:
 			return float(self).__ne__(other)
 
 	def __lt__(self, other: Union[float, "UserFloat"]) -> bool:
-		if isinstance(other, UserFloat):
+		if isinstance(other, UserFloat) and not isinstance(other, float):
 			return self._value < other._value
 		else:
 			return float(self).__lt__(other)
 
 	def __le__(self, other: Union[float, "UserFloat"]) -> bool:
-		if isinstance(other, UserFloat):
+		if isinstance(other, UserFloat) and not isinstance(other, float):
 			return self._value <= other._value
 		else:
 			return float(self).__le__(other)
 
 	def __gt__(self, other: Union[float, "UserFloat"]) -> bool:
-		if isinstance(other, UserFloat):
+		if isinstance(other, UserFloat) and not isinstance(other, float):
 			return self._value > other._value
 		else:
 			return float(self).__gt__(other)
 
 	def __ge__(self, other: Union[float, "UserFloat"]) -> bool:
-		if isinstance(other, UserFloat):
+		if isinstance(other, UserFloat) and not isinstance(other, float):
 			return self._value >= other._value
 		else:
 			return float(self).__ge__(other)

tests/test_bases.py

@@ -12,6 +12,8 @@
 from numbers import Number, Real
 
 # 3rd party
+from typing import no_type_check
+
 import pytest
 
 # this package
@@ -203,6 +205,7 @@ def test_rpow(self):
 		assert 3**seven == 2187.0
 		assert 3**seven == 2187
 
+	@no_type_check
 	def test_round(self):
 		assert isinstance(round(seven), int)
 		assert round(seven) == 7
@@ -274,3 +277,8 @@ def test_hash(self):
 		assert hash(seven) != hash(UserFloat(8))
 		assert hash(seven) == hash(7)
 		assert hash(seven) != hash(8)
+
+	def test_isinstance(self):
+		assert isinstance(seven, UserFloat)
+		assert not isinstance(seven, float)
+		assert not isinstance(7, UserFloat)