From 641acf76e706dcff0932b0825f1acbde715cc2c4 Mon Sep 17 00:00:00 2001 From: Aymeric Augustin Date: Mon, 24 Dec 2012 23:22:33 +0100 Subject: [PATCH] Removed IGNORABLE_404_STARTS/ENDS settings. --- django/middleware/common.py | 14 -------------- docs/howto/error-reporting.txt | 8 -------- docs/ref/settings.txt | 16 ---------------- 3 files changed, 38 deletions(-) diff --git a/django/middleware/common.py b/django/middleware/common.py index ccc9fbfaad..c6e71e0d48 100644 --- a/django/middleware/common.py +++ b/django/middleware/common.py @@ -143,20 +143,6 @@ def _is_ignorable_404(uri): """ Returns True if a 404 at the given URL *shouldn't* notify the site managers. """ - if getattr(settings, 'IGNORABLE_404_STARTS', ()): - import warnings - warnings.warn('The IGNORABLE_404_STARTS setting has been deprecated ' - 'in favor of IGNORABLE_404_URLS.', DeprecationWarning) - for start in settings.IGNORABLE_404_STARTS: - if uri.startswith(start): - return True - if getattr(settings, 'IGNORABLE_404_ENDS', ()): - import warnings - warnings.warn('The IGNORABLE_404_ENDS setting has been deprecated ' - 'in favor of IGNORABLE_404_URLS.', DeprecationWarning) - for end in settings.IGNORABLE_404_ENDS: - if uri.endswith(end): - return True return any(pattern.search(uri) for pattern in settings.IGNORABLE_404_URLS) def _is_internal_request(domain, referer): diff --git a/docs/howto/error-reporting.txt b/docs/howto/error-reporting.txt index 5fbe5eda59..b4ced5a1b6 100644 --- a/docs/howto/error-reporting.txt +++ b/docs/howto/error-reporting.txt @@ -101,14 +101,6 @@ The best way to disable this behavior is to set records are ignored, but you can use them for error reporting by writing a handler and :doc:`configuring logging ` appropriately. -.. seealso:: - - .. versionchanged:: 1.4 - - Previously, two settings were used to control which URLs not to report: - :setting:`IGNORABLE_404_STARTS` and :setting:`IGNORABLE_404_ENDS`. They - were replaced by :setting:`IGNORABLE_404_URLS`. - .. _filtering-error-reports: Filtering error reports diff --git a/docs/ref/settings.txt b/docs/ref/settings.txt index bcc2a461c7..df679e7c1f 100644 --- a/docs/ref/settings.txt +++ b/docs/ref/settings.txt @@ -2244,22 +2244,6 @@ Default: Not defined The site-specific user profile model used by this site. See :ref:`User profiles `. -.. setting:: IGNORABLE_404_ENDS - -IGNORABLE_404_ENDS ------------------- - -.. deprecated:: 1.4 - This setting has been superseded by :setting:`IGNORABLE_404_URLS`. - -.. setting:: IGNORABLE_404_STARTS - -IGNORABLE_404_STARTS --------------------- - -.. deprecated:: 1.4 - This setting has been superseded by :setting:`IGNORABLE_404_URLS`. - .. setting:: URL_VALIDATOR_USER_AGENT URL_VALIDATOR_USER_AGENT