diff options
| -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. |