Fixed #21188 -- Introduced subclasses for to-be-removed-in-django-XX warnings (210d0489) · Commits · Dom Sekotill / django

django/apps/registry.py

+10 −9

Original line number	Diff line number	Diff line
		@@ -6,6 +6,7 @@ import warnings

		from django.core.exceptions import ImproperlyConfigured
		from django.utils import lru_cache
		from django.utils.deprecation import RemovedInDjango19Warning
		from django.utils._os import upath

		from .config import AppConfig
		@@ -156,7 +157,7 @@ class Apps(object):
		if app_mod:
		warnings.warn(
		"The app_mod argument of get_models is deprecated.",
		PendingDeprecationWarning, stacklevel=2)
		RemovedInDjango19Warning, stacklevel=2)
		app_label = app_mod.__name__.split('.')[-2]
		try:
		return list(self.get_app_config(app_label).get_models(
		@@ -328,7 +329,7 @@ class Apps(object):
		"""
		warnings.warn(
		"load_app(app_name) is deprecated.",
		PendingDeprecationWarning, stacklevel=2)
		RemovedInDjango19Warning, stacklevel=2)
		app_config = AppConfig.create(app_name)
		app_config.import_models(self.all_models[app_config.label])
		self.app_configs[app_config.label] = app_config
		@@ -338,7 +339,7 @@ class Apps(object):
		def app_cache_ready(self):
		warnings.warn(
		"app_cache_ready() is deprecated in favor of the ready property.",
		PendingDeprecationWarning, stacklevel=2)
		RemovedInDjango19Warning, stacklevel=2)
		return self.ready

		def get_app(self, app_label):
		@@ -347,7 +348,7 @@ class Apps(object):
		"""
		warnings.warn(
		"get_app_config(app_label).models_module supersedes get_app(app_label).",
		PendingDeprecationWarning, stacklevel=2)
		RemovedInDjango19Warning, stacklevel=2)
		try:
		models_module = self.get_app_config(app_label).models_module
		except LookupError as exc:
		@@ -364,7 +365,7 @@ class Apps(object):
		"""
		warnings.warn(
		"[a.models_module for a in get_app_configs()] supersedes get_apps().",
		PendingDeprecationWarning, stacklevel=2)
		RemovedInDjango19Warning, stacklevel=2)
		app_configs = self.get_app_configs()
		return [app_config.models_module for app_config in app_configs
		if app_config.models_module is not None]
		@@ -375,7 +376,7 @@ class Apps(object):
		def get_app_package(self, app_label):
		warnings.warn(
		"get_app_config(label).name supersedes get_app_package(label).",
		PendingDeprecationWarning, stacklevel=2)
		RemovedInDjango19Warning, stacklevel=2)
		return self._get_app_package(self.get_app(app_label))

		def _get_app_path(self, app):
		@@ -388,7 +389,7 @@ class Apps(object):
		def get_app_path(self, app_label):
		warnings.warn(
		"get_app_config(label).path supersedes get_app_path(label).",
		PendingDeprecationWarning, stacklevel=2)
		RemovedInDjango19Warning, stacklevel=2)
		return self._get_app_path(self.get_app(app_label))

		def get_app_paths(self):
		@@ -400,7 +401,7 @@ class Apps(object):
		"""
		warnings.warn(
		"[a.path for a in get_app_configs()] supersedes get_app_paths().",
		PendingDeprecationWarning, stacklevel=2)
		RemovedInDjango19Warning, stacklevel=2)
		self.check_ready()
		app_paths = []
		for app in self.get_apps():
		@@ -413,7 +414,7 @@ class Apps(object):
		"""
		warnings.warn(
		"register_models(app_label, *models) is deprecated.",
		PendingDeprecationWarning, stacklevel=2)
		RemovedInDjango19Warning, stacklevel=2)
		for model in models:
		self.register_model(app_label, model)

django/conf/urls/shortcut.py

+2 −1

Original line number	Diff line number	Diff line
		import warnings

		from django.conf.urls import patterns
		from django.utils.deprecation import RemovedInDjango18Warning

		warnings.warn("django.conf.urls.shortcut will be removed in Django 1.8.",
		DeprecationWarning)
		RemovedInDjango18Warning)

		urlpatterns = patterns('django.views',
		(r'^(?P<content_type_id>\d+)/(?P<object_id>.*)/$', 'defaults.shortcut'),

django/contrib/admin/options.py

+14 −13

Original line number	Diff line number	Diff line
		@@ -18,7 +18,8 @@ from django.contrib.admin.templatetags.admin_static import static
		from django.contrib.admin.templatetags.admin_urls import add_preserved_filters
		from django.contrib.auth import get_permission_codename
		from django.core import checks
		from django.core.exceptions import PermissionDenied, ValidationError, FieldError, ImproperlyConfigured
		from django.core.exceptions import (PermissionDenied, ValidationError,
		FieldError, ImproperlyConfigured)
		from django.core.paginator import Paginator
		from django.core.urlresolvers import reverse
		from django.db import models, transaction, router
		@@ -35,9 +36,9 @@ from django.shortcuts import get_object_or_404
		from django.template.response import SimpleTemplateResponse, TemplateResponse
		from django.utils import six
		from django.utils.decorators import method_decorator
		from django.utils.deprecation import RenameMethodsBase
		from django.utils.encoding import force_text
		from django.utils.encoding import python_2_unicode_compatible
		from django.utils.deprecation import (RenameMethodsBase,
		RemovedInDjango18Warning, RemovedInDjango19Warning)
		from django.utils.encoding import force_text, python_2_unicode_compatible
		from django.utils.html import escape, escapejs
		from django.utils.http import urlencode
		from django.utils.text import capfirst, get_text_list
		@@ -93,7 +94,7 @@ csrf_protect_m = method_decorator(csrf_protect)

		class RenameBaseModelAdminMethods(forms.MediaDefiningClass, RenameMethodsBase):
		renamed_methods = (
		('queryset', 'get_queryset', DeprecationWarning),
		('queryset', 'get_queryset', RemovedInDjango18Warning),
		)


		@@ -125,7 +126,7 @@ class BaseModelAdmin(six.with_metaclass(RenameBaseModelAdminMethods)):
		def validate(cls, model):
		warnings.warn(
		'ModelAdmin.validate() is deprecated. Use "check()" instead.',
		PendingDeprecationWarning)
		RemovedInDjango19Warning)
		if cls.validator_class:
		validator = cls.validator_class()
		else:
		@@ -139,7 +140,7 @@ class BaseModelAdmin(six.with_metaclass(RenameBaseModelAdminMethods)):
		'ModelAdmin.validator_class is deprecated. '
		'ModeAdmin validators must be converted to use '
		'the system check framework.',
		PendingDeprecationWarning)
		RemovedInDjango19Warning)
		validator = cls.validator_class()
		try:
		validator.validate(cls, model)
		@@ -306,7 +307,7 @@ class BaseModelAdmin(six.with_metaclass(RenameBaseModelAdminMethods)):
		warnings.warn(
		"ModelAdmin.declared_fieldsets is deprecated and "
		"will be removed in Django 1.9.",
		PendingDeprecationWarning, stacklevel=2
		RemovedInDjango19Warning, stacklevel=2
		)

		if self.fieldsets:
		@@ -332,11 +333,11 @@ class BaseModelAdmin(six.with_metaclass(RenameBaseModelAdminMethods)):
		with warnings.catch_warnings(record=True) as w:
		warnings.simplefilter("always")
		declared_fieldsets = self.declared_fieldsets
		if len(w) != 1 or not issubclass(w[0].category, PendingDeprecationWarning):
		if len(w) != 1 or not issubclass(w[0].category, RemovedInDjango19Warning):
		warnings.warn(
		"ModelAdmin.declared_fieldsets is deprecated and "
		"will be removed in Django 1.9.",
		PendingDeprecationWarning
		RemovedInDjango19Warning
		)
		if declared_fieldsets:
		return declared_fieldsets
		@@ -695,7 +696,7 @@ class ModelAdmin(BaseModelAdmin):
		warnings.warn(
		"ModelAdmin.get_formsets() is deprecated and will be removed in "
		"Django 1.9. Use ModelAdmin.get_formsets_with_inlines() instead.",
		PendingDeprecationWarning, stacklevel=2
		RemovedInDjango19Warning, stacklevel=2
		)
		return self._get_formsets(request, obj)

		@@ -711,11 +712,11 @@ class ModelAdmin(BaseModelAdmin):
		warnings.simplefilter("always")
		formsets = self.get_formsets(request, obj)

		if len(w) != 1 or not issubclass(w[0].category, PendingDeprecationWarning):
		if len(w) != 1 or not issubclass(w[0].category, RemovedInDjango19Warning):
		warnings.warn(
		"ModelAdmin.get_formsets() is deprecated and will be removed in "
		"Django 1.9. Use ModelAdmin.get_formsets_with_inlines() instead.",
		PendingDeprecationWarning
		RemovedInDjango19Warning
		)
		if formsets:
		zipped = zip(formsets, self.get_inline_instances(request, None))

django/contrib/admin/util.py

+3 −1

Original line number	Diff line number	Diff line
		import warnings

		from django.utils.deprecation import RemovedInDjango19Warning

		warnings.warn(
		"The django.contrib.admin.util module has been renamed. "
		"Use django.contrib.admin.utils instead.", PendingDeprecationWarning)
		"Use django.contrib.admin.utils instead.", RemovedInDjango19Warning)

		from django.contrib.admin.utils import * # NOQA

django/contrib/admin/views/main.py

+5 −5

Original line number	Diff line number	Diff line
		@@ -8,7 +8,7 @@ from django.core.urlresolvers import reverse
		from django.db import models
		from django.db.models.fields import FieldDoesNotExist
		from django.utils import six
		from django.utils.deprecation import RenameMethodsBase
		from django.utils.deprecation import RenameMethodsBase, RemovedInDjango18Warning
		from django.utils.encoding import force_text
		from django.utils.translation import ugettext, ugettext_lazy
		from django.utils.http import urlencode
		@@ -51,7 +51,7 @@ def _is_changelist_popup(request):
		warnings.warn(
		"The `%s` GET parameter has been renamed to `%s`." %
		(IS_LEGACY_POPUP_VAR, IS_POPUP_VAR),
		DeprecationWarning, 2)
		RemovedInDjango18Warning, 2)
		return True

		return False
		@@ -59,7 +59,7 @@ def _is_changelist_popup(request):

		class RenameChangeListMethods(RenameMethodsBase):
		renamed_methods = (
		('get_query_set', 'get_queryset', DeprecationWarning),
		('get_query_set', 'get_queryset', RemovedInDjango18Warning),
		)


		@@ -114,14 +114,14 @@ class ChangeList(six.with_metaclass(RenameChangeListMethods)):
		def root_query_set(self):
		warnings.warn("`ChangeList.root_query_set` is deprecated, "
		"use `root_queryset` instead.",
		DeprecationWarning, 2)
		RemovedInDjango18Warning, 2)
		return self.root_queryset

		@property
		def query_set(self):
		warnings.warn("`ChangeList.query_set` is deprecated, "
		"use `queryset` instead.",
		DeprecationWarning, 2)
		RemovedInDjango18Warning, 2)
		return self.queryset

		def get_filters_params(self, params=None):