From bd56716e74129dd26c4996e2db03bd1df9f37f3f Mon Sep 17 00:00:00 2001 From: Will Date: Sat, 6 Sep 2014 16:31:12 -0700 Subject: [PATCH 1/2] Fix deprecation warnings after Django 1.7 upgrade --- django_mailbox/models.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/django_mailbox/models.py b/django_mailbox/models.py index 67e44d6..2d9eeff 100644 --- a/django_mailbox/models.py +++ b/django_mailbox/models.py @@ -74,7 +74,7 @@ ATTACHMENT_INTERPOLATION_HEADER = getattr( class ActiveMailboxManager(models.Manager): - def get_query_set(self): + def get_queryset(self): return super(ActiveMailboxManager, self).get_query_set().filter( active=True, ) @@ -351,21 +351,21 @@ class Mailbox(models.Model): class IncomingMessageManager(models.Manager): - def get_query_set(self): + def get_queryset(self): return super(IncomingMessageManager, self).get_query_set().filter( outgoing=False, ) class OutgoingMessageManager(models.Manager): - def get_query_set(self): + def get_queryset(self): return super(OutgoingMessageManager, self).get_query_set().filter( outgoing=True, ) class UnreadMessageManager(models.Manager): - def get_query_set(self): + def get_queryset(self): return super(UnreadMessageManager, self).get_query_set().filter( read=None ) From 1406d465d6dc045930a0284552038bd30bbbc29c Mon Sep 17 00:00:00 2001 From: Will Date: Sat, 6 Sep 2014 19:18:47 -0700 Subject: [PATCH 2/2] Adjust usages of get_query_set to get_queryset --- django_mailbox/models.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/django_mailbox/models.py b/django_mailbox/models.py index 2d9eeff..e36bf00 100644 --- a/django_mailbox/models.py +++ b/django_mailbox/models.py @@ -75,7 +75,7 @@ ATTACHMENT_INTERPOLATION_HEADER = getattr( class ActiveMailboxManager(models.Manager): def get_queryset(self): - return super(ActiveMailboxManager, self).get_query_set().filter( + return super(ActiveMailboxManager, self).get_queryset().filter( active=True, ) @@ -352,21 +352,21 @@ class Mailbox(models.Model): class IncomingMessageManager(models.Manager): def get_queryset(self): - return super(IncomingMessageManager, self).get_query_set().filter( + return super(IncomingMessageManager, self).get_queryset().filter( outgoing=False, ) class OutgoingMessageManager(models.Manager): def get_queryset(self): - return super(OutgoingMessageManager, self).get_query_set().filter( + return super(OutgoingMessageManager, self).get_queryset().filter( outgoing=True, ) class UnreadMessageManager(models.Manager): def get_queryset(self): - return super(UnreadMessageManager, self).get_query_set().filter( + return super(UnreadMessageManager, self).get_queryset().filter( read=None )