Ticket #1637: models.py.2.diff

django/contrib/comments/models.py

@@ -102 +102 @@
         search_fields = ('comment', 'user__username')
 
     def __repr__(self):
-        return "%s: %s..." % (self.get_user().username, self.comment[:100])
+        return "%s: %s..." % (self.user.username, self.comment[:100])
 
     def get_absolute_url(self):
         return self.get_content_object().get_absolute_url() + "#c" + str(self.id)
@@ -156 +156 @@
 
     def get_as_text(self):
         return _('Posted by %(user)s at %(date)s\n\n%(comment)s\n\nhttp://%(domain)s%(url)s') % \
-            {'user': self.get_user().username, 'date': self.submit_date,
+            {'user': self.user.username, 'date': self.submit_date,
             'comment': self.comment, 'domain': self.get_site().domain, 'url': self.get_absolute_url()}
 
 class FreeComment(models.Model):
@@ -208 +208 @@
 class KarmaScoreManager(models.Manager):
     def vote(self, user_id, comment_id, score):
         try:
-            karma = self.get_object(comment__id__exact=comment_id, user__id__exact=user_id)
+            karma = self.objects.get(comment__id__exact=comment_id, user__id__exact=user_id)
         except self.model.DoesNotExist:
             karma = self.model(None, user_id, comment_id, score, datetime.datetime.now())
             karma.save()
@@ -238 +238 @@
         unique_together = (('user', 'comment'),)
 
     def __repr__(self):
-        return _("%(score)d rating by %(user)s") % {'score': self.score, 'user': self.get_user()}
+        return _("%(score)d rating by %(user)s") % {'score': self.score, 'user': self.user}
 
 class UserFlagManager(models.Manager):
     def flag(self, comment, user):
@@ -250 +250 @@
         if int(comment.user_id) == int(user.id):
             return # A user can't flag his own comment. Fail silently.
         try:
-            f = self.get_object(user__id__exact=user.id, comment__id__exact=comment.id)
+            f = self.objects.get(user__id__exact=user.id, comment__id__exact=comment.id)
         except self.model.DoesNotExist:
             from django.core.mail import mail_managers
             f = self.model(None, user.id, comment.id, None)
@@ -269 +269 @@
         unique_together = (('user', 'comment'),)
 
     def __repr__(self):
-        return _("Flag by %r") % self.get_user()
+        return _("Flag by %r") % self.user
 
 class ModeratorDeletion(models.Model):
     user = models.ForeignKey(User, verbose_name='moderator')
@@ -281 +281 @@
         unique_together = (('user', 'comment'),)
 
     def __repr__(self):
-        return _("Moderator deletion by %r") % self.get_user()
+        return _("Moderator deletion by %r") % self.user