test0908
/
django
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixed #16531 -- Fixed various instances of "undefined name" issues. Thanks, Bruno Renié. 

git-svn-id: http://code.djangoproject.com/svn/django/trunk@16557 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Jannis Leidel 2011-07-29 09:39:35 +00:00
parent db594f90ba
commit dc2bfae1e5
4 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
django/contrib/gis/db/backends/base.py
View File

@ -121,7 +121,7 @@ class BaseSpatialOperations(object):
raise NotImplementedError('Aggregate support not implemented for this spatial backend.') raise NotImplementedError('Aggregate support not implemented for this spatial backend.')
def spatial_lookup_sql(self, lvalue, lookup_type, value, field): def spatial_lookup_sql(self, lvalue, lookup_type, value, field):
raise NotImplmentedError raise NotImplementedError
# Routines for getting the OGC-compliant models. # Routines for getting the OGC-compliant models.
def geometry_columns(self): def geometry_columns(self):

2
django/db/models/fields/__init__.py
View File

@ -967,7 +967,7 @@ class GenericIPAddressField(Field):
if value and ':' in value: if value and ':' in value:
try: try:
return clean_ipv6_address(value, self.unpack_ipv4) return clean_ipv6_address(value, self.unpack_ipv4)
except ValidationError: except exceptions.ValidationError:
pass pass
return value return value

3
django/views/debug.py
View File

@ -5,6 +5,7 @@ import sys
import types import types
from django.conf import settings from django.conf import settings
from django.core.exceptions import ImproperlyConfigured
from django.http import (HttpResponse, HttpResponseServerError, from django.http import (HttpResponse, HttpResponseServerError,
HttpResponseNotFound, HttpRequest, build_request_repr) HttpResponseNotFound, HttpRequest, build_request_repr)
from django.template import (Template, Context, TemplateDoesNotExist, from django.template import (Template, Context, TemplateDoesNotExist,
@ -79,7 +80,7 @@ def get_exception_reporter_filter(request):
try: try:
default_exception_reporter_filter = getattr(mod, classname)() default_exception_reporter_filter = getattr(mod, classname)()
except AttributeError: except AttributeError:
raise exceptions.ImproperlyConfigured('Default exception reporter filter module "%s" does not define a "%s" class' % (modname, classname)) raise ImproperlyConfigured('Default exception reporter filter module "%s" does not define a "%s" class' % (modname, classname))
if request: if request:
return getattr(request, 'exception_reporter_filter', default_exception_reporter_filter) return getattr(request, 'exception_reporter_filter', default_exception_reporter_filter)
else: else:

6
django/views/generic/dates.py
View File

@ -210,9 +210,9 @@ class BaseDateListView(MultipleObjectMixin, DateMixin, View):
date_list = queryset.dates(date_field, date_type)[::-1] date_list = queryset.dates(date_field, date_type)[::-1]
if date_list is not None and not date_list and not allow_empty: if date_list is not None and not date_list and not allow_empty:
raise Http404(_(u"No %(verbose_name_plural)s available") % { name = force_unicode(queryset.model._meta.verbose_name_plural)
'verbose_name_plural': force_unicode(qs.model._meta.verbose_name_plural) raise Http404(_(u"No %(verbose_name_plural)s available") %
}) {'verbose_name_plural': name})
return date_list return date_list