Reorganize for clarity

Author: Jacob Foster

graphene_django/utils.py

@@ -21,8 +21,12 @@ class LazyList(object):
     DJANGO_FILTER_INSTALLED = False
 
 
-def get_reverse_fields(model):
+def get_reverse_fields(model, local_field_names):
     for name, attr in model.__dict__.items():
+        # Don't duplicate any local fields
+        if name in local_field_names:
+            continue
+
         # Django =>1.9 uses 'rel', django <1.9 uses 'related'
         related = getattr(attr, 'rel', None) or \
             getattr(attr, 'related', None)
@@ -44,22 +48,18 @@ def maybe_queryset(value):
 
 
 def get_model_fields(model):
-    reverse_fields = get_reverse_fields(model)
-    all_fields = [
+    local_fields = [
         (field.name, field)
         for field
         in sorted(list(model._meta.fields) +
                   list(model._meta.local_many_to_many))
     ]
 
     # Make sure we don't duplicate local fields with "reverse" version
-    all_field_names = [field[0] for field in all_fields]
-    actual_reverse_fields = [
-        reverse_field for reverse_field in reverse_fields
-        if reverse_field[0] not in all_field_names
-    ]
+    local_field_names = [field[0] for field in local_fields]
+    reverse_fields = get_reverse_fields(model, local_field_names)
 
-    all_fields += list(actual_reverse_fields)
+    all_fields = local_fields + list(reverse_fields)
 
     return all_fields