Remove 'shadowing' warnings by renanming 'tuple' function parameters …

…to 'tpl'

src/gwproto/gs/gs_dispatch_maker.py

@@ -8,18 +8,18 @@ class GsDispatch_Maker:
     type_name = "d"
 
     def __init__(self, relay_state):
-        tuple = GsDispatch(RelayState=relay_state)
-        tuple.check_for_errors()
-        self.tuple = tuple
+        tpl = GsDispatch(RelayState=relay_state)
+        tpl.check_for_errors()
+        self.tuple = tpl
 
     @classmethod
-    def tuple_to_type(cls, tuple: GsDispatch) -> bytes:
-        tuple.check_for_errors()
-        return tuple.as_type()
+    def tuple_to_type(cls, tpl: GsDispatch) -> bytes:
+        tpl.check_for_errors()
+        return tpl.as_type()
 
     @classmethod
     def type_to_tuple(cls, b: bytes) -> GsDispatch:
         (relay_state,) = struct.unpack("<h", b)
-        tuple = GsDispatch(RelayState=relay_state)
-        tuple.check_for_errors
-        return tuple
+        tpl = GsDispatch(RelayState=relay_state)
+        tpl.check_for_errors()
+        return tpl

src/gwproto/gs/gs_pwr_maker.py

@@ -8,18 +8,18 @@ class GsPwr_Maker:
     type_name = "p"
 
     def __init__(self, power):
-        tuple = GsPwr(Power=power)
-        tuple.check_for_errors()
-        self.tuple = tuple
+        tpl = GsPwr(Power=power)
+        tpl.check_for_errors()
+        self.tuple = tpl
 
     @classmethod
-    def tuple_to_type(cls, tuple: GsPwr) -> bytes:
-        tuple.check_for_errors()
-        return tuple.as_type()
+    def tuple_to_type(cls, tpl: GsPwr) -> bytes:
+        tpl.check_for_errors()
+        return tpl.as_type()
 
     @classmethod
     def type_to_tuple(cls, b: bytes) -> GsPwr:
         (power,) = struct.unpack("<h", b)
-        tuple = GsPwr(Power=power)
-        tuple.check_for_errors
-        return tuple
+        tpl = GsPwr(Power=power)
+        tpl.check_for_errors()
+        return tpl

src/gwproto/types/data_channel.py

@@ -149,11 +149,11 @@ def __init__(
         )
 
     @classmethod
-    def tuple_to_type(cls, tuple: DataChannel) -> bytes:
+    def tuple_to_type(cls, tpl: DataChannel) -> bytes:
         """
         Given a Python class object, returns the serialized JSON type object.
         """
-        return tuple.as_type()
+        return tpl.as_type()
 
     @classmethod
     def type_to_tuple(cls, t: bytes) -> DataChannel:
@@ -223,7 +223,7 @@ def check_is_spaceheat_name(v: str) -> None:
     or a hyphen, and the first word starts with an alphabet character.
 
     Args:
-        candidate (str): The string to be validated.
+        v (str): The string to be validated.
 
     Raises:
         ValueError: If the provided string is not in SpaceheatName format.

src/gwproto/types/egauge_io.py

@@ -122,11 +122,11 @@ def __init__(
         )
 
     @classmethod
-    def tuple_to_type(cls, tuple: EgaugeIo) -> bytes:
+    def tuple_to_type(cls, tpl: EgaugeIo) -> bytes:
         """
         Given a Python class object, returns the serialized JSON type object.
         """
-        return tuple.as_type()
+        return tpl.as_type()
 
     @classmethod
     def type_to_tuple(cls, t: bytes) -> EgaugeIo:

src/gwproto/types/egauge_register_config.py

@@ -131,7 +131,7 @@ def __init__(
         address: int,
         name: str,
         description: str,
-        type: str,
+        type: str,  # noqa
         denominator: int,
         unit: str,
     ):
@@ -145,11 +145,11 @@ def __init__(
         )
 
     @classmethod
