Edited stuff from [17543] to [17629]

git-svn-id: http://code.djangoproject.com/svn/django/trunk@17630 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Adrian Holovaty 2012-03-02 17:16:52 +00:00
parent 3ed0b6ed64
commit 2ade1e916f
16 changed files with 100 additions and 101 deletions

View file

@ -40,15 +40,15 @@ class Options(object):
self.abstract = False
self.managed = True
self.proxy = False
# For any class which is a proxy (including automatically created
# classes for deferred object loading) the proxy_for_model tells
# For any class that is a proxy (including automatically created
# classes for deferred object loading), proxy_for_model tells us
# which class this model is proxying. Note that proxy_for_model
# can create a chain of proxy models. For non-proxy models the
# can create a chain of proxy models. For non-proxy models, the
# variable is always None.
self.proxy_for_model = None
# For any non-abstract class the concrete class is the model
# For any non-abstract class, the concrete class is the model
# in the end of the proxy_for_model chain. In particular, for
# concrete models the concrete_model is always the class itself.
# concrete models, the concrete_model is always the class itself.
self.concrete_model = None
self.parents = SortedDict()
self.duplicate_targets = {}