diff --git a/basic/blog/feeds.py b/basic/blog/feeds.py index ce16ea2..e124767 100644 --- a/basic/blog/feeds.py +++ b/basic/blog/feeds.py @@ -1,7 +1,6 @@ -from django.contrib.syndication.feeds import FeedDoesNotExist +from django.contrib.syndication.views import Feed, FeedDoesNotExist from django.core.exceptions import ObjectDoesNotExist from django.contrib.sites.models import Site -from django.contrib.syndication.feeds import Feed from django.contrib.contenttypes.models import ContentType from django.contrib.comments.models import Comment from django.core.urlresolvers import reverse diff --git a/basic/blog/views.py b/basic/blog/views.py index a7236ba..e6d5ba0 100644 --- a/basic/blog/views.py +++ b/basic/blog/views.py @@ -163,9 +163,8 @@ def search(request, template_name='blog/post_search.html'): """ context = {} if request.GET: - stop_word_list = re.compile(STOP_WORDS_RE, re.IGNORECASE) search_term = '%s' % request.GET['q'] - cleaned_search_term = stop_word_list.sub('', search_term) + cleaned_search_term = STOP_WORDS_RE.sub('', search_term) cleaned_search_term = cleaned_search_term.strip() if len(cleaned_search_term) != 0: post_list = Post.objects.published().filter(Q(title__icontains=cleaned_search_term) | Q(body__icontains=cleaned_search_term) | Q(tags__icontains=cleaned_search_term) | Q(categories__title__icontains=cleaned_search_term))