Removed unnecessary undefined vars

Author: syrusakbary

graphql/execution/values.py

@@ -11,7 +11,6 @@
 from ..utils.is_valid_value import is_valid_value
 from ..utils.type_from_ast import type_from_ast
 from ..utils.value_from_ast import value_from_ast
-from ..utils.undefined import Undefined
 
 __all__ = ['get_variable_values', 'get_argument_values']
 
@@ -92,7 +91,7 @@ def get_argument_values(arg_defs, arg_asts, variables=None):
                 ), arg_asts)
         elif isinstance(value_ast.value, ast.Variable):
             variable_name = value_ast.value.name.value
-            variable_value = variables.get(variable_name, Undefined)
+            variable_value = variables.get(variable_name)
             if variables and variable_name in variables:
                 result[arg_def.out_name or name] = variable_value
             elif arg_def.default_value is not None:
@@ -113,7 +112,7 @@ def get_argument_values(arg_defs, arg_asts, variables=None):
                 arg_type,
                 variables
             )
-            if value is Undefined:
+            if value is None:
                 if arg_def.default_value is not None:
                     value = arg_def.default_value
                     result[arg_def.out_name or name] = value
@@ -133,9 +132,6 @@ def coerce_value(type, value):
         # We only call this function after calling isValidValue.
         return coerce_value(type.of_type, value)
 
-    if value is Undefined:
-        return Undefined
-
     if value is None:
         return None
 
@@ -163,8 +159,4 @@ def coerce_value(type, value):
     assert isinstance(type, (GraphQLScalarType, GraphQLEnumType)), \
         'Must be input type'
 
-    parsed = type.parse_value(value)
-    if parsed is None:
-        return Undefined
-
-    return parsed
+    return type.parse_value(value)

graphql/utils/value_from_ast.py

@@ -1,7 +1,6 @@
 from ..language import ast
 from ..type import (GraphQLEnumType, GraphQLInputObjectType, GraphQLList,
                     GraphQLNonNull, GraphQLScalarType)
-from .undefined import Undefined
 
 
 def value_from_ast(value_ast, type, variables=None):
@@ -12,20 +11,17 @@ def value_from_ast(value_ast, type, variables=None):
         # We're assuming that this query has been validated and the value used here is of the correct type.
         return value_from_ast(value_ast, type.of_type, variables)
 
-    if value_ast is Undefined:
-        return Undefined
-
     if value_ast is None:
         return None
 
     if isinstance(value_ast, ast.Variable):
         variable_name = value_ast.name.value
-        if not variables:
-            return Undefined
+        if not variables or variable_name not in variables:
+            return None
 
         # Note: we're not doing any checking that this variable is correct. We're assuming that this query
         # has been validated and the variable usage here is of the correct type.
-        return variables.get(variable_name, Undefined)
+        return variables.get(variable_name)
 
     if isinstance(type, GraphQLList):
         item_type = type.of_type
@@ -39,7 +35,7 @@ def value_from_ast(value_ast, type, variables=None):
     if isinstance(type, GraphQLInputObjectType):
         fields = type.fields
         if not isinstance(value_ast, ast.ObjectValue):
-            return Undefined
+            return None
 
         field_asts = {}
 
@@ -48,30 +44,27 @@ def value_from_ast(value_ast, type, variables=None):
 
         obj = {}
         for field_name, field in fields.items():
-            field_ast = field_asts.get(field_name, Undefined)
-            field_value_ast = Undefined
+            if field_name not in field_asts:
+                if field.default_value is not None:
+                    # We use out_name as the output name for the
+                    # dict if exists
+                    obj[field.out_name or field_name] = field.default_value
 
-            if field_ast:
-                field_value_ast = field_ast.value
+                continue
 
+            field_ast = field_asts.get(field_name)
+            field_value_ast = field_ast.value
             field_value = value_from_ast(
                 field_value_ast, field.type, variables
             )
-            if field_value is Undefined and field.default_value is not None:
-                field_value = field.default_value
 
-            if field_value is not Undefined:
-                # We use out_name as the output name for the
-                # dict if exists
-                obj[field.out_name or field_name] = field_value
+            # We use out_name as the output name for the
+            # dict if exists
+            obj[field.out_name or field_name] = field_value
 
         return type.create_container(obj)
 
     assert isinstance(type, (GraphQLScalarType, GraphQLEnumType)), \
         'Must be input type'
 
-    value = type.parse_literal(value_ast)
-    if value is None:
-        return Undefined
-
-    return value
+    return type.parse_literal(value_ast)