diff options
| author | Justin Bronn <jbronn@gmail.com> | 2008-08-05 17:15:33 +0000 |
|---|---|---|
| committer | Justin Bronn <jbronn@gmail.com> | 2008-08-05 17:15:33 +0000 |
| commit | aa239e3e5405933af6a29dac3cf587b59a099927 (patch) | |
| tree | ea2cbd139c9a8cf84c09e0b2008bff70e05927ef /django/views | |
| parent | 45b73c9a4685809236f84046cc7ffd32a50db958 (diff) | |
gis: Merged revisions 7981-8001,8003-8011,8013-8033,8035-8036,8038-8039,8041-8063,8065-8076,8078-8139,8141-8154,8156-8214 via svnmerge from trunk.archive/attic/gis
git-svn-id: http://code.djangoproject.com/svn/django/branches/gis@8215 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'django/views')
| -rw-r--r-- | django/views/debug.py | 2 | ||||
| -rw-r--r-- | django/views/generic/create_update.py | 8 | ||||
| -rw-r--r-- | django/views/generic/simple.py | 1 |
3 files changed, 4 insertions, 7 deletions
diff --git a/django/views/debug.py b/django/views/debug.py index 380aa8bf06..adc1ae936e 100644 --- a/django/views/debug.py +++ b/django/views/debug.py @@ -145,8 +145,6 @@ class ExceptionReporter: 'line': line, 'name': origin.name, } - if hasattr(self.exc_value, 'exc_info') and self.exc_value.exc_info: - exc_type, exc_value, tb = self.exc_value.exc_info def _get_lines_from_file(self, filename, lineno, context_lines, loader=None, module_name=None): """ diff --git a/django/views/generic/create_update.py b/django/views/generic/create_update.py index 4fe639f321..aaa0bdc4b6 100644 --- a/django/views/generic/create_update.py +++ b/django/views/generic/create_update.py @@ -15,11 +15,11 @@ def deprecate_follow(follow): needed for newforms-based forms. """ if follow is not None: - import warning + import warnings msg = ("Generic views have been changed to use newforms, and the" - "'follow' argument is no longer used. Please update your code" - "to not use the 'follow' argument.") - warning.warn(msg, DeprecationWarning, stacklevel=3) + " 'follow' argument is no longer used. Please update your code" + " to not use the 'follow' argument.") + warnings.warn(msg, DeprecationWarning, stacklevel=3) def apply_extra_context(extra_context, context): """ diff --git a/django/views/generic/simple.py b/django/views/generic/simple.py index 9d7efdc6c4..0a68b82a10 100644 --- a/django/views/generic/simple.py +++ b/django/views/generic/simple.py @@ -1,4 +1,3 @@ -from django.shortcuts import render_to_response from django.template import loader, RequestContext from django.http import HttpResponse, HttpResponsePermanentRedirect, HttpResponseGone |