Minor changes to match upstream code modernization

Replicates graphql/graphql-js@564757f

Author: Cito

src/graphql/language/visitor.py

@@ -218,19 +218,20 @@ def visit(
             node: Any = parent
             parent = ancestors_pop() if ancestors else None
             if is_edited:
-                node = node[:] if in_array else copy(node)
-            edit_offset = 0
-            for edit_key, edit_value in edits:
                 if in_array:
-                    edit_key -= edit_offset
-                if in_array and (edit_value is REMOVE or edit_value is Ellipsis):
-                    node.pop(edit_key)
-                    edit_offset += 1
-                elif isinstance(node, list):
-                    node[edit_key] = edit_value
+                    node = node[:]
+                    edit_offset = 0
+                    for edit_key, edit_value in edits:
+                        array_key = edit_key - edit_offset
+                        if edit_value is REMOVE or edit_value is Ellipsis:
+                            node.pop(array_key)
+                            edit_offset += 1
+                        else:
+                            node[array_key] = edit_value
                 else:
-                    setattr(node, edit_key, edit_value)
-
+                    node = copy(node)
+                    for edit_key, edit_value in edits:
+                        setattr(node, edit_key, edit_value)
             idx = stack.idx
             keys = stack.keys
             edits = stack.edits

src/graphql/utilities/strip_ignored_characters.py

@@ -103,9 +103,8 @@ def dedent_block_string(block_str: str) -> str:
     if get_block_string_indentation(body) > 0:
         body = "\n" + body
 
-    last_char = body[-1:]
-    has_trailing_quote = last_char == '"' and body[-4:] != '\\"""'
-    if has_trailing_quote or last_char == "\\":
+    has_trailing_quote = body.endswith('"') and not body.endswith('\\"""')
+    if has_trailing_quote or body.endswith("\\"):
         body += "\n"
 
     return '"""' + body + '"""'

src/graphql/validation/rules/overlapping_fields_can_be_merged.py

@@ -229,7 +229,7 @@ def collect_conflicts_between_fields_and_fragment(
     if not fragment:
         return None
 
-    field_map2, fragment_names2 = get_referenced_fields_and_fragment_names(
+    field_map2, referenced_fragment_names = get_referenced_fields_and_fragment_names(
         context, cached_fields_and_fragment_names, fragment
     )
 
@@ -251,15 +251,15 @@ def collect_conflicts_between_fields_and_fragment(
 
     # (E) Then collect any conflicts between the provided collection of fields and any
     # fragment names found in the given fragment.
-    for fragment_name2 in fragment_names2:
+    for referenced_fragment_name in referenced_fragment_names:
         collect_conflicts_between_fields_and_fragment(
             context,
             conflicts,
             cached_fields_and_fragment_names,
             compared_fragment_pairs,
             are_mutually_exclusive,
             field_map,
-            fragment_name2,
+            referenced_fragment_name,
         )
 
 
@@ -293,11 +293,11 @@ def collect_conflicts_between_fragments(
     if not fragment1 or not fragment2:
         return None
 
-    field_map1, fragment_names1 = get_referenced_fields_and_fragment_names(
+    field_map1, referenced_fragment_names1 = get_referenced_fields_and_fragment_names(
         context, cached_fields_and_fragment_names, fragment1
     )
 
-    field_map2, fragment_names2 = get_referenced_fields_and_fragment_names(
+    field_map2, referenced_fragment_names2 = get_referenced_fields_and_fragment_names(
         context, cached_fields_and_fragment_names, fragment2
     )
 
@@ -315,27 +315,27 @@ def collect_conflicts_between_fragments(
 
     # (G) Then collect conflicts between the first fragment and any nested fragments
     # spread in the second fragment.
-    for nested_fragment_name2 in fragment_names2:
+    for referenced_fragment_name2 in referenced_fragment_names2:
         collect_conflicts_between_fragments(
             context,
             conflicts,
             cached_fields_and_fragment_names,
             compared_fragment_pairs,
             are_mutually_exclusive,
             fragment_name1,
-            nested_fragment_name2,
+            referenced_fragment_name2,
         )
 
     # (G) Then collect conflicts between the second fragment and any nested fragments
     # spread in the first fragment.
-    for nested_fragment_name1 in fragment_names1:
+    for referenced_fragment_name1 in referenced_fragment_names1:
         collect_conflicts_between_fragments(
             context,
             conflicts,
             cached_fields_and_fragment_names,
             compared_fragment_pairs,
             are_mutually_exclusive,
-            nested_fragment_name1,
+            referenced_fragment_name1,
             fragment_name2,
         )