q may not be there

[osqa.git] / forum / views / commands.py

diff --git a/forum/views/commands.py b/forum/views/commands.py
index 62d864f80383314eeeb8b1da8a002adb3fb9a910..be6aa71ab771fb3b9b84d8ab215c107935795d59 100644 (file)
--- a/forum/views/commands.py
+++ b/forum/views/commands.py
@@ -10,7 +10,8 @@ from django.core.exceptions import ObjectDoesNotExist
 from django.core.urlresolvers import reverse
 from django.utils.encoding import smart_unicode
 from django.utils.translation import ungettext, ugettext as _
-from django.http import HttpResponse, HttpResponseRedirect, Http404
+from django.http import (HttpResponse, HttpResponseRedirect, Http404,
+                         HttpResponseBadRequest)
 from django.shortcuts import get_object_or_404, render_to_response
 
 from django.contrib import messages
@@ -309,7 +310,7 @@ def node_markdown(request, id):
         raise AnonymousNotAllowedException(_('accept answers'))
 
     node = get_object_or_404(Node, id=id)
-    return HttpResponse(node.active_revision.body, mimetype="text/plain")
+    return HttpResponse(node.active_revision.body, content_type="text/plain")
 
 
 @decorate.withfn(command)
@@ -547,18 +548,19 @@ def mark_tag(request, tag=None, **kwargs):#tagging system
                 pass
         else:
             ts.update(reason=reason)
-    return HttpResponse(json.dumps(''), mimetype="application/json")
+    return HttpResponse(json.dumps(''), content_type="application/json")
 
 def matching_tags(request):
-    if len(request.GET['q']) == 0:
-        raise CommandException(_("Invalid request"))
+    q = request.GET.get('q')
+    if not q:
+        return HttpResponseBadRequest(_("Invalid request"))
 
-    possible_tags = Tag.active.filter(name__icontains = request.GET['q'])
+    possible_tags = Tag.active.filter(name__icontains=q)
     tag_output = ''
     for tag in possible_tags:
         tag_output += "%s|%s|%s\n" % (tag.id, tag.name, tag.used_count)
 
-    return HttpResponse(tag_output, mimetype="text/plain")
+    return HttpResponse(tag_output, content_type="text/plain")
 
 def matching_users(request):
     if len(request.GET['q']) == 0:
@@ -570,7 +572,7 @@ def matching_users(request):
     for user in possible_users:
         output += ("%s|%s|%s\n" % (user.id, user.decorated_name, user.reputation))
 
-    return HttpResponse(output, mimetype="text/plain")
+    return HttpResponse(output, content_type="text/plain")
 
 def related_questions(request):
     if request.POST and request.POST.get('title', None):
@@ -581,7 +583,7 @@ def related_questions(request):
 
         return HttpResponse(json.dumps(
                 [dict(title=q.title, url=q.get_absolute_url(), score=q.score, summary=q.summary)
-                 for q in questions.filter_state(deleted=False)[0:10]]), mimetype="application/json")
+                 for q in questions.filter_state(deleted=False)[0:10]]), content_type="application/json")
     else:
         raise Http404()