Remove reverse_order (replaced by generic swap) (#51665)

Remove reverse_order (replaced by generic swap).

homeassistant/components/modbus/__init__.py

@@ -242,12 +242,15 @@ LIGHT_SCHEMA = BASE_SWITCH_SCHEMA.extend({})
 
 FAN_SCHEMA = BASE_SWITCH_SCHEMA.extend({})
 
-SENSOR_SCHEMA = BASE_STRUCT_SCHEMA.extend(
-    {
-        vol.Optional(CONF_DEVICE_CLASS): SENSOR_DEVICE_CLASSES_SCHEMA,
-        vol.Optional(CONF_REVERSE_ORDER): cv.boolean,
-        vol.Optional(CONF_UNIT_OF_MEASUREMENT): cv.string,
-    }
+SENSOR_SCHEMA = vol.All(
+    cv.deprecated(CONF_REVERSE_ORDER),
+    BASE_STRUCT_SCHEMA.extend(
+        {
+            vol.Optional(CONF_DEVICE_CLASS): SENSOR_DEVICE_CLASSES_SCHEMA,
+            vol.Optional(CONF_UNIT_OF_MEASUREMENT): cv.string,
+            vol.Optional(CONF_REVERSE_ORDER): cv.boolean,
+        }
+    ),
 )
 
 BINARY_SENSOR_SCHEMA = BASE_COMPONENT_SCHEMA.extend(

homeassistant/components/modbus/validators.py

@@ -17,11 +17,9 @@ from homeassistant.const import (
 
 from .const import (
     CONF_DATA_TYPE,
-    CONF_REVERSE_ORDER,
     CONF_SWAP,
     CONF_SWAP_BYTE,
     CONF_SWAP_NONE,
-    CONF_SWAP_WORD,
     DATA_TYPE_CUSTOM,
     DATA_TYPE_STRING,
     DEFAULT_SCAN_INTERVAL,
@@ -71,13 +69,6 @@ def sensor_schema_validator(config):
 
     swap_type = config.get(CONF_SWAP)
 
-    if CONF_REVERSE_ORDER in config:
-        if config[CONF_REVERSE_ORDER]:
-            swap_type = CONF_SWAP_WORD
-        else:
-            swap_type = CONF_SWAP_NONE
-        del config[CONF_REVERSE_ORDER]
-
     if config.get(CONF_SWAP) != CONF_SWAP_NONE:
         if swap_type == CONF_SWAP_BYTE:
             regs_needed = 1

tests/components/modbus/test_init.py

@@ -41,7 +41,6 @@ from homeassistant.components.modbus.const import (
     CONF_DATA_TYPE,
     CONF_INPUT_TYPE,
     CONF_PARITY,
-    CONF_REVERSE_ORDER,
     CONF_STOPBITS,
     CONF_SWAP,
     CONF_SWAP_BYTE,
@@ -136,13 +135,6 @@ async def test_number_validator():
             CONF_NAME: TEST_SENSOR_NAME,
             CONF_COUNT: 2,
             CONF_DATA_TYPE: DATA_TYPE_INT,
-            CONF_REVERSE_ORDER: True,
-        },
-        {
-            CONF_NAME: TEST_SENSOR_NAME,
-            CONF_COUNT: 2,
-            CONF_DATA_TYPE: DATA_TYPE_INT,
-            CONF_REVERSE_ORDER: False,
         },
         {
             CONF_NAME: TEST_SENSOR_NAME,

tests/components/modbus/test_sensor.py

@@ -10,7 +10,6 @@ from homeassistant.components.modbus.const import (
     CONF_INPUT_TYPE,
     CONF_PRECISION,
     CONF_REGISTERS,
-    CONF_REVERSE_ORDER,
     CONF_SCALE,
     CONF_SWAP,
     CONF_SWAP_BYTE,
@@ -55,7 +54,6 @@ from tests.common import mock_restore_cache
             CONF_DATA_TYPE: "int",
             CONF_PRECISION: 0,
             CONF_SCALE: 1,
-            CONF_REVERSE_ORDER: False,
             CONF_OFFSET: 0,
             CONF_INPUT_TYPE: CALL_TYPE_REGISTER_HOLDING,
             CONF_DEVICE_CLASS: "battery",
@@ -67,7 +65,6 @@ from tests.common import mock_restore_cache
             CONF_DATA_TYPE: "int",
             CONF_PRECISION: 0,
             CONF_SCALE: 1,
-            CONF_REVERSE_ORDER: False,
             CONF_OFFSET: 0,
             CONF_INPUT_TYPE: CALL_TYPE_REGISTER_INPUT,
             CONF_DEVICE_CLASS: "battery",
@@ -331,15 +328,6 @@ async def test_config_wrong_struct_sensor(
             [0x89AB, 0xCDEF],
             str(0x89ABCDEF),
         ),
-        (
-            {
-                CONF_COUNT: 2,
-                CONF_DATA_TYPE: DATA_TYPE_UINT,
-                CONF_REVERSE_ORDER: True,
-            },
-            [0x89AB, 0xCDEF],
-            str(0xCDEF89AB),
-        ),
         (
             {
                 CONF_COUNT: 4,