Remove further Django 1.6 code paths

The changes should be obvious and non-controversial. Under Django 1.7+,
the AppConfig is used to register signal receivers instead of just
registering then when models are registered.

src/oscar/app.py

@@ -1,12 +1,10 @@
 # flake8: noqa, because URL syntax is more readable with long lines
 
-import django
 from django.conf.urls import url, include
 from django.contrib.auth import views as auth_views
 from django.core.urlresolvers import reverse_lazy
 
 from oscar.core.application import Application
-from oscar.apps.customer import forms
 from oscar.core.loading import get_class
 from oscar.views.decorators import login_forbidden
 
@@ -46,32 +44,14 @@ class Shop(Application):
                 name='password-reset'),
             url(r'^password-reset/done/$',
                 login_forbidden(auth_views.password_reset_done),
-                name='password-reset-done')]
-
-        # Django <=1.5: uses uidb36 to encode the user's primary key (support
-        #               has been removed)
-        # Django 1.6:   uses uidb64 to encode the user's primary key, but
-        #               supports legacy links
-        # Django > 1.7: used uidb64 to encode the user's primary key
-        # see https://docs.djangoproject.com/en/dev/releases/1.6/#django-contrib-auth-password-reset-uses-base-64-encoding-of-user-pk
-        urls.append(
+                name='password-reset-done'),
             url(r'^password-reset/confirm/(?P<uidb64>[0-9A-Za-z_\-]+)/(?P<token>.+)/$',
                 login_forbidden(auth_views.password_reset_confirm),
                 {
                     'post_reset_redirect': reverse_lazy('password-reset-complete'),
                     'set_password_form': self.set_password_form,
                 },
-                name='password-reset-confirm'))
-        if django.VERSION < (1, 7):
-            urls.append(
-                url(r'^password-reset/confirm/(?P<uidb36>[0-9A-Za-z]+)-(?P<token>.+)/$',
-                    login_forbidden(auth_views.password_reset_confirm_uidb36),
-                    {
-                        'post_reset_redirect': reverse_lazy('password-reset-complete'),
-                        'set_password_form': self.set_password_form,
-                    }))
-
-        urls += [
+                name='password-reset-confirm'),
             url(r'^password-reset/complete/$',
                 login_forbidden(auth_views.password_reset_complete),
                 name='password-reset-complete'),

src/oscar/apps/analytics/models.py

