p31829507
/
django
mirror of https://github.com/django/django.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Simplified model's Options._get_fields() a bit.

This commit is contained in:
Sergey Fedoseev 2017-08-31 16:11:30 +05:00 committed by Tim Graham
parent 20a761697f
commit ab3e3658cc
1 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
django/db/models/options.py
View File

@ -4,7 +4,6 @@ import warnings
from bisect import bisect
from collections import OrderedDict, defaultdict
from contextlib import suppress
from itertools import chain
from django.apps import apps
from django.conf import settings
@ -786,18 +785,15 @@ class Options:
fields.append(field.remote_field)
if forward:
fields.extend(
field for field in chain(self.local_fields, self.local_many_to_many)
)
fields += self.local_fields
fields += self.local_many_to_many
# Private fields are recopied to each child model, and they get a
# different model as field.model in each child. Hence we have to
# add the private fields separately from the topmost call. If we
# did this recursively similar to local_fields, we would get field
# instances with field.model != self.model.
if topmost_call:
fields.extend(
f for f in self.private_fields
)
fields += self.private_fields
# In order to avoid list manipulation. Always
# return a shallow copy of the results