Reverting to work on Django 1.6 too

Gust
1 parent 6fcf510f
Showing 3 changed files with 9 additions and 7 deletions Show diff stats
requirements.txt
src/colab/custom_settings.py
src/super_archives/managers.py
-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
@@ -93,6 +93,7 @@ INSTALLED_APPS = INSTALLED_APPS + (
     'accounts',
     # Not standard apps
+    'south',
     'raven.contrib.django.raven_compat',
     'cliauth',
     'django_mobile',
@@ -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
1	-https://www.djangoproject.com/download/1.7c2/tarball/ # Download django 1.7 #	1	+Django>=1.6.1,<1.7
		2	+South==0.8.1
2	psycopg2==2.5.1	3	psycopg2==2.5.1
3	django-piston==0.2.3	4	django-piston==0.2.3
4	pytz==2011n	5	pytz==2011n
	@@ -93,6 +93,7 @@ INSTALLED_APPS = INSTALLED_APPS + (		@@ -93,6 +93,7 @@ INSTALLED_APPS = INSTALLED_APPS + (
93	'accounts',	93	'accounts',
94		94
95	# Not standard apps	95	# Not standard apps
		96	+ 'south',
96	'raven.contrib.django.raven_compat',	97	'raven.contrib.django.raven_compat',
97	'cliauth',	98	'cliauth',
98	'django_mobile',	99	'django_mobile',