reduce diff

Author: ohmayr

gapic/schema/api.py

@@ -1255,7 +1255,7 @@ def proto(self) -> Proto:
                     k,
                     v.with_context(
                         collisions=global_collisions,
-                        visited_messages=frozenset(v.names),
+                        visited_messages=visited_messages,
                         context_cache=self.context_cache,
                     ),
                 )

gapic/schema/metadata.py

@@ -368,15 +368,12 @@ def with_context(self, *, collisions: Set[str], context_cache: Optional[Dict] =
         ``Address`` object aliases module names to avoid naming collisions in
         the file being written.
         """
-    
-        updated_msg = (
+        return (
             dataclasses.replace(self, collisions=collisions)
             if collisions and collisions != self.collisions
             else self
         )
 
-        return updated_msg
-
 
 @dataclasses.dataclass(frozen=True)
 class Metadata:
@@ -411,8 +408,7 @@ def with_context(self, *, collisions: Set[str], context_cache: Optional[Dict] =
         ``Address`` object aliases module names to avoid naming collisions in
         the file being written.
         """
-        
-        updated_msg =  (
+        return (
             dataclasses.replace(
                 self,
                 address=self.address.with_context(collisions=collisions, context_cache=context_cache),
@@ -421,8 +417,6 @@ def with_context(self, *, collisions: Set[str], context_cache: Optional[Dict] =
             else self
         )
 
-        return updated_msg
-
 
 @dataclasses.dataclass(frozen=True)
 class FieldIdentifier:

gapic/schema/wrappers.py

@@ -425,8 +425,7 @@ def with_context(
         ``Field`` object aliases module names to avoid naming collisions
         in the file being written.
         """
-
-        updated_msg = dataclasses.replace(
+        return dataclasses.replace(
             self,
             message=(
                 self.message.with_context(
@@ -444,8 +443,6 @@ def with_context(
             meta=self.meta.with_context(collisions=collisions, context_cache=context_cache),
         )
 
-        return updated_msg
-
     def add_to_address_allowlist(
         self,
         *,
@@ -834,8 +831,7 @@ def with_context(
         """
         visited_messages = visited_messages or set()
         visited_messages = visited_messages | {self}
-    
-        updated_msg = dataclasses.replace(
+        return dataclasses.replace(
             self,
             fields=(
                 {
@@ -863,8 +859,6 @@ def with_context(
             meta=self.meta.with_context(collisions=collisions, context_cache=context_cache),
         )
 
-        return updated_msg
-
     def add_to_address_allowlist(
         self,
         *,
@@ -959,8 +953,7 @@ def with_context(self, *, collisions: Set[str], context_cache: Optional[Dict] =
         ``EnumType`` object aliases module names to avoid naming collisions in
         the file being written.
         """
-    
-        updated_msg = (
+        return (
             dataclasses.replace(
                 self,
                 meta=self.meta.with_context(collisions=collisions, context_cache=context_cache),
@@ -969,8 +962,6 @@ def with_context(self, *, collisions: Set[str], context_cache: Optional[Dict] =
             else self
         )
 
-        return updated_msg
-
     def add_to_address_allowlist(
         self, *, address_allowlist: Set["metadata.Address"]
     ) -> None:
@@ -1090,8 +1081,7 @@ def with_context(
         ``OperationInfo`` object aliases module names to avoid naming collisions
         in the file being written.
         """
-
-        updated_msg = (
+        return (
             self
             if not collisions
             else dataclasses.replace(
@@ -1109,8 +1099,6 @@ def with_context(
             )
         )
 
-        return updated_msg
-
     def add_to_address_allowlist(
         self,
         *,
@@ -1166,8 +1154,7 @@ def with_context(
         ``OperationInfo`` object aliases module names to avoid naming collisions
         in the file being written.
         """
-        
-        updated_msg = dataclasses.replace(
+        return dataclasses.replace(
             self,
             response_type=self.response_type.with_context(
                 collisions=collisions,
@@ -1181,9 +1168,6 @@ def with_context(
             ),
         )
 
-        return updated_msg
-
-
     def add_to_address_allowlist(
         self,
         *,
@@ -1984,7 +1968,6 @@ def with_context(
         ``Method`` object aliases module names to avoid naming collisions
         in the file being written.
         """
-
         maybe_lro = None
         if self.lro:
             maybe_lro = (
@@ -2007,7 +1990,7 @@ def with_context(
             else None
         )
 
-        updated_msg = dataclasses.replace(
+        return dataclasses.replace(
             self,
             lro=maybe_lro,
             extended_lro=maybe_extended_lro,
@@ -2024,8 +2007,6 @@ def with_context(
             meta=self.meta.with_context(collisions=collisions, context_cache=context_cache),
         )
 
-        return updated_msg
-
     def add_to_address_allowlist(
         self,
         *,
@@ -2413,8 +2394,7 @@ def with_context(
         ``Service`` object aliases module names to avoid naming collisions
         in the file being written.
         """
-
-        updated_msg = dataclasses.replace(
+        return dataclasses.replace(
             self,
             methods={
                 k: v.with_context(
@@ -2428,8 +2408,6 @@ def with_context(
             },
             meta=self.meta.with_context(collisions=collisions, context_cache=context_cache),
         )
-    
-        return updated_msg
 
     def add_to_address_allowlist(
         self,