Commit b4ac2329 authored by Claude Paroz's avatar Claude Paroz Committed by Markus Holtermann
Browse files

Fixed #24099 -- Removed contenttype.name deprecated field 

This finsishes the work started on #16803.
Thanks Simon Charette, Tim Graham and Collin Anderson for the
reviews.
parent 374c2419

django/contrib/admin/templates/admin/index.html

+1 −1
Original line number Diff line number Diff line
@@ -69,7 +69,7 @@ 
                {% endif %}

                <br/>

                {% if entry.content_type %}

                    <span class="mini quiet">{% filter capfirst %}{% trans entry.content_type.name %}{% endfilter %}</span>

                    <span class="mini quiet">{% filter capfirst %}{{ entry.content_type }}{% endfilter %}</span>

                {% else %}

                    <span class="mini quiet">{% trans 'Unknown content' %}</span>

                {% endif %}

django/contrib/auth/management/__init__.py

+3 −2
Original line number Diff line number Diff line
@@ -110,8 +110,9 @@ def create_permissions(app_config, verbosity=2, interactive=True, using=DEFAULT_ 
    for perm in perms:

        if len(perm.name) > permission_name_max_length:

            raise exceptions.ValidationError(

                "The verbose_name of %s is longer than %s characters" % (

                    perm.content_type,

                "The verbose_name of %s.%s is longer than %s characters" % (

                    perm.content_type.app_label,

                    perm.content_type.model,

                    verbose_name_max_length,

                )

            )

django/contrib/auth/tests/test_management.py

+1 −1
Original line number Diff line number Diff line
@@ -568,7 +568,7 @@ class PermissionTestCase(TestCase): 
        models.Permission._meta.verbose_name = "some ridiculously long verbose name that is out of control" * 5



        six.assertRaisesRegex(self, exceptions.ValidationError,

            "The verbose_name of permission is longer than 244 characters",

            "The verbose_name of auth.permission is longer than 244 characters",

            create_permissions, auth_app_config, verbosity=0)

django/contrib/auth/tests/test_models.py

+0 −4
Original line number Diff line number Diff line
@@ -52,24 +52,20 @@ class LoadDataWithNaturalKeysAndMultipleDatabasesTestCase(TestCase): 
        default_objects = [

            ContentType.objects.db_manager('default').create(

                model='examplemodela',

                name='example model a',

                app_label='app_a',

            ),

            ContentType.objects.db_manager('default').create(

                model='examplemodelb',

                name='example model b',

                app_label='app_b',

            ),

        ]

        other_objects = [

            ContentType.objects.db_manager('other').create(

                model='examplemodelb',

                name='example model b',

                app_label='app_b',

            ),

            ContentType.objects.db_manager('other').create(

                model='examplemodela',

                name='example model a',

                app_label='app_a',

            ),

        ]

django/contrib/contenttypes/management.py

+0 −2
Original line number Diff line number Diff line 
from django.apps import apps

from django.db import DEFAULT_DB_ALIAS, router

from django.db.migrations.loader import is_latest_migration_applied

from django.utils.encoding import smart_text

from django.utils import six

from django.utils.six.moves import input
@@ -50,7 +49,6 @@ def update_contenttypes(app_config, verbosity=2, interactive=True, using=DEFAULT 


    cts = [

        ContentType(

            name=smart_text(model._meta.verbose_name_raw),

            app_label=app_label,

            model=model_name,

        )