Fixed undefined imports

Author: syrusakbary

graphql/__init__.py

@@ -112,9 +112,6 @@
         # Un-modifiers
         get_nullable_type,
         get_named_type,
-
-        # Undefined const
-        Undefined
     )
 
     # Parse and operate on GraphQL language source files.
@@ -205,6 +202,9 @@
 
         # Asserts a string is a valid GraphQL name.
         assert_valid_name,
+
+        # Undefined const
+        Undefined,
     )
 
     __all__ = (

graphql/execution/executor.py

@@ -9,7 +9,8 @@
 from ..error import GraphQLError, GraphQLLocatedError
 from ..pyutils.default_ordered_dict import DefaultOrderedDict
 from ..pyutils.ordereddict import OrderedDict
-from ..type import (Undefined, GraphQLEnumType, GraphQLInterfaceType, GraphQLList,
+from ..utils.undefined import Undefined
+from ..type import (GraphQLEnumType, GraphQLInterfaceType, GraphQLList,
                     GraphQLNonNull, GraphQLObjectType, GraphQLScalarType,
                     GraphQLSchema, GraphQLUnionType)
 from .base import (ExecutionContext, ExecutionResult, ResolveInfo,

graphql/execution/experimental/fragment.py

@@ -4,7 +4,8 @@
 
 from ...pyutils.cached_property import cached_property
 from ...pyutils.default_ordered_dict import DefaultOrderedDict
-from ...type import (Undefined, GraphQLInterfaceType, GraphQLList, GraphQLNonNull,
+from ...utils.undefined import Undefined
+from ...type import (GraphQLInterfaceType, GraphQLList, GraphQLNonNull,
                      GraphQLObjectType, GraphQLUnionType)
 from ..base import ResolveInfo, collect_fields, get_field_def
 from ..values import get_argument_values

graphql/execution/values.py

@@ -6,11 +6,12 @@
 from ..error import GraphQLError
 from ..language import ast
 from ..language.printer import print_ast
-from ..type import (Undefined, GraphQLEnumType, GraphQLInputObjectType, GraphQLList,
+from ..type import (GraphQLEnumType, GraphQLInputObjectType, GraphQLList,
                     GraphQLNonNull, GraphQLScalarType, is_input_type)
 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']
 

graphql/type/__init__.py

@@ -19,8 +19,7 @@
     is_leaf_type,
     is_type,
     get_nullable_type,
-    is_output_type,
-    Undefined
+    is_output_type
 )
 from .directives import (
     # "Enum" of Directive locations

graphql/type/definition.py

@@ -5,7 +5,6 @@
 from ..pyutils.cached_property import cached_property
 from ..pyutils.ordereddict import OrderedDict
 from ..utils.assert_valid_name import assert_valid_name
-from ..utils.undefined import Undefined
 
 
 def is_type(type):

graphql/utils/base.py

@@ -53,6 +53,10 @@
 # Asserts that a string is a valid GraphQL name
 from .assert_valid_name import assert_valid_name
 
+# Undefined const
+from .undefined import Undefined
+
+
 __all__ = [
     'introspection_query',
     'get_operation_ast',
@@ -72,4 +76,5 @@
     'is_equal_type',
     'is_type_sub_type_of',
     'assert_valid_name',
+    'Undefined',
 ]

graphql/utils/schema_printer.py

@@ -1,5 +1,5 @@
 from ..language.printer import print_ast
-from ..type.definition import (Undefined, GraphQLEnumType, GraphQLInputObjectType,
+from ..type.definition import (GraphQLEnumType, GraphQLInputObjectType,
                                GraphQLInterfaceType, GraphQLObjectType,
                                GraphQLScalarType, GraphQLUnionType)
 from ..type.directives import DEFAULT_DEPRECATION_REASON
@@ -153,7 +153,7 @@ def _print_args(field_or_directives):
 
 
 def _print_input_value(name, arg):
-    if arg.default_value not in (Undefined, None):
+    if arg.default_value is not None:
         default_value = ' = ' + print_ast(ast_from_value(arg.default_value, arg.type))
     else:
         default_value = ''

graphql/utils/value_from_ast.py

@@ -1,6 +1,7 @@
 from ..language import ast
-from ..type import (Undefined, GraphQLEnumType, GraphQLInputObjectType, GraphQLList,
+from ..type import (GraphQLEnumType, GraphQLInputObjectType, GraphQLList,
                     GraphQLNonNull, GraphQLScalarType)
+from .undefined import Undefined
 
 
 def value_from_ast(value_ast, type, variables=None):