@@ -1,5 +1,3 @@
-import django
-
 from oscar.core.loading import is_model_registered
 from oscar.apps.analytics.abstract_models import (
     AbstractProductRecord, AbstractUserRecord,
@@ -34,7 +32,3 @@ if not is_model_registered('analytics', 'UserSearch'):
         pass
 
     __all__.append('UserSearch')
-
-
-if django.VERSION < (1, 7):
-    from . import receivers  # noqa

src/oscar/apps/catalogue/models.py

@@ -1,5 +1,3 @@
-import django
-
 """
 Vanilla product models
 """
@@ -84,7 +82,3 @@ if not is_model_registered('catalogue', 'ProductImage'):
         pass
 
     __all__.append('ProductImage')
-
-
-if django.VERSION < (1, 7):
-    from . import receivers  # noqa

src/oscar/apps/customer/history.py

@@ -1,11 +1,10 @@
 import json
 
 from django.conf import settings
-from oscar.core.loading import get_model
-
-from oscar.core.loading import get_class
+from oscar.core.loading import get_model, get_class
 
 product_viewed = get_class('catalogue.signals', 'product_viewed')
+Product = get_model('catalogue', 'Product')
 
 
 def get(request):
@@ -14,11 +13,6 @@ def get(request):
     """
     ids = extract(request)
 
-    # Needs to live in local scope because receivers in this module get
-    # registered during model initialisation
-    # TODO Move this back to global scope once Django < 1.7 support is removed
-    Product = get_model('catalogue', 'Product')
-
     # Reordering as the ID order gets messed up in the query
     product_dict = Product.browsable.in_bulk(ids)
     ids.reverse()

src/oscar/apps/customer/models.py

@@ -1,5 +1,3 @@
-import django
-
 from oscar.core.loading import is_model_registered
 from oscar.apps.customer import abstract_models
 
@@ -33,8 +31,3 @@ if not is_model_registered('customer', 'ProductAlert'):
         pass
 
     __all__.append('ProductAlert')
-
-
-if django.VERSION < (1, 7):
-    from .receivers import *  # noqa
-    from .alerts import receivers  # noqa

src/oscar/apps/partner/models.py

@@ -1,5 +1,3 @@
-import django
-
 from oscar.core.loading import is_model_registered
 from oscar.apps.address.abstract_models import AbstractPartnerAddress
 from oscar.apps.partner.abstract_models import (
@@ -34,7 +32,3 @@ if not is_model_registered('partner', 'StockAlert'):
         pass
 
     __all__.append('StockAlert')
-
-
-if django.VERSION < (1, 7):
-    from . import receivers  # noqa

src/oscar/apps/voucher/models.py

@@ -1,5 +1,3 @@
-import django
-
 from oscar.core.loading import is_model_registered
 from oscar.apps.voucher.abstract_models import (
     AbstractVoucher, AbstractVoucherApplication)
@@ -19,7 +17,3 @@ if not is_model_registered('voucher', 'VoucherApplication'):
         pass
 
     __all__.append('VoucherApplication')
-
-
-if django.VERSION < (1, 7):
-    from . import receivers  # noqa

src/oscar/core/phonenumber.py

@@ -68,15 +68,6 @@ class PhoneNumber(phonenumbers.phonenumber.PhoneNumber):
             return self.format_as(fmt)
         return self.raw_input
 
-    def __unicode__(self):
-        # Django calls force_text on PhoneNumber instances when populating
-        # a model form. Django 1.6's force_text implementation unfortunately
-        # checks for __unicode__ first, which is defined in the base class.
-        # As we're using the python_2_unicode_compatible decorator, in Python 2
-        # __unicode__ is already overwritten by the decorator.
-        # In Python 3, we can safely return __str__ because it returns unicode.
-        return self.__str__()
-
     def is_valid(self):
         """
         checks whether the number supplied is actually valid

tests/_site/myauth/models.py

@@ -1,6 +1,5 @@
 # -*- coding: utf-8 -*-
 
-# Code will only work with Django >= 1.5. See tests/config.py
 import re
 
 from django.utils.translation import ugettext_lazy as _

tests/config.py

@@ -1,8 +1,7 @@
 #!/usr/bin/env python
 import os
-import django
 
-from django.conf import settings, global_settings
+from django.conf import settings
 import oscar
 
 
@@ -120,11 +119,11 @@ def configure():
 
 if __name__ == '__main__':
     import sys
+    import django
     from django.core.management import call_command
     args = sys.argv[1:]
 
     if args:
         configure()  # configure Django settings
-        if hasattr(django, 'setup'):
-            django.setup()  # initialise app registry for Django 1.7+
+        django.setup()  # initialise app registry for Django 1.7+
         call_command(*args)

tests/unit/core/compat_tests.py

@@ -2,9 +2,7 @@
 import datetime
 from django.utils import six
 from django.utils.six.moves import cStringIO
-import unittest
 
-import django
 from django.test import TestCase
 
 from oscar.core.compat import UnicodeCSVWriter, existing_user_fields
@@ -33,9 +31,6 @@ class TestUnicodeCSVWriter(TestCase):
 
 class TestPython3Compatibility(TestCase):
 
-    @unittest.skipIf(
-        django.VERSION < (1, 7),
-        "Oscar only supports Python 3 with Django 1.7+")
     def test_models_define_python_3_compatible_representation(self):
         """
         In Python 2, models can define __unicode__ to get a text representation,

tests/unit/core/loading_tests.py

@@ -1,7 +1,5 @@
 from os.path import dirname
-import unittest
 
-import django
 from django.test import TestCase
 from django.conf import settings
 from django.test.utils import override_settings
@@ -138,7 +136,6 @@ class TestOverridingCoreApps(TestCase):
                           klass.__module__)
 
 
-@unittest.skipIf(django.VERSION < (1, 7), "Django 1.7 introduced app registry")
 class TestAppLabelsForModels(TestCase):
 
     def test_all_oscar_models_have_app_labels(self):