Download as
Browse Code »

Commit fe1e839dfa72c3d82e8d377fcab725e88936c491

Authored by Gustavo Jaruga Cruz
1 parent 9d290dd6
Exists in master and in 39 other branches 1.12.x, add_requests_as_dep, celery_service, change-passwd-signal, check-port, colab-signals, colab-vcard, colab_search, colab_tag, colab_tag_merge, community_association, detach_super_archives, fix-dashboard, fix-message-preview, fix_app_label, fix_cache_count_spb, fix_header, fixed_gitlab_import, go_to_profile_panel, header_footer, layout-fix, mobile_user_scalable, move_out_plugins, paginate-threads, profile_integration, refactor-data-import, remove-gitlab-plugin, removing_namespace, search_block, search_filters, spb-release/3.0, split_screen, stable, startplugin, timestamp_plugins, translation_review, user_regex, validate-passwd, workin_whoosh_temp

Add compatibility to django 1.7 

-Add backward compatibility to django 1.6
-Add compabitlity to django 1.7
Showing 5 changed files with 25 additions and 15 deletions   Show diff stats
requirements.txt
  Diff comments   View file @fe1e839
1 -Django>=1.6.1,<1.7  
2 -South==0.8.1 1 +Django>=1.6.1,<1.8
3 psycopg2==2.5.1 2 psycopg2==2.5.1
4 django-piston==0.2.3 3 django-piston==0.2.3
5 pytz==2011n 4 pytz==2011n
src/badger/models.py
  Diff comments   View file @fe1e839
1 # -*- coding: utf-8 -*- 1 # -*- coding: utf-8 -*-
2 2
3 from django.conf import settings 3 from django.conf import settings
4 -from django.contrib.auth import get_user_model  
5 from django.db import models 4 from django.db import models
6 from django.utils.translation import ugettext_lazy as _ 5 from django.utils.translation import ugettext_lazy as _
7 from i18n_model.models import I18nModel 6 from i18n_model.models import I18nModel
@@ -58,7 +57,7 @@ class Badge(models.Model): @@ -58,7 +57,7 @@ class Badge(models.Model):
58 null=True 57 null=True
59 ) 58 )
60 awardees = models.ManyToManyField( 59 awardees = models.ManyToManyField(
61 - get_user_model(), 60 + settings.AUTH_USER_MODEL,
62 verbose_name=_(u'Awardees'), 61 verbose_name=_(u'Awardees'),
63 blank=True, 62 blank=True,
64 null=True 63 null=True
src/colab/custom_settings.py
  Diff comments   View file @fe1e839
@@ -99,7 +99,6 @@ INSTALLED_APPS = INSTALLED_APPS + ( @@ -99,7 +99,6 @@ INSTALLED_APPS = INSTALLED_APPS + (
99 99
100 # Not standard apps 100 # Not standard apps
101 'raven.contrib.django.raven_compat', 101 'raven.contrib.django.raven_compat',
102 - 'south',  
103 'cliauth', 102 'cliauth',
104 'django_mobile', 103 'django_mobile',
105 'django_browserid', 104 'django_browserid',
src/super_archives/managers.py
  Diff comments   View file @fe1e839
1 -  
2 from django.db import models 1 from django.db import models
3 2
4 from haystack.query import SearchQuerySet 3 from haystack.query import SearchQuerySet
5 - 4 +import django
6 5
7 class NotSpamManager(models.Manager): 6 class NotSpamManager(models.Manager):
8 """Only return objects which are not marked as spam.""" 7 """Only return objects which are not marked as spam."""
9 8
10 - def get_query_set(self):  
11 - return super(NotSpamManager, self).get_query_set().exclude(spam=True) 9 + def get_queryset(self):
  10 + if django.VERSION < (1, 7):
  11 + return super(NotSpamManager, self).get_queryset().exclude(spam=True)
  12 + else:
  13 + return super(NotSpamManager, self).get_query_set().exclude(spam=True)
  14 +
  15 + if django.VERSION < (1, 7):
  16 + # in 1.7+, get_query_set gets defined by the base ChangeList and complains if it's called.
  17 + # otherwise, we have to define it ourselves.
  18 + get_query_set = get_queryset
12 19
13 20
14 class HighestScore(NotSpamManager): 21 class HighestScore(NotSpamManager):
15 - def get_query_set(self):  
16 - queryset = super(HighestScore, self).get_query_set() 22 + def get_queryset(self):
  23 + if django.VERSION < (1, 7):
  24 + queryset = super(HighestScore, self).get_queryset()
  25 + else:
  26 + queryset = super(HighestScore, self).get_query_set()
17 return queryset.order_by('-score', '-latest_message__received_time') 27 return queryset.order_by('-score', '-latest_message__received_time')
18 28
19 def from_haystack(self): 29 def from_haystack(self):
@@ -21,11 +31,14 @@ class HighestScore(NotSpamManager): @@ -21,11 +31,14 @@ class HighestScore(NotSpamManager):
21 31
22 32
23 class MostVotedManager(NotSpamManager): 33 class MostVotedManager(NotSpamManager):
24 - def get_query_set(self): 34 + def get_queryset(self):
25 """Query for the most voted messages sorting by the sum of 35 """Query for the most voted messages sorting by the sum of
26 voted and after by date.""" 36 voted and after by date."""
27 37
28 - queryset = super(MostVotedManager, self).get_query_set() 38 + if django.VERSION < (1, 7):
  39 + queryset = super(MostVotedManager, self).get_queryset()
  40 + else:
  41 + queryset = super(MostVotedManager, self).get_query_set()
29 42
30 sql = """ 43 sql = """
31 SELECT 44 SELECT
src/super_archives/models.py
  Diff comments   View file @fe1e839
@@ -23,7 +23,7 @@ from .utils import blocks @@ -23,7 +23,7 @@ from .utils import blocks
23 from .utils.etiquetador import etiquetador 23 from .utils.etiquetador import etiquetador
24 24
25 25
26 -User = get_user_model() 26 +User = settings.AUTH_USER_MODEL
27 27
28 28
29 class EmailAddressValidation(models.Model): 29 class EmailAddressValidation(models.Model):
@@ -360,7 +360,7 @@ class Message(models.Model): @@ -360,7 +360,7 @@ class Message(models.Model):
360 class MessageBlock(models.Model): 360 class MessageBlock(models.Model):
361 message = models.ForeignKey(Message, related_name='blocks') 361 message = models.ForeignKey(Message, related_name='blocks')
362 text = models.TextField() 362 text = models.TextField()
363 - is_reply = models.BooleanField() 363 + is_reply = models.BooleanField(default=False)
364 order = models.IntegerField() 364 order = models.IntegerField()
365 365
366 def __unicode__(self): 366 def __unicode__(self):