summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex Gaynor <alex.gaynor@gmail.com>2010-11-21 18:08:00 +0000
committerAlex Gaynor <alex.gaynor@gmail.com>2010-11-21 18:08:00 +0000
commit0cf1c96d062f64275c5babc7687b301f0bfa3bc6 (patch)
treeb332fa24665b43f221e9e1b24c17f2f7d8ad61c4
parentf5f18a38ab990910ca43448212c70938992c9787 (diff)
Removed some deprecated code that survived [14138].
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14672 bcc190cf-cafb-0310-a4f2-bffc1f526a37
-rw-r--r--django/contrib/admin/options.py28
1 files changed, 0 insertions, 28 deletions
diff --git a/django/contrib/admin/options.py b/django/contrib/admin/options.py
index ffc6e7986f..02adc99953 100644
--- a/django/contrib/admin/options.py
+++ b/django/contrib/admin/options.py
@@ -1176,34 +1176,6 @@ class ModelAdmin(BaseModelAdmin):
"admin/object_history.html"
], context, context_instance=context_instance)
- #
- # DEPRECATED methods.
- #
- def __call__(self, request, url):
- """
- DEPRECATED: this is the old way of URL resolution, replaced by
- ``get_urls()``. This only called by AdminSite.root(), which is also
- deprecated.
-
- Again, remember that the following code only exists for
- backwards-compatibility. Any new URLs, changes to existing URLs, or
- whatever need to be done up in get_urls(), above!
-
- This function still exists for backwards-compatibility; it will be
- removed in Django 1.3.
- """
- # Delegate to the appropriate method, based on the URL.
- if url is None:
- return self.changelist_view(request)
- elif url == "add":
- return self.add_view(request)
- elif url.endswith('/history'):
- return self.history_view(request, unquote(url[:-8]))
- elif url.endswith('/delete'):
- return self.delete_view(request, unquote(url[:-7]))
- else:
- return self.change_view(request, unquote(url))
-
class InlineModelAdmin(BaseModelAdmin):
"""
Options for inline editing of ``model`` instances.