-    def tuple_to_type(cls, tuple: EgaugeRegisterConfig) -> bytes:
+    def tuple_to_type(cls, tpl: EgaugeRegisterConfig) -> bytes:
         """
         Given a Python class object, returns the serialized JSON type object.
         """
-        return tuple.as_type()
+        return tpl.as_type()
 
     @classmethod
     def type_to_tuple(cls, t: bytes) -> EgaugeRegisterConfig:

src/gwproto/types/electric_meter_cac_gt.py

@@ -174,11 +174,11 @@ def __init__(
         )
 
     @classmethod
-    def tuple_to_type(cls, tuple: ElectricMeterCacGt) -> bytes:
+    def tuple_to_type(cls, tpl: ElectricMeterCacGt) -> bytes:
         """
         Given a Python class object, returns the serialized JSON type object.
         """
-        return tuple.as_type()
+        return tpl.as_type()
 
     @classmethod
     def type_to_tuple(cls, t: bytes) -> ElectricMeterCacGt:

src/gwproto/types/electric_meter_component_gt.py

@@ -263,11 +263,11 @@ def __init__(
         )
 
     @classmethod
-    def tuple_to_type(cls, tuple: ElectricMeterComponentGt) -> bytes:
+    def tuple_to_type(cls, tpl: ElectricMeterComponentGt) -> bytes:
         """
         Given a Python class object, returns the serialized JSON type object.
         """
-        return tuple.as_type()
+        return tpl.as_type()
 
     @classmethod
     def type_to_tuple(cls, t: bytes) -> ElectricMeterComponentGt:

src/gwproto/types/gt_dispatch_boolean.py

@@ -189,11 +189,11 @@ def __init__(
         )
 
     @classmethod
-    def tuple_to_type(cls, tuple: GtDispatchBoolean) -> bytes:
+    def tuple_to_type(cls, tpl: GtDispatchBoolean) -> bytes:
         """
         Given a Python class object, returns the serialized JSON type object.
         """
-        return tuple.as_type()
+        return tpl.as_type()
 
     @classmethod
     def type_to_tuple(cls, t: bytes) -> GtDispatchBoolean:

src/gwproto/types/gt_dispatch_boolean_local.py

@@ -160,11 +160,11 @@ def __init__(
         )
 
     @classmethod
-    def tuple_to_type(cls, tuple: GtDispatchBooleanLocal) -> bytes:
+    def tuple_to_type(cls, tpl: GtDispatchBooleanLocal) -> bytes:
         """
         Given a Python class object, returns the serialized JSON type object.
         """
-        return tuple.as_type()
+        return tpl.as_type()
 
     @classmethod
     def type_to_tuple(cls, t: bytes) -> GtDispatchBooleanLocal:

src/gwproto/types/gt_driver_booleanactuator_cmd.py

@@ -138,11 +138,11 @@ def __init__(
         )
 
     @classmethod
-    def tuple_to_type(cls, tuple: GtDriverBooleanactuatorCmd) -> bytes:
+    def tuple_to_type(cls, tpl: GtDriverBooleanactuatorCmd) -> bytes:
         """
         Given a Python class object, returns the serialized JSON type object.
         """
-        return tuple.as_type()
+        return tpl.as_type()
 
     @classmethod
     def type_to_tuple(cls, t: bytes) -> GtDriverBooleanactuatorCmd:

src/gwproto/types/gt_sh_booleanactuator_cmd_status.py

@@ -140,11 +140,11 @@ def __init__(
         )
 
     @classmethod
-    def tuple_to_type(cls, tuple: GtShBooleanactuatorCmdStatus) -> bytes:
+    def tuple_to_type(cls, tpl: GtShBooleanactuatorCmdStatus) -> bytes:
         """
         Given a Python class object, returns the serialized JSON type object.
         """
-        return tuple.as_type()
+        return tpl.as_type()
 
     @classmethod
     def type_to_tuple(cls, t: bytes) -> GtShBooleanactuatorCmdStatus:

src/gwproto/types/gt_sh_cli_atn_cmd.py

@@ -136,11 +136,11 @@ def __init__(
         )
 
     @classmethod
-    def tuple_to_type(cls, tuple: GtShCliAtnCmd) -> bytes:
+    def tuple_to_type(cls, tpl: GtShCliAtnCmd) -> bytes:
         """
         Given a Python class object, returns the serialized JSON type object.
         """
-        return tuple.as_type()
+        return tpl.as_type()
 
     @classmethod
     def type_to_tuple(cls, t: bytes) -> GtShCliAtnCmd:

src/gwproto/types/gt_sh_multipurpose_telemetry_status.py

@@ -184,11 +184,11 @@ def __init__(
         )
 
     @classmethod
-    def tuple_to_type(cls, tuple: GtShMultipurposeTelemetryStatus) -> bytes:
+    def tuple_to_type(cls, tpl: GtShMultipurposeTelemetryStatus) -> bytes:
         """
         Given a Python class object, returns the serialized JSON type object.
         """
-        return tuple.as_type()
+        return tpl.as_type()
 
     @classmethod
     def type_to_tuple(cls, t: bytes) -> GtShMultipurposeTelemetryStatus:

src/gwproto/types/gt_sh_simple_telemetry_status.py

@@ -169,11 +169,11 @@ def __init__(
         )
 
     @classmethod
-    def tuple_to_type(cls, tuple: GtShSimpleTelemetryStatus) -> bytes:
+    def tuple_to_type(cls, tpl: GtShSimpleTelemetryStatus) -> bytes:
         """
         Given a Python class object, returns the serialized JSON type object.
         """
-        return tuple.as_type()
+        return tpl.as_type()
 
     @classmethod
     def type_to_tuple(cls, t: bytes) -> GtShSimpleTelemetryStatus:

src/gwproto/types/gt_sh_status.py

@@ -215,11 +215,11 @@ def __init__(
         )
 
     @classmethod
-    def tuple_to_type(cls, tuple: GtShStatus) -> bytes:
+    def tuple_to_type(cls, tpl: GtShStatus) -> bytes:
         """
         Given a Python class object, returns the serialized JSON type object.
         """
-        return tuple.as_type()
+        return tpl.as_type()
 
     @classmethod
     def type_to_tuple(cls, t: bytes) -> GtShStatus:

src/gwproto/types/gt_sh_telemetry_from_multipurpose_sensor.py

@@ -170,11 +170,11 @@ def __init__(
         )
 
     @classmethod
-    def tuple_to_type(cls, tuple: GtShTelemetryFromMultipurposeSensor) -> bytes:
+    def tuple_to_type(cls, tpl: GtShTelemetryFromMultipurposeSensor) -> bytes:
         """
         Given a Python class object, returns the serialized JSON type object.
         """
-        return tuple.as_type()
+        return tpl.as_type()
 
     @classmethod
     def type_to_tuple(cls, t: bytes) -> GtShTelemetryFromMultipurposeSensor:

src/gwproto/types/gt_telemetry.py

@@ -141,11 +141,11 @@ def __init__(
         )
 
     @classmethod
-    def tuple_to_type(cls, tuple: GtTelemetry) -> bytes:
+    def tuple_to_type(cls, tpl: GtTelemetry) -> bytes:
         """
         Given a Python class object, returns the serialized JSON type object.
         """
-        return tuple.as_type()
+        return tpl.as_type()
 
     @classmethod
     def type_to_tuple(cls, t: bytes) -> GtTelemetry:

src/gwproto/types/heartbeat_b.py

@@ -194,11 +194,11 @@ def __init__(
         )
 
     @classmethod
-    def tuple_to_type(cls, tuple: HeartbeatB) -> bytes:
+    def tuple_to_type(cls, tpl: HeartbeatB) -> bytes:
         """
         Given a Python class object, returns the serialized JSON type object.
         """
-        return tuple.as_type()
+        return tpl.as_type()
 
     @classmethod
     def type_to_tuple(cls, t: bytes) -> HeartbeatB:

src/gwproto/types/multipurpose_sensor_cac_gt.py

@@ -191,11 +191,11 @@ def __init__(
         )
 
     @classmethod
-    def tuple_to_type(cls, tuple: MultipurposeSensorCacGt) -> bytes:
+    def tuple_to_type(cls, tpl: MultipurposeSensorCacGt) -> bytes:
         """
         Given a Python class object, returns the serialized JSON type object.
         """
-        return tuple.as_type()
+        return tpl.as_type()
 
     @classmethod
     def type_to_tuple(cls, t: bytes) -> MultipurposeSensorCacGt:

src/gwproto/types/multipurpose_sensor_component_gt.py

@@ -179,11 +179,11 @@ def __init__(
         )
 
     @classmethod
-    def tuple_to_type(cls, tuple: MultipurposeSensorComponentGt) -> bytes:
+    def tuple_to_type(cls, tpl: MultipurposeSensorComponentGt) -> bytes:
         """
         Given a Python class object, returns the serialized JSON type object.
         """
-        return tuple.as_type()
+        return tpl.as_type()
 
     @classmethod
     def type_to_tuple(cls, t: bytes) -> MultipurposeSensorComponentGt:

src/gwproto/types/pipe_flow_sensor_cac_gt.py

@@ -139,11 +139,11 @@ def __init__(
         )
 
     @classmethod
-    def tuple_to_type(cls, tuple: PipeFlowSensorCacGt) -> bytes:
+    def tuple_to_type(cls, tpl: PipeFlowSensorCacGt) -> bytes:
         """
         Given a Python class object, returns the serialized JSON type object.
         """
-        return tuple.as_type()
+        return tpl.as_type()
 
     @classmethod
     def type_to_tuple(cls, t: bytes) -> PipeFlowSensorCacGt:

src/gwproto/types/pipe_flow_sensor_component_gt.py

@@ -175,11 +175,11 @@ def __init__(
         )
 
     @classmethod
-    def tuple_to_type(cls, tuple: PipeFlowSensorComponentGt) -> bytes:
+    def tuple_to_type(cls, tpl: PipeFlowSensorComponentGt) -> bytes:
         """
         Given a Python class object, returns the serialized JSON type object.
         """
-        return tuple.as_type()
+        return tpl.as_type()
 
     @classmethod
     def type_to_tuple(cls, t: bytes) -> PipeFlowSensorComponentGt:

src/gwproto/types/power_watts.py

@@ -102,11 +102,11 @@ def __init__(
         )
 
     @classmethod
-    def tuple_to_type(cls, tuple: PowerWatts) -> bytes:
+    def tuple_to_type(cls, tpl: PowerWatts) -> bytes:
         """
         Given a Python class object, returns the serialized JSON type object.
         """
-        return tuple.as_type()
+        return tpl.as_type()
 
     @classmethod
     def type_to_tuple(cls, t: bytes) -> PowerWatts:

src/gwproto/types/relay_cac_gt.py

@@ -137,11 +137,11 @@ def __init__(
         )
 
     @classmethod
-    def tuple_to_type(cls, tuple: RelayCacGt) -> bytes:
+    def tuple_to_type(cls, tpl: RelayCacGt) -> bytes:
         """
         Given a Python class object, returns the serialized JSON type object.
         """
-        return tuple.as_type()
+        return tpl.as_type()
 
     @classmethod
     def type_to_tuple(cls, t: bytes) -> RelayCacGt:

src/gwproto/types/relay_component_gt.py

@@ -173,11 +173,11 @@ def __init__(
         )
 
     @classmethod
-    def tuple_to_type(cls, tuple: RelayComponentGt) -> bytes:
+    def tuple_to_type(cls, tpl: RelayComponentGt) -> bytes:
         """
         Given a Python class object, returns the serialized JSON type object.
         """
-        return tuple.as_type()
+        return tpl.as_type()
 
     @classmethod
     def type_to_tuple(cls, t: bytes) -> RelayComponentGt: