Rename type to runtime_type in collect_fields function.

Author: jhgg

graphql/core/execution/base.py

@@ -148,7 +148,15 @@ def get_operation_root_type(schema, operation):
     )
 
 
-def collect_fields(ctx, type, selection_set, fields, prev_fragment_names):
+def collect_fields(ctx, runtime_type, selection_set, fields, prev_fragment_names):
+    """
+    Given a selectionSet, adds all of the fields in that selection to
+    the passed in map of fields, and returns it at the end.
+
+    collect_fields requires the "runtime type" of an object. For a field which
+    returns and Interface or Union type, the "runtime type" will be the actual
+    Object type returned by that field.
+    """
     for selection in selection_set.selections:
         directives = selection.directives
 
@@ -160,10 +168,10 @@ def collect_fields(ctx, type, selection_set, fields, prev_fragment_names):
             fields[name].append(selection)
 
         elif isinstance(selection, ast.InlineFragment):
-            if not should_include_node(ctx, directives) or not does_fragment_condition_match(ctx, selection, type):
+            if not should_include_node(ctx, directives) or not does_fragment_condition_match(ctx, selection, runtime_type):
                 continue
 
-            collect_fields(ctx, type, selection.selection_set, fields, prev_fragment_names)
+            collect_fields(ctx, runtime_type, selection.selection_set, fields, prev_fragment_names)
 
         elif isinstance(selection, ast.FragmentSpread):
             frag_name = selection.name.value
@@ -176,10 +184,10 @@ def collect_fields(ctx, type, selection_set, fields, prev_fragment_names):
             frag_directives = fragment.directives
             if not fragment or not \
                     should_include_node(ctx, frag_directives) or not \
-                    does_fragment_condition_match(ctx, fragment, type):
+                    does_fragment_condition_match(ctx, fragment, runtime_type):
                 continue
 
-            collect_fields(ctx, type, fragment.selection_set, fields, prev_fragment_names)
+            collect_fields(ctx, runtime_type, fragment.selection_set, fields, prev_fragment_names)
 
     return fields
 

graphql/core/execution/executor.py

@@ -302,7 +302,8 @@ def complete_value(self, ctx, return_type, field_asts, info, result):
             if selection_set:
                 subfield_asts = collect_fields(
                     ctx, runtime_type, selection_set,
-                    subfield_asts, visited_fragment_names)
+                    subfield_asts, visited_fragment_names
+                )
 
         return self._execute_fields(ctx, runtime_type, result, subfield_asts)