diff options
| author | Loic Bistuer <loic.bistuer@gmail.com> | 2015-02-16 16:03:34 +0700 |
|---|---|---|
| committer | Loic Bistuer <loic.bistuer@gmail.com> | 2015-02-16 20:40:04 +0700 |
| commit | c5a77721e2fccff427374cd987a6d8b92a37f37c (patch) | |
| tree | 980bde583933cd7e5e1043d70f004bcc1e4388fb /tests | |
| parent | d652906aebd34d9ba943507ce0c3a7be169fab7c (diff) | |
Merged ManyRelatedObjectsDescriptor and ReverseManyRelatedObjectsDescriptor
and made all "many" related objects descriptors inherit from
ForeignRelatedObjectsDescriptor.
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/many_to_many/tests.py | 2 | ||||
| -rw-r--r-- | tests/schema/fields.py | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/tests/many_to_many/tests.py b/tests/many_to_many/tests.py index 192bc5f0e8..387acb2580 100644 --- a/tests/many_to_many/tests.py +++ b/tests/many_to_many/tests.py @@ -424,7 +424,7 @@ class ManyToManyTests(TestCase): def test_reverse_assign_with_queryset(self): # Ensure that querysets used in M2M assignments are pre-evaluated # so their value isn't affected by the clearing operation in - # ReverseManyRelatedObjectsDescriptor.__set__. Refs #19816. + # ManyRelatedObjectsDescriptor.__set__. Refs #19816. self.p1.article_set = [self.a1, self.a2] qs = self.p1.article_set.filter(headline='Django lets you build Web apps easily') diff --git a/tests/schema/fields.py b/tests/schema/fields.py index 4cba35ebf8..1436b971b7 100644 --- a/tests/schema/fields.py +++ b/tests/schema/fields.py @@ -1,6 +1,6 @@ from django.db.models.fields.related import ( - RECURSIVE_RELATIONSHIP_CONSTANT, ManyToManyField, ManyToManyRel, - RelatedField, ReverseManyRelatedObjectsDescriptor, + RECURSIVE_RELATIONSHIP_CONSTANT, ManyRelatedObjectsDescriptor, + ManyToManyField, ManyToManyRel, RelatedField, create_many_to_many_intermediary_model, ) from django.utils.functional import curry @@ -40,7 +40,7 @@ class CustomManyToManyField(RelatedField): super(CustomManyToManyField, self).contribute_to_class(cls, name, **kwargs) if not self.rel.through and not cls._meta.abstract and not cls._meta.swapped: self.rel.through = create_many_to_many_intermediary_model(self, cls) - setattr(cls, self.name, ReverseManyRelatedObjectsDescriptor(self)) + setattr(cls, self.name, ManyRelatedObjectsDescriptor(self.rel)) self.m2m_db_table = curry(self._get_m2m_db_table, cls._meta) def get_internal_type(self): |