diff options
| author | Simon Charette <charette.s@gmail.com> | 2024-08-09 13:49:59 -0400 |
|---|---|---|
| committer | nessita <124304+nessita@users.noreply.github.com> | 2024-08-28 11:44:05 -0300 |
| commit | 8ee17037ae706178040a7fc821789e4358ea9287 (patch) | |
| tree | 5d45f7eb03f6c3eea3c2c3f371a801518e7499cb | |
| parent | 5e81a4e7900f105971f332efd1702b5dd7f628ac (diff) | |
Refs #16055 -- Adjusted deprecation warning stacklevel in get_joining_columns()/get_reverse_joining_columns().
| -rw-r--r-- | django/db/models/fields/related.py | 2 | ||||
| -rw-r--r-- | django/db/models/fields/reverse_related.py | 1 | ||||
| -rw-r--r-- | tests/foreign_object/tests.py | 9 |
3 files changed, 9 insertions, 3 deletions
diff --git a/django/db/models/fields/related.py b/django/db/models/fields/related.py index 6737570074..5c1c8faf97 100644 --- a/django/db/models/fields/related.py +++ b/django/db/models/fields/related.py @@ -781,6 +781,7 @@ class ForeignObject(RelatedField): "ForeignObject.get_joining_columns() is deprecated. Use " "get_joining_fields() instead.", RemovedInDjango60Warning, + stacklevel=2, ) source = self.reverse_related_fields if reverse_join else self.related_fields return tuple( @@ -792,6 +793,7 @@ class ForeignObject(RelatedField): "ForeignObject.get_reverse_joining_columns() is deprecated. Use " "get_reverse_joining_fields() instead.", RemovedInDjango60Warning, + stacklevel=2, ) return self.get_joining_columns(reverse_join=True) diff --git a/django/db/models/fields/reverse_related.py b/django/db/models/fields/reverse_related.py index a39bfd07da..85378431a7 100644 --- a/django/db/models/fields/reverse_related.py +++ b/django/db/models/fields/reverse_related.py @@ -197,6 +197,7 @@ class ForeignObjectRel(FieldCacheMixin): "ForeignObjectRel.get_joining_columns() is deprecated. Use " "get_joining_fields() instead.", RemovedInDjango60Warning, + stacklevel=2, ) return self.field.get_reverse_joining_columns() diff --git a/tests/foreign_object/tests.py b/tests/foreign_object/tests.py index 2d3aa800f7..89ed85b658 100644 --- a/tests/foreign_object/tests.py +++ b/tests/foreign_object/tests.py @@ -703,24 +703,27 @@ class GetJoiningDeprecationTests(TestCase): "ForeignObject.get_joining_columns() is deprecated. Use " "get_joining_fields() instead." ) - with self.assertWarnsMessage(RemovedInDjango60Warning, msg): + with self.assertWarnsMessage(RemovedInDjango60Warning, msg) as ctx: Membership.person.field.get_joining_columns() + self.assertEqual(ctx.filename, __file__) def test_foreign_object_get_reverse_joining_columns_warning(self): msg = ( "ForeignObject.get_reverse_joining_columns() is deprecated. Use " "get_reverse_joining_fields() instead." ) - with self.assertWarnsMessage(RemovedInDjango60Warning, msg): + with self.assertWarnsMessage(RemovedInDjango60Warning, msg) as ctx: Membership.person.field.get_reverse_joining_columns() + self.assertEqual(ctx.filename, __file__) def test_foreign_object_rel_get_joining_columns_warning(self): msg = ( "ForeignObjectRel.get_joining_columns() is deprecated. Use " "get_joining_fields() instead." ) - with self.assertWarnsMessage(RemovedInDjango60Warning, msg): + with self.assertWarnsMessage(RemovedInDjango60Warning, msg) as ctx: Membership.person.field.remote_field.get_joining_columns() + self.assertEqual(ctx.filename, __file__) def test_join_get_joining_columns_warning(self): class CustomForeignKey(models.ForeignKey): |