summaryrefslogtreecommitdiff
path: root/tests/model_meta/tests.py
diff options
context:
space:
mode:
authorClaude Paroz <claude@2xlibre.net>2016-03-10 18:21:25 +0100
committerClaude Paroz <claude@2xlibre.net>2016-03-19 09:24:27 +0100
commit983c158da7723eb00a376bd31db76709da4d0260 (patch)
treed5784910f91a4e8a5ee31bd376796c70b6463e37 /tests/model_meta/tests.py
parent2b3a9414570af623853ca0f819c7d77d0511f22c (diff)
Refs #24227 -- Replaced M2M isinstance checks by field.many_to_many
Thanks Markus Holtermann, Collin Anderson and Tim Graham for the reviews.
Diffstat (limited to 'tests/model_meta/tests.py')
-rw-r--r--tests/model_meta/tests.py5
1 files changed, 2 insertions, 3 deletions
diff --git a/tests/model_meta/tests.py b/tests/model_meta/tests.py
index cfae4736fa..d662c8257c 100644
--- a/tests/model_meta/tests.py
+++ b/tests/model_meta/tests.py
@@ -33,8 +33,7 @@ class OptionsBaseTests(SimpleTestCase):
model = None
field = relation if direct else relation.field
- m2m = isinstance(field, related.ManyToManyField)
- return relation, model, direct, m2m
+ return relation, model, direct, bool(field.many_to_many) # many_to_many can be None
class GetFieldsTests(OptionsBaseTests):
@@ -69,7 +68,7 @@ class DataTests(OptionsBaseTests):
def test_local_fields(self):
def is_data_field(f):
- return isinstance(f, Field) and not isinstance(f, related.ManyToManyField)
+ return isinstance(f, Field) and not f.many_to_many
for model, expected_result in TEST_RESULTS['local_fields'].items():
fields = model._meta.local_fields