Remove unused code (#465)

* Remove unused code

* Remove tests

* Remove test

* Remove merge

Author: ggravlingen

pytradfri/command.py

@@ -2,7 +2,6 @@
 from __future__ import annotations
 
 from collections.abc import Callable
-from copy import deepcopy
 from typing import Any, Generic, TypeVar
 
 T = TypeVar("T")
@@ -99,45 +98,6 @@ def url(self, host: str) -> str:
         """Generate url for coap client."""
         return f"coaps://{host}:5684/{self.path_str}"
 
-    def _merge(
-        self, a_dict: dict[str, Any] | None, b_dict: dict[str, Any] | None
-    ) -> dict[str, Any] | None:
-        """Merge a into b."""
-        if a_dict is None or b_dict is None:
-            return None
-        for key, value in a_dict.items():
-            if isinstance(value, dict):
-                item = b_dict.setdefault(key, {})
-                self._merge(value, item)
-            elif isinstance(value, list):
-                item = b_dict.setdefault(key, [{}])
-                if len(value) == 1 and isinstance(value[0], dict):
-                    self._merge(value[0], item[0])
-                else:
-                    b_dict[key] = value
-            else:
-                b_dict[key] = value
-        return b_dict
-
-    def combine_data(self, command2: Command[Any] | None) -> None:
-        """Combine data for this command with another."""
-        if command2 is None:
-            return
-        self._data = self._merge(
-            command2._data, self._data  # pylint: disable=protected-access
-        )
-
-    def __add__(self, other: Command[Any] | None) -> Command[T]:
-        """Add Command to this Command."""
-        if other is None:
-            return deepcopy(self)
-        if isinstance(other, self.__class__):
-            new_obj = deepcopy(self)
-            new_obj.combine_data(other)
-            return new_obj
-        msg = f"unsupported operand type(s) for '{self.__class__}' and '{type(other)}'"
-        raise (TypeError(msg))
-
     def __repr__(self) -> str:
         """Return the representation."""
         if self.data is None:

pytradfri/smart_task.py

@@ -267,14 +267,6 @@ def state(self) -> bool:
         """Return state of start action task."""
         return self.raw.state == 1
 
-    @property
-    def devices(self) -> list[StartActionItem]:
-        """Return state of start action task."""
-        return [
-            StartActionItem(self.smart_task, i, self.state, self.path, self.raw)
-            for i in range(len(self.raw.root_start_action))
-        ]
-
     @property
     def raw(self) -> RootStartActionResponse:
         """Return raw data that it represents."""

tests/test_command.py

@@ -54,145 +54,6 @@ def test_url():
     assert url == "coaps://host:5684/path1/path2"
 
 
-def test_combining_mutates():
-    """Test combining mutates."""
-    DATA_INT = {"key_int": 0}
-    DATA_INT2 = {"key_int_2": 1}
-    COMBINED_INT = {"key_int": 0, "key_int_2": 1}
-
-    command1 = Command("method", "path", DATA_INT)
-    command2 = Command("method", "path", DATA_INT2)
-    combined = command1 + command2
-
-    # Adding shouldn't mutate the original commands
-    assert command1._data == DATA_INT
-    assert command2._data == DATA_INT2
-    assert combined._data == COMBINED_INT
-
-    # Combining should mutate the original command
-    command1.combine_data(command2)
-    assert command1._data == COMBINED_INT
-    assert command2._data == DATA_INT2
-
-
-def test_combining_with_none():
-    """Test combining with nothing."""
-    DATA_INT = {"key_int": 0}
-
-    command1 = Command("method", "path", DATA_INT)
-    combined = command1 + None
-
-    assert combined._data == DATA_INT
-
-    # Combining should mutate the original command
-    command1.combine_data(None)
-    assert command1._data == DATA_INT
-
-
-def test_combining_integer_keys():
-    """Test combining integer keys."""
-    DATA_INT = {"key_int": 0}
-    DATA_INT_SAME_KEY = {"key_int": 1}
-    DATA_INT2 = {"key_int_2": 1}
-    COMBINED_INT = {"key_int": 0, "key_int_2": 1}
-
-    command1 = Command("method", "path", DATA_INT)
-    command2 = Command("method", "path", DATA_INT2)
-    combined = command1 + command2
-    assert combined._data == COMBINED_INT
-
-    command1 = Command("method", "path", DATA_INT)
-    command2 = Command("method", "path", DATA_INT_SAME_KEY)
-    # We should always take the last key if we can't merge
-    combined = command1 + command2
-    assert combined._data == DATA_INT_SAME_KEY
-
-
-def test_combining_string_keys():
-    """Test combining simple keys."""
-    DATA_STRING = {"key_string": "a"}
-    DATA_STRING_SAME_KEY = {"key_string": "same"}
-    DATA_STRING2 = {"key_string_2": "b"}
-    COMBINED_STRING = {"key_string": "a", "key_string_2": "b"}
-
-    command1 = Command("method", "path", DATA_STRING)
-    command2 = Command("method", "path", DATA_STRING2)
-    combined = command1 + command2
-    assert combined._data == COMBINED_STRING
-
-    command1 = Command("method", "path", DATA_STRING)
-    command2 = Command("method", "path", DATA_STRING_SAME_KEY)
-    # We should always take the last key if we can't merge
-    combined = command1 + command2
-    assert combined._data == DATA_STRING_SAME_KEY
-
-
-def test_combining_dict_keys():
-    """Test combining dict keys."""
-    DATA_EMPTY_DICT = {"key_dict": {}}
-    DATA_DICT_INT = {"key_dict": {"key_int": 0}}
-    DATA_DICT_STRING = {"key_dict": {"key_string": "a"}}
-    DATA_DICT_STRING2 = {"key_dict": {"key_string": "b"}}
-    DATA_DICT_INTSTRING = {"key_dict": {"key_int": 0, "key_string": "a"}}
-
-    command1 = Command("method", "path", DATA_EMPTY_DICT)
-    command2 = Command("method", "path", DATA_DICT_INT)
-    combined = command1 + command2
-    assert combined._data == DATA_DICT_INT
-
-    command1 = Command("method", "path", DATA_DICT_INT)
-    command2 = Command("method", "path", DATA_DICT_STRING)
-    combined = command1 + command2
-    assert combined._data == DATA_DICT_INTSTRING
-
-    command1 = Command("method", "path", DATA_DICT_STRING)
-    command2 = Command("method", "path", DATA_DICT_STRING2)
-    combined = command1 + command2
-    assert combined._data == DATA_DICT_STRING2
-
-    command1 = Command("method", "path", DATA_DICT_INT)
-    command2 = Command("method", "path", DATA_DICT_STRING2)
-    command3 = Command("method", "path", DATA_DICT_STRING)
-    combined = command1 + command2 + command3
-    assert combined._data == DATA_DICT_INTSTRING
-
-
-def test_combining_list_keys():
-    """Test combining simple list keys."""
-    DATA_EMPTY_LIST = {"key_list": []}
-    DATA_INT_LIST1 = {"key_list": [0, 1, 2]}
-    DATA_INT_LIST2 = {"key_list": [10, 11, 12]}
-
-    command1 = Command("method", "path", DATA_EMPTY_LIST)
-    command2 = Command("method", "path", DATA_INT_LIST1)
-    combined = command1 + command2
-    assert combined._data == DATA_INT_LIST1
-
-    # Duplicated keys are replaced if not dicts
-    command1 = Command("method", "path", DATA_INT_LIST1)
-    command2 = Command("method", "path", DATA_INT_LIST2)
-    combined = command1 + command2
-    assert combined._data == DATA_INT_LIST2
-
-
-def test_combining_listed_dict_keys():
-    """Test combining of listed dict keys."""
-    DATA_EMPTY_DICT = {"key_ldict": [{}]}
-    DATA_DICT_INT = {"key_ldict": [{"key_int": 0}]}
-    DATA_DICT_STRING = {"key_ldict": [{"key_string": "a"}]}
-    DATA_DICT_INTSTRING = {"key_ldict": [{"key_int": 0, "key_string": "a"}]}
-
-    command1 = Command("method", "path", DATA_EMPTY_DICT)
-    command2 = Command("method", "path", DATA_DICT_INT)
-    combined = command1 + command2
-    assert combined._data == DATA_DICT_INT
-
-    command1 = Command("method", "path", DATA_DICT_INT)
-    command2 = Command("method", "path", DATA_DICT_STRING)
-    combined = command1 + command2
-    assert combined._data == DATA_DICT_INTSTRING
-
-
 def test_add_unsupported():
     """Test add unsupported causes error."""
     command1 = Command("method", "path", {})

tests/test_smart_task.py

@@ -98,28 +98,6 @@ def test_smart_task_info():
     assert task.dimmer == 254
 
 
-def test_smart_task_set_start_action_dimmer():
-    """Test start dimmer."""
-    gateway = Gateway()
-
-    cmd = (
-        SmartTask(gateway, TASK).start_action.devices[0].item_controller.set_dimmer(30)
-    )
-
-    assert cmd.method == "put"
-    assert cmd.path == ["15010", "317094"]
-    assert cmd.data == {
-        "9042": {
-            "15013": [
-                {"5712": 18000, "5851": 30, "9003": 65537},
-                {"5712": 18000, "5851": 254, "9003": 65538},
-                {"5712": 19000, "5851": 230, "9003": 65539},
-            ],
-            "5850": 1,
-        }
-    }
-
-
 def test_smart_task_bit_choices():
     """Test smart task with bit choices."""
     assert WEEKDAYS.get_selected_values(3) == ["Monday", "Tuesday"]