From 11b36d0d7e0b6180d4350898b071409ec6d8b2f6 Mon Sep 17 00:00:00 2001
From: Gust <darksshades@hotmail.com>
Date: Thu, 7 Aug 2014 14:42:00 -0300
Subject: [PATCH] Reverting to work on Django 1.6 too

---
 requirements.txt               |  3 ++-
 src/colab/custom_settings.py   |  1 +
 src/super_archives/managers.py | 12 ++++++------
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/requirements.txt b/requirements.txt
index f4327e0..b9fcb18 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,4 +1,5 @@
-https://www.djangoproject.com/download/1.7c2/tarball/ # Download django 1.7 #
+Django>=1.6.1,<1.7
+South==0.8.1
 psycopg2==2.5.1
 django-piston==0.2.3
 pytz==2011n
diff --git a/src/colab/custom_settings.py b/src/colab/custom_settings.py
index 0a8cb93..070b783 100644
--- a/src/colab/custom_settings.py
+++ b/src/colab/custom_settings.py
@@ -93,6 +93,7 @@ INSTALLED_APPS = INSTALLED_APPS + (
     'accounts',
 
     # Not standard apps
+    'south',
     'raven.contrib.django.raven_compat',
     'cliauth',
     'django_mobile',
diff --git a/src/super_archives/managers.py b/src/super_archives/managers.py
index 6f10218..8c9223f 100644
--- a/src/super_archives/managers.py
+++ b/src/super_archives/managers.py
@@ -6,13 +6,13 @@ import django
 class NotSpamManager(models.Manager):
     """Only return objects which are not marked as spam."""
 
-    def get_queryset(self):
-        return super(NotSpamManager, self).get_queryset().exclude(spam=True)
+    def get_query_set(self):
+        return super(NotSpamManager, self).get_query_set().exclude(spam=True)
 
 
 class HighestScore(NotSpamManager):
-    def get_queryset(self):
-        queryset = super(HighestScore, self).get_queryset()
+    def get_query_set(self):
+        queryset = super(HighestScore, self).get_query_set()
         return queryset.order_by('-score', '-latest_message__received_time')
 
     def from_haystack(self):
@@ -20,11 +20,11 @@ class HighestScore(NotSpamManager):
 
 
 class MostVotedManager(NotSpamManager):
-    def get_queryset(self):
+    def get_query_set(self):
         """Query for the most voted messages sorting by the sum of
         voted and after by date."""
 
-        queryset = super(MostVotedManager, self).get_queryset()
+        queryset = super(MostVotedManager, self).get_query_set()
 
         sql = """
             SELECT
--
libgit2 0.21.2