Simplified fields implementation

Author: syrusakbary

graphql/type/definition.py

@@ -210,10 +210,6 @@ def define_field_map(type, field_map):
         'function which returns such a mapping.'
     ).format(type)
 
-    if not isinstance(field_map, collections.OrderedDict):
-        field_map = collections.OrderedDict(sorted(list(field_map.items())))
-
-    result_field_map = collections.OrderedDict()
     for field_name, field in field_map.items():
         assert_valid_name(field_name)
         field_args = getattr(field, 'args', None)
@@ -223,19 +219,11 @@ def define_field_map(type, field_map):
                 '{}.{} args must be a mapping (dict / OrderedDict) with argument names as keys.'.format(type,
                                                                                                         field_name)
             )
-            args = collections.OrderedDict()
-            if not isinstance(field_args, collections.OrderedDict):
-                field_args = collections.OrderedDict(sorted(list(field_args.items())))
 
             for arg_name, arg in field_args.items():
                 assert_valid_name(arg_name)
-                args[arg_name] = arg
-
-            field.args = args
 
-        result_field_map[field_name] = field
-
-    return result_field_map
+    return field_map
 
 
 def define_interfaces(type, interfaces):
@@ -574,15 +562,10 @@ def _define_field_map(self):
             'function which returns such a mapping.'
         ).format(self)
 
-        if not isinstance(fields, collections.OrderedDict):
-            fields = collections.OrderedDict(sorted(list(fields.items())))
-
-        field_map = collections.OrderedDict()
         for field_name, field in fields.items():
             assert_valid_name(field_name)
-            field_map[field_name] = field
 
-        return field_map
+        return fields
 
 
 class GraphQLInputObjectField(object):

graphql/type/introspection.py

@@ -2,8 +2,8 @@
 
 from ..language.printer import print_ast
 from ..utils.ast_from_value import ast_from_value
-from .definition import (GraphQLArgument, GraphQLArgument,
-                         GraphQLEnumType, GraphQLEnumValue, GraphQLField,
+from .definition import (GraphQLArgument, GraphQLEnumType,
+                         GraphQLEnumValue, GraphQLField,
                          GraphQLInputObjectType,
                          GraphQLInterfaceType, GraphQLList, GraphQLNonNull,
                          GraphQLObjectType, GraphQLScalarType,

graphql/type/tests/test_definition.py

@@ -307,25 +307,25 @@ def test_does_not_mutate_passed_field_definitions():
     }
 
 
-def test_sorts_fields_and_argument_keys_if_not_using_ordered_dict():
-    fields = {
-        'b': GraphQLField(GraphQLString),
-        'c': GraphQLField(GraphQLString),
-        'a': GraphQLField(GraphQLString),
-        'd': GraphQLField(GraphQLString, args={
-            'q': GraphQLArgument(GraphQLString),
-            'x': GraphQLArgument(GraphQLString),
-            'v': GraphQLArgument(GraphQLString),
-            'a': GraphQLArgument(GraphQLString),
-            'n': GraphQLArgument(GraphQLString)
-        })
-    }
-
-    test_object = GraphQLObjectType(name='Test', fields=fields)
-    ordered_fields = test_object.get_fields()
-    assert list(ordered_fields.keys()) == ['a', 'b', 'c', 'd']
-    field_with_args = test_object.get_fields().get('d')
-    assert list(field_with_args.args.keys()) == ['a', 'n', 'q', 'v', 'x']
+# def test_sorts_fields_and_argument_keys_if_not_using_ordered_dict():
+#     fields = {
+#         'b': GraphQLField(GraphQLString),
+#         'c': GraphQLField(GraphQLString),
+#         'a': GraphQLField(GraphQLString),
+#         'd': GraphQLField(GraphQLString, args={
+#             'q': GraphQLArgument(GraphQLString),
+#             'x': GraphQLArgument(GraphQLString),
+#             'v': GraphQLArgument(GraphQLString),
+#             'a': GraphQLArgument(GraphQLString),
+#             'n': GraphQLArgument(GraphQLString)
+#         })
+#     }
+
+#     test_object = GraphQLObjectType(name='Test', fields=fields)
+#     ordered_fields = test_object.get_fields()
+#     assert list(ordered_fields.keys()) == ['a', 'b', 'c', 'd']
+#     field_with_args = test_object.get_fields().get('d')
+#     assert list(field_with_args.args.keys()) == ['a', 'n', 'q', 'v', 'x']
 
 
 def test_does_not_sort_fields_and_argument_keys_when_using_ordered_dict():