diff options
| author | Tim Graham <timograham@gmail.com> | 2018-12-27 20:59:10 -0500 |
|---|---|---|
| committer | Tim Graham <timograham@gmail.com> | 2019-01-17 11:15:27 -0500 |
| commit | da1de1615c4d498d7de015dc0028ad4be220df15 (patch) | |
| tree | af53aab86e60675fb84ebd97fc2e4785fb5e1eb2 | |
| parent | 6079ed82f43d8cc4b2c07eb36bc14efa0a1a5c17 (diff) | |
Refs #28750 -- Removed suppport for model Meta.manager_inheritance_from_future.
| -rw-r--r-- | django/db/models/options.py | 2 | ||||
| -rw-r--r-- | tests/model_meta/test_manager_inheritance_from_future.py | 15 |
2 files changed, 0 insertions, 17 deletions
diff --git a/django/db/models/options.py b/django/db/models/options.py index 98bd2f0064..b8b48cddac 100644 --- a/django/db/models/options.py +++ b/django/db/models/options.py @@ -33,8 +33,6 @@ DEFAULT_NAMES = ( 'select_on_save', 'default_related_name', 'required_db_features', 'required_db_vendor', 'base_manager_name', 'default_manager_name', 'indexes', 'constraints', - # For backwards compatibility with Django 1.11. RemovedInDjango30Warning - 'manager_inheritance_from_future', ) diff --git a/tests/model_meta/test_manager_inheritance_from_future.py b/tests/model_meta/test_manager_inheritance_from_future.py deleted file mode 100644 index 2359489283..0000000000 --- a/tests/model_meta/test_manager_inheritance_from_future.py +++ /dev/null @@ -1,15 +0,0 @@ -from django.db import models -from django.test import SimpleTestCase -from django.test.utils import isolate_apps - - -@isolate_apps('model_meta') -class TestManagerInheritanceFromFuture(SimpleTestCase): - def test_defined(self): - """ - Meta.manager_inheritance_from_future can be defined for backwards - compatibility with Django 1.11. - """ - class FuturisticModel(models.Model): - class Meta: - manager_inheritance_from_future = True # No error raised. |