From d5d1b9be4f69e768e79a4eba526ae2d90dd77be4 Mon Sep 17 00:00:00 2001
From: Lucas Kanashiro <kanashiro.duarte@gmail.com>
Date: Wed, 6 Aug 2014 16:34:40 -0300
Subject: [PATCH] Updated django to 1.7

---
 requirements.txt               |  2 +-
 src/super_archives/managers.py | 20 +++-----------------
 2 files changed, 4 insertions(+), 18 deletions(-)

diff --git a/requirements.txt b/requirements.txt
index b1e10ec..f4327e0 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,4 +1,4 @@
-Django>=1.6.1,<1.8
+https://www.djangoproject.com/download/1.7c2/tarball/ # Download django 1.7 #
 psycopg2==2.5.1
 django-piston==0.2.3
 pytz==2011n
diff --git a/src/super_archives/managers.py b/src/super_archives/managers.py
index 6610c61..6f10218 100644
--- a/src/super_archives/managers.py
+++ b/src/super_archives/managers.py
@@ -7,23 +7,12 @@ class NotSpamManager(models.Manager):
     """Only return objects which are not marked as spam."""
 
     def get_queryset(self):
-        if django.VERSION < (1, 7):
-            return super(NotSpamManager, self).get_queryset().exclude(spam=True)
-        else:
-            return super(NotSpamManager, self).get_query_set().exclude(spam=True)
-
-    if django.VERSION < (1, 7):
-        # in 1.7+, get_query_set gets defined by the base ChangeList and complains if it's called.
-        # otherwise, we have to define it ourselves.
-        get_query_set = get_queryset
+        return super(NotSpamManager, self).get_queryset().exclude(spam=True)
 
 
 class HighestScore(NotSpamManager):
     def get_queryset(self):
-        if django.VERSION < (1, 7):
-            queryset = super(HighestScore, self).get_queryset()
-        else:
-            queryset = super(HighestScore, self).get_query_set()
+        queryset = super(HighestScore, self).get_queryset()
         return queryset.order_by('-score', '-latest_message__received_time')
 
     def from_haystack(self):
@@ -35,10 +24,7 @@ class MostVotedManager(NotSpamManager):
         """Query for the most voted messages sorting by the sum of
         voted and after by date."""
 
-        if django.VERSION < (1, 7):
-            queryset = super(MostVotedManager, self).get_queryset()
-        else:
-            queryset = super(MostVotedManager, self).get_query_set()
+        queryset = super(MostVotedManager, self).get_queryset()
 
         sql = """
             SELECT
--
libgit2 0.21.2