diff options
Diffstat (limited to 'django')
| -rw-r--r-- | django/views/generic/detail.py | 5 | ||||
| -rw-r--r-- | django/views/generic/list.py | 6 |
2 files changed, 8 insertions, 3 deletions
diff --git a/django/views/generic/detail.py b/django/views/generic/detail.py index e75dd77409..3fc21c1f49 100644 --- a/django/views/generic/detail.py +++ b/django/views/generic/detail.py @@ -2,6 +2,7 @@ import re from django.core.exceptions import ImproperlyConfigured, ObjectDoesNotExist from django.http import Http404 +from django.utils.encoding import smart_str from django.views.generic.base import TemplateResponseMixin, View @@ -79,8 +80,8 @@ class SingleObjectMixin(object): if self.context_object_name: return self.context_object_name elif hasattr(obj, '_meta'): - return re.sub('[^a-zA-Z0-9]+', '_', - obj._meta.verbose_name.lower()) + return smart_str(re.sub('[^a-zA-Z0-9]+', '_', + obj._meta.verbose_name.lower())) else: return None diff --git a/django/views/generic/list.py b/django/views/generic/list.py index 22135720ed..cd7f9f6ae8 100644 --- a/django/views/generic/list.py +++ b/django/views/generic/list.py @@ -1,9 +1,12 @@ +import re + from django.core.paginator import Paginator, InvalidPage from django.core.exceptions import ImproperlyConfigured from django.http import Http404 from django.utils.encoding import smart_str from django.views.generic.base import TemplateResponseMixin, View + class MultipleObjectMixin(object): allow_empty = True queryset = None @@ -76,7 +79,8 @@ class MultipleObjectMixin(object): if self.context_object_name: return self.context_object_name elif hasattr(object_list, 'model'): - return smart_str(object_list.model._meta.verbose_name_plural) + return smart_str(re.sub('[^a-zA-Z0-9]+', '_', + object_list.model._meta.verbose_name_plural.lower())) else: return None |