Django 1.7 and python 3.4 compatibility

fix(admin) - Renamed queryset method to get_queryset given the previous naming convention is deprecated.

fix(models) - Replaced get_user_model with settings.AUTH_USER_MODEL as recommended in django 1.7.

fix(migrations) - Moved south migrations to south_migrations directory.

fix(tests) - Added sites field to AdBase objects on create to be retrieved by the ad manager.

fix - More django 1.7 - python 3.4 compatibility fixes.

adzone/admin.py

@@ -64,8 +64,8 @@ def download_clicks(self, request, queryset):
         return response
     download_clicks.short_description = "Download selected Ad Clicks"
 
-    def queryset(self, request):
-        qs = super(AdClickAdmin, self).queryset(request)
+    def get_queryset(self, request):
+        qs = super(AdClickAdmin, self).get_queryset(request)
         return qs.select_related('ad').only('ad__title',
                                             'click_date',
                                             'source_ip')
@@ -78,8 +78,8 @@ class AdImpressionAdmin(admin.ModelAdmin):
     date_hierarchy = 'impression_date'
     actions = ['download_impressions']
 
-    def queryset(self, request):
-        qs = super(AdImpressionAdmin, self).queryset(request)
+    def get_queryset(self, request):
+        qs = super(AdImpressionAdmin, self).get_queryset(request)
         return qs.select_related('ad').only('ad__title',
                                             'impression_date',
                                             'source_ip')

adzone/context_processors.py

@@ -1,5 +1,5 @@
 def get_source_ip(request):
-    if request.META.has_key('REMOTE_ADDR'):
+    if 'REMOTE_ADDR' in request.META:
         return {'from_ip': request.META.get('REMOTE_ADDR')}
     else:
         return {}

adzone/managers.py

@@ -18,7 +18,7 @@ def get_random_ad(self, ad_zone, ad_category=None):
         and ``ad_zone``.
         If ``ad_category`` is None, the ad will be category independent.
         """
-        qs = self.get_query_set().filter(start_showing__lte=now(),
+        qs = self.get_queryset().filter(start_showing__lte=now(),
                                          stop_showing__gte=now(),
                                          zone__slug=ad_zone,
                                          sites=Site.objects.get_current().pk

adzone/models.py

@@ -8,7 +8,7 @@
 import datetime
 
 from django.db import models
-from django.contrib.auth import get_user_model
+from django.conf import settings
 from django.utils.translation import ugettext_lazy as _
 
 from adzone.managers import AdManager
@@ -31,14 +31,14 @@ class Advertiser(models.Model):
     company_name = models.CharField(
         verbose_name=_(u'Company Name'), max_length=255)
     website = models.URLField(verbose_name=_(u'Company Site'))
-    user = models.ForeignKey(get_user_model())
+    user = models.ForeignKey(settings.AUTH_USER_MODEL)
 
     class Meta:
         verbose_name = _(u'Ad Provider')
         verbose_name_plural = _(u'Advertisers')
         ordering = ('company_name',)
 
-    def __unicode__(self):
+    def __str__(self):
         return self.company_name
 
     def get_website_url(self):
@@ -56,7 +56,7 @@ class Meta:
         verbose_name_plural = 'Categories'
         ordering = ('title',)
 
-    def __unicode__(self):
+    def __str__(self):
         return self.title
 
 
@@ -71,7 +71,7 @@ class Meta:
         verbose_name_plural = 'Zones'
         ordering = ('title',)
 
-    def __unicode__(self):
+    def __str__(self):
         return self.title
 
 
@@ -108,7 +108,7 @@ class Meta:
         verbose_name = _('Ad Base')
         verbose_name_plural = _('Ad Bases')
 
-    def __unicode__(self):
+    def __str__(self):
         return self.title
 
     @models.permalink

adzone/templatetags/adzone_tags.py

@@ -35,7 +35,7 @@ def random_zone_ad(context, ad_zone):
     to_return['ad'] = ad
 
     # Record a impression for the ad
-    if context.has_key('from_ip') and ad:
+    if 'from_ip' in context and ad:
         from_ip = context.get('from_ip')
         try:
             impression = AdImpression(
@@ -63,7 +63,7 @@ def random_category_ad(context, ad_zone, ad_category):
     to_return['ad'] = ad
 
     # Record a impression for the ad
-    if context.has_key('from_ip') and ad:
+    if 'from_ip' in context and ad:
         from_ip = context.get('from_ip')
         try:
             impression = AdImpression(

adzone/tests.py

@@ -1,5 +1,6 @@
 from django.test import TestCase
 from django.contrib.auth.models import User
+from django.contrib.sites.models import Site
 from django.template import Template
 from django.template.response import SimpleTemplateResponse
 from django.utils import timezone
@@ -47,6 +48,7 @@ def create_advert():
         category=category,
         zone=zone,
     )
+    ad.sites = [Site.objects.get_current()]
     return ad
 
 
@@ -121,20 +123,22 @@ def setUp(self):
             slug='category-2',
             description='Category 2 description'
         )
-        AdBase.objects.create(
+        ad1 = AdBase.objects.create(
             title='Ad Title',
             url='www.example.com',
             advertiser=advertiser,
             category=category,
             zone=zone
         )
-        AdBase.objects.create(
+        ad2 = AdBase.objects.create(
             title='Ad 2 Title',
             url='www.example2.com',
             advertiser=advertiser,
             category=category2,
             zone=zone
         )
+        ad1.sites = [Site.objects.get_current()]
+        ad2.sites = [Site.objects.get_current()]
 
     def test_manager_exists(self):
         AdManager