mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2024-12-22 17:16:24 +00:00
Code Issues 25 Releases Wiki Activity

Fixed #28750 -- Allowed models to define Meta.manager_inheritance_from_future for backwards compatibility.

Browse Source 
Refs 631f4ab061.
This commit is contained in:
Charlie Denton 2017-10-31 17:22:27 +00:00 committed by Tim Graham
parent acc989f037
commit cbe334918a
2 changed files with 17 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
django/db/models/options.py
View File

@ -33,6 +33,8 @@ DEFAULT_NAMES = (
'select_on_save', 'default_related_name', 'required_db_features',
'required_db_vendor', 'base_manager_name', 'default_manager_name',
'indexes',
# For backwards compatibility with Django 1.11. RemovedInDjango30Warning
'manager_inheritance_from_future',
)

15
tests/model_meta/test_manager_inheritance_from_future.py Normal file
View File

@ -0,0 +1,15 @@
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.