Django

Code

Changeset 2823

Show
Ignore:
Timestamp:
05/03/06 14:23:44 (3 years ago)
Author:
jacob
Message:

Fixed #1740 -- django.contrib.comments no longer uses old-style DB API (thanks, ubernostrum)

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • django/trunk/django/contrib/comments/models.py

    r2809 r2823  
    5757        if user.is_superuser: 
    5858            return True 
    59         for g in user.get_group_list(): 
     59        for g in user.group_set.all(): 
    6060            if g.id == settings.COMMENTS_MODERATORS_GROUP: 
    6161                return True 
    …… 
    125125        from django.core.exceptions import ObjectDoesNotExist 
    126126        try: 
    127             return self.get_content_type().get_object_for_this_type(pk=self.object_id) 
     127            return self.content_type.get_object_for_this_type(pk=self.object_id) 
    128128        except ObjectDoesNotExist: 
    129129            return None 
    …… 
    134134        "Helper function that populates good/bad karma caches" 
    135135        good, bad = 0, 0 
    136         for k in self.get_karmascore_list(): 
     136        for k in self.karmascore_set: 
    137137            if k.score == -1: 
    138138                bad +=1 
    …… 
    159159        return _('Posted by %(user)s at %(date)s\n\n%(comment)s\n\nhttp://%(domain)s%(url)s') % \ 
    160160            {'user': self.user.username, 'date': self.submit_date, 
    161             'comment': self.comment, 'domain': self.get_site().domain, 'url': self.get_absolute_url()} 
     161            'comment': self.comment, 'domain': self.site.domain, 'url': self.get_absolute_url()} 
    162162 
    163163class FreeComment(models.Model): 
    …… 
    201201        from django.core.exceptions import ObjectDoesNotExist 
    202202        try: 
    203             return self.get_content_type().get_object_for_this_type(pk=self.object_id) 
     203            return self.content_type.get_object_for_this_type(pk=self.object_id) 
    204204        except ObjectDoesNotExist: 
    205205            return None 
    …… 
    210210    def vote(self, user_id, comment_id, score): 
    211211        try: 
    212             karma = self.objects.get(comment__id__exact=comment_id, user__id__exact=user_id) 
     212            karma = self.objects.get(comment__pk=comment_id, user__pk=user_id) 
    213213        except self.model.DoesNotExist: 
    214             karma = self.model(None, user_id, comment_id, score, datetime.datetime.now()) 
     214            karma = self.model(None, user_id=user_id, comment_id=comment_id, score=score, scored_date=datetime.datetime.now()) 
    215215            karma.save() 
    216216        else: 
    …… 
    252252            return # A user can't flag his own comment. Fail silently. 
    253253        try: 
    254             f = self.objects.get(user__id__exact=user.id, comment__id__exact=comment.id) 
     254            f = self.objects.get(user__pk=user.id, comment__pk=comment.id) 
    255255        except self.model.DoesNotExist: 
    256256            from django.core.mail import mail_managers