Clean up more lock DB

judge/comments.py

@@ -23,7 +23,6 @@ from reversion import revisions
 from reversion.models import Revision, Version
 from django_ratelimit.decorators import ratelimit
 
-from judge.dblock import LockModel
 from judge.models import Comment, Notification
 from judge.widgets import HeavyPreviewPageDownWidget
 from judge.jinja2.reference import get_user_from_text

judge/views/bookmark.py

@@ -12,7 +12,6 @@ from judge.models.bookmark import BookMark, MakeBookMark
 from django.views.generic.base import TemplateResponseMixin
 from django.views.generic.detail import SingleObjectMixin
 
-from judge.dblock import LockModel
 from django.views.generic import View, ListView
 
 

judge/views/comment.py

@@ -25,7 +25,6 @@ from reversion.models import Version
 from django.conf import settings
 from django_ratelimit.decorators import ratelimit
 
-from judge.dblock import LockModel
 from judge.models import Comment, CommentVote, Notification, BlogPost
 from judge.utils.views import TitleMixin
 from judge.widgets import MathJaxPagedownWidget, HeavyPreviewPageDownWidget
@@ -83,18 +82,15 @@ def vote_comment(request, delta):
     try:
         vote.save()
     except IntegrityError:
-        with LockModel(write=(CommentVote,)):
+        try:
-            try:
+            vote = CommentVote.objects.get(comment_id=comment_id, voter=request.profile)
-                vote = CommentVote.objects.get(
+        except CommentVote.DoesNotExist:
-                    comment_id=comment_id, voter=request.profile
+            raise Http404()
-                )
+        if -vote.score != delta:
-            except CommentVote.DoesNotExist:
+            return HttpResponseBadRequest(
-                raise Http404()
+                _("You already voted."), content_type="text/plain"
-            if -vote.score != delta:
+            )
-                return HttpResponseBadRequest(
+        vote.delete()
-                    _("You already voted."), content_type="text/plain"
-                )
-            vote.delete()
         Comment.objects.filter(id=comment_id).update(score=F("score") - vote.score)
     else:
         Comment.objects.filter(id=comment_id).update(score=F("score") + delta)