PyPlumIO 0.5.23__tar.gz → 0.5.24__tar.gz

{pyplumio-0.5.23 → pyplumio-0.5.24}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: PyPlumIO
-Version: 0.5.23
+Version: 0.5.24
 Summary: PyPlumIO is a native ecoNET library for Plum ecoMAX controllers.
 Author-email: Denis Paavilainen <denpa@denpa.pro>
 License: MIT License

{pyplumio-0.5.23 → pyplumio-0.5.24}/PyPlumIO.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: PyPlumIO
-Version: 0.5.23
+Version: 0.5.24
 Summary: PyPlumIO is a native ecoNET library for Plum ecoMAX controllers.
 Author-email: Denis Paavilainen <denpa@denpa.pro>
 License: MIT License

{pyplumio-0.5.23 → pyplumio-0.5.24}/pyplumio/_version.py

@@ -12,5 +12,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '0.5.23'
-__version_tuple__ = version_tuple = (0, 5, 23)
+__version__ = version = '0.5.24'
+__version_tuple__ = version_tuple = (0, 5, 24)

{pyplumio-0.5.23 → pyplumio-0.5.24}/pyplumio/helpers/parameter.py

@@ -113,9 +113,18 @@ class Parameter(ABC):
 
     def _call_relational_method(self, method_to_call: str, other: Any) -> Any:
         """Call a specified relational method."""
-        handler = getattr(self.values.value, method_to_call)
-        other = other.value if isinstance(other, ParameterValues) else other
-        return handler(_normalize_parameter_value(other))
+        if isinstance(other, Parameter):
+            other = other.values
+
+        if isinstance(other, ParameterValues):
+            handler = getattr(self.values, method_to_call)
+            return handler(other)
+
+        if isinstance(other, (int, float, bool)) or other in (STATE_OFF, STATE_ON):
+            handler = getattr(self.values.value, method_to_call)
+            return handler(_normalize_parameter_value(other))
+        else:
+            return NotImplemented
 
     def __int__(self) -> int:
         """Return an integer representation of parameter's value."""

{pyplumio-0.5.23 → pyplumio-0.5.24}/tests/helpers/test_parameter.py

@@ -1,5 +1,6 @@
 """Contains tests for the parameter helper class."""
 
+from copy import copy
 from unittest.mock import Mock, patch
 
 import pytest
@@ -171,21 +172,32 @@ def test_switch_update(switch: Switch) -> None:
 
 def test_number_relational(number: Number):
     """Test number relational methods."""
+    new_number = copy(number)
+    assert number == new_number
     assert (number - 1) == 0
+    new_values = ParameterValues(value=1, min_value=0, max_value=5)
+    number.update(new_values)
+    assert number == new_values
     assert (number + 1) == 2
     assert (number * 5) == 5
     assert (number / 1) == 1
     assert (number // 1) == 1
+    assert number.__eq__("cola") is NotImplemented
 
 
 def test_switch_relational(switch: Switch):
     """Test switch relational methods."""
+    new_switch = copy(switch)
+    assert switch == new_switch
+    new_values = ParameterValues(value=1, min_value=0, max_value=1)
     assert (switch + 1) == 1
-    switch.update(ParameterValues(value=1, min_value=0, max_value=0))
+    switch.update(new_values)
+    assert switch == new_values
     assert (switch - 1) == 0
     assert (switch * 0) == 0
     assert (switch / 1) == 1
     assert (switch // 1) == 1
+    assert switch.__eq__("cola") is NotImplemented
 
 
 def test_number_compare(number: Number) -> None: