From 35e6a13cd1230519464aa80f42e2ac951335f3cb Mon Sep 17 00:00:00 2001
From: Otto Winter <otto@otto-winter.com>
Date: Wed, 9 Feb 2022 14:56:42 +0100
Subject: [PATCH] Remove unused obj attribute from AssignmentExpression (#3145)

---
 esphome/cpp_generator.py               | 23 +++++++++++------------
 tests/unit_tests/test_cpp_generator.py |  8 ++++----
 2 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/esphome/cpp_generator.py b/esphome/cpp_generator.py
index 82deec70ec..4ff16ba703 100644
--- a/esphome/cpp_generator.py
+++ b/esphome/cpp_generator.py
@@ -62,14 +62,13 @@ class RawExpression(Expression):
 
 
 class AssignmentExpression(Expression):
-    __slots__ = ("type", "modifier", "name", "rhs", "obj")
+    __slots__ = ("type", "modifier", "name", "rhs")
 
-    def __init__(self, type_, modifier, name, rhs, obj):
+    def __init__(self, type_, modifier, name, rhs):
         self.type = type_
         self.modifier = modifier
         self.name = name
         self.rhs = safe_exp(rhs)
-        self.obj = obj
 
     def __str__(self):
         if self.type is None:
@@ -427,8 +426,8 @@ class LineComment(Statement):
 class ProgmemAssignmentExpression(AssignmentExpression):
     __slots__ = ()
 
-    def __init__(self, type_, name, rhs, obj):
-        super().__init__(type_, "", name, rhs, obj)
+    def __init__(self, type_, name, rhs):
+        super().__init__(type_, "", name, rhs)
 
     def __str__(self):
         return f"static const {self.type} {self.name}[] PROGMEM = {self.rhs}"
@@ -437,8 +436,8 @@ class ProgmemAssignmentExpression(AssignmentExpression):
 class StaticConstAssignmentExpression(AssignmentExpression):
     __slots__ = ()
 
-    def __init__(self, type_, name, rhs, obj):
-        super().__init__(type_, "", name, rhs, obj)
+    def __init__(self, type_, name, rhs):
+        super().__init__(type_, "", name, rhs)
 
     def __str__(self):
         return f"static const {self.type} {self.name}[] = {self.rhs}"
@@ -447,7 +446,7 @@ class StaticConstAssignmentExpression(AssignmentExpression):
 def progmem_array(id_, rhs) -> "MockObj":
     rhs = safe_exp(rhs)
     obj = MockObj(id_, ".")
-    assignment = ProgmemAssignmentExpression(id_.type, id_, rhs, obj)
+    assignment = ProgmemAssignmentExpression(id_.type, id_, rhs)
     CORE.add(assignment)
     CORE.register_variable(id_, obj)
     return obj
@@ -456,7 +455,7 @@ def progmem_array(id_, rhs) -> "MockObj":
 def static_const_array(id_, rhs) -> "MockObj":
     rhs = safe_exp(rhs)
     obj = MockObj(id_, ".")
-    assignment = StaticConstAssignmentExpression(id_.type, id_, rhs, obj)
+    assignment = StaticConstAssignmentExpression(id_.type, id_, rhs)
     CORE.add(assignment)
     CORE.register_variable(id_, obj)
     return obj
@@ -484,7 +483,7 @@ def variable(id_: ID, rhs: SafeExpType, type_: "MockObj" = None) -> "MockObj":
     obj = MockObj(id_, ".")
     if type_ is not None:
         id_.type = type_
-    assignment = AssignmentExpression(id_.type, "", id_, rhs, obj)
+    assignment = AssignmentExpression(id_.type, "", id_, rhs)
     CORE.add(assignment)
     CORE.register_variable(id_, obj)
     return obj
@@ -507,7 +506,7 @@ def new_variable(id_: ID, rhs: SafeExpType, type_: "MockObj" = None) -> "MockObj
         id_.type = type_
     decl = VariableDeclarationExpression(id_.type, "", id_)
     CORE.add_global(decl)
-    assignment = AssignmentExpression(None, "", id_, rhs, obj)
+    assignment = AssignmentExpression(None, "", id_, rhs)
     CORE.add(assignment)
     CORE.register_variable(id_, obj)
     return obj
@@ -529,7 +528,7 @@ def Pvariable(id_: ID, rhs: SafeExpType, type_: "MockObj" = None) -> "MockObj":
         id_.type = type_
     decl = VariableDeclarationExpression(id_.type, "*", id_)
     CORE.add_global(decl)
-    assignment = AssignmentExpression(None, None, id_, rhs, obj)
+    assignment = AssignmentExpression(None, None, id_, rhs)
     CORE.add(assignment)
     CORE.register_variable(id_, obj)
     return obj
diff --git a/tests/unit_tests/test_cpp_generator.py b/tests/unit_tests/test_cpp_generator.py
index 5a8087ffa9..331c500c04 100644
--- a/tests/unit_tests/test_cpp_generator.py
+++ b/tests/unit_tests/test_cpp_generator.py
@@ -13,9 +13,9 @@ class TestExpressions:
         "target, expected",
         (
             (cg.RawExpression("foo && bar"), "foo && bar"),
-            (cg.AssignmentExpression(None, None, "foo", "bar", None), 'foo = "bar"'),
-            (cg.AssignmentExpression(ct.float_, "*", "foo", 1, None), "float *foo = 1"),
-            (cg.AssignmentExpression(ct.float_, "", "foo", 1, None), "float foo = 1"),
+            (cg.AssignmentExpression(None, None, "foo", "bar"), 'foo = "bar"'),
+            (cg.AssignmentExpression(ct.float_, "*", "foo", 1), "float *foo = 1"),
+            (cg.AssignmentExpression(ct.float_, "", "foo", 1), "float foo = 1"),
             (cg.VariableDeclarationExpression(ct.int32, "*", "foo"), "int32_t *foo"),
             (cg.VariableDeclarationExpression(ct.int32, "", "foo"), "int32_t foo"),
             (cg.ParameterExpression(ct.std_string, "foo"), "std::string foo"),
@@ -274,7 +274,7 @@ class TestStatements:
                 "// Help help\n// I'm being repressed",
             ),
             (
-                cg.ProgmemAssignmentExpression(ct.uint16, "foo", "bar", None),
+                cg.ProgmemAssignmentExpression(ct.uint16, "foo", "bar"),
                 'static const uint16_t foo[] PROGMEM = "bar"',
             ),
         